rsshub: 0-unstable-2025-02-03 -> 0-unstable-2025-05-31 (#410411)

This commit is contained in:
Arne Keller 2025-05-31 15:47:40 +02:00 committed by GitHub
commit 58a28f6e21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 10 deletions

View file

@ -0,0 +1,18 @@
diff --git a/scripts/workflow/build-routes.ts b/scripts/workflow/build-routes.ts
index 9807cfc..b9dcfb9 100644
--- a/scripts/workflow/build-routes.ts
+++ b/scripts/workflow/build-routes.ts
@@ -4,6 +4,7 @@ import { parse } from 'tldts';
import fs from 'node:fs';
import path from 'node:path';
import toSource from 'tosource';
+import { exit } from 'node:process';
import { getCurrentPath } from '../../lib/utils/helpers';
const __dirname = getCurrentPath(import.meta.url);
@@ -73,3 +74,5 @@ fs.writeFileSync(path.join(__dirname, '../../assets/build/radar-rules.js'), `(${
fs.writeFileSync(path.join(__dirname, '../../assets/build/maintainers.json'), JSON.stringify(maintainers, null, 2));
fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.json'), JSON.stringify(namespaces, null, 2));
fs.writeFileSync(path.join(__dirname, '../../assets/build/routes.js'), `export default ${JSON.stringify(namespaces, null, 2)}`.replaceAll(/"module": "(.*)"\n/g, `"module": $1\n`));
+
+exit(0);

View file

@ -7,48 +7,48 @@
replaceVars, replaceVars,
stdenv, stdenv,
}: }:
let
pnpm = pnpm_9;
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "rsshub"; pname = "rsshub";
version = "0-unstable-2025-02-03"; version = "0-unstable-2025-05-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "DIYgod"; owner = "DIYgod";
repo = "RSSHub"; repo = "RSSHub";
rev = "72f78e2bfbcf000a6f374a92894430cf845fd1fd"; rev = "2dce2e32dd5f4dade2fc915ac8384c953e11cc83";
hash = "sha256-okavLIYJZ+0iCsYtBc2r3FS18MVE/ap2OwRae7rWTrw="; hash = "sha256-gS/t6O3MishJgi2K9hV22hT95oYHfm44cJqrUo2GPlM=";
}; };
patches = [ patches = [
(replaceVars ./0001-fix-git-hash.patch { (replaceVars ./0001-fix-git-hash.patch {
"GIT_HASH" = finalAttrs.src.rev; "GIT_HASH" = finalAttrs.src.rev;
}) })
./0002-fix-network-call.patch
]; ];
pnpmDeps = pnpm_9.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
hash = "sha256-c16Ue5YiRWlF7ldt/8WLi1/xYhGqqr6XqvUieQbvbWg="; hash = "sha256-7qh6YZbIH/kHVssDZxHY7X8bytrnMcUq0MiJzWZYItc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeBinaryWrapper makeBinaryWrapper
nodejs nodejs
pnpm_9.configHook pnpm.configHook
]; ];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
pnpm build pnpm build
runHook postBuild runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/bin $out/lib/rsshub mkdir -p $out/bin $out/lib/rsshub
cp -r lib node_modules assets api package.json tsconfig.json $out/lib/rsshub cp -r lib node_modules assets api package.json tsconfig.json $out/lib/rsshub
runHook postInstall runHook postInstall
''; '';