Skip to content

Commit 58a28f6

Browse files
rsshub: 0-unstable-2025-02-03 -> 0-unstable-2025-05-31 (#410411)
2 parents 326d2f9 + 80a434d commit 58a28f6

File tree

2 files changed

+28
-10
lines changed

2 files changed

+28
-10
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
diff --git a/scripts/workflow/build-routes.ts b/scripts/workflow/build-routes.ts
2+
index 9807cfc..b9dcfb9 100644
3+
--- a/scripts/workflow/build-routes.ts
4+
+++ b/scripts/workflow/build-routes.ts
5+
@@ -4,6 +4,7 @@ import { parse } from 'tldts';
6+
import fs from 'node:fs';
7+
import path from 'node:path';
8+
import toSource from 'tosource';
9+
+import { exit } from 'node:process';
10+
11+
import { getCurrentPath } from '../../lib/utils/helpers';
12+
const __dirname = getCurrentPath(import.meta.url);
13+
@@ -73,3 +74,5 @@ fs.writeFileSync(path.join(__dirname, '../../assets/build/radar-rules.js'), `(${
14+
fs.writeFileSync(path.join(__dirname, '../../assets/build/maintainers.json'), JSON.stringify(maintainers, null, 2));
15+
fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.json'), JSON.stringify(namespaces, null, 2));
16+
fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.js'), `export default ${JSON.stringify(namespaces, null, 2)}`.replaceAll(/"module": "(.*)"\n/g, `"module": $1\n`));
17+
+
18+
+exit(0);

pkgs/by-name/rs/rsshub/package.nix

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,48 @@
77
replaceVars,
88
stdenv,
99
}:
10+
let
11+
pnpm = pnpm_9;
12+
in
1013
stdenv.mkDerivation (finalAttrs: {
1114
pname = "rsshub";
12-
version = "0-unstable-2025-02-03";
15+
version = "0-unstable-2025-05-31";
1316

1417
src = fetchFromGitHub {
1518
owner = "DIYgod";
1619
repo = "RSSHub";
17-
rev = "72f78e2bfbcf000a6f374a92894430cf845fd1fd";
18-
hash = "sha256-okavLIYJZ+0iCsYtBc2r3FS18MVE/ap2OwRae7rWTrw=";
20+
rev = "2dce2e32dd5f4dade2fc915ac8384c953e11cc83";
21+
hash = "sha256-gS/t6O3MishJgi2K9hV22hT95oYHfm44cJqrUo2GPlM=";
1922
};
2023

2124
patches = [
2225
(replaceVars ./0001-fix-git-hash.patch {
2326
"GIT_HASH" = finalAttrs.src.rev;
2427
})
28+
./0002-fix-network-call.patch
2529
];
2630

27-
pnpmDeps = pnpm_9.fetchDeps {
31+
pnpmDeps = pnpm.fetchDeps {
2832
inherit (finalAttrs) pname version src;
29-
hash = "sha256-c16Ue5YiRWlF7ldt/8WLi1/xYhGqqr6XqvUieQbvbWg=";
33+
hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
3034
};
3135

3236
nativeBuildInputs = [
3337
makeBinaryWrapper
3438
nodejs
35-
pnpm_9.configHook
39+
pnpm.configHook
3640
];
3741

3842
buildPhase = ''
3943
runHook preBuild
40-
4144
pnpm build
42-
4345
runHook postBuild
4446
'';
4547

4648
installPhase = ''
4749
runHook preInstall
48-
4950
mkdir -p $out/bin $out/lib/rsshub
5051
cp -r lib node_modules assets api package.json tsconfig.json $out/lib/rsshub
51-
5252
runHook postInstall
5353
'';
5454

0 commit comments

Comments
 (0)