From b86eb881c59f17a954c5cc3995af8c83e10b012e Mon Sep 17 00:00:00 2001 From: Jack Rosenberg Date: Sun, 2 Nov 2025 12:22:47 +0100 Subject: [PATCH] fosrl-pangolin: 1.10.3 -> 1.13.1 --- pkgs/by-name/fo/fosrl-pangolin/package.nix | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 5268e3ce2a5e..818f44b685f8 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -29,28 +29,22 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.10.3"; + version = "1.13.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-o55S9Fr1gnyuXFAVgugrnFyJIv7nKMZ3Lc4+m/aVrII="; + hash = "sha256-rDysze915lmgbl/nz2NaPrFgNHAVOYRY4sVMnoYB3xE="; }; - npmDepsHash = "sha256-0vqH3nAB4HqfwS7Oy/qewzLyx48vS+rKiAwwbTkSOOc="; + npmDepsHash = "sha256-mSSzrkGZ0ZPYINRahzrbrO6oLDhmu8HWHfHzZKMroCg="; nativeBuildInputs = [ esbuild makeWrapper ]; - prePatch = '' - cat > server/db/index.ts << EOF - export * from "./${db false}"; - EOF - ''; - # Replace the googleapis.com Inter font with a local copy from Nixpkgs. # Based on pkgs.nextjs-ollama-llm-ui. postPatch = '' @@ -65,11 +59,20 @@ buildNpmPackage (finalAttrs: { cp "${inter}/share/fonts/truetype/InterVariable.ttf" src/app/Inter.ttf ''; - preBuild = "npx drizzle-kit generate --dialect ${db true} --schema ./server/db/${db false}/schema.ts --name migration --out init"; + preBuild = '' + npm run set:oss + npm run set:${db true} + npx drizzle-kit generate --dialect ${db true} --schema ./server/db/${db false}/schema/ --name migration --out init + ''; - npmBuildScript = "build:${db false}"; + buildPhase = '' + runHook preBuild - postBuild = "npm run build:cli"; + npm run build:${db false} + npm run build:cli + + runHook postBuild + ''; preInstall = "mkdir -p $out/{bin,share/pangolin}"; @@ -168,9 +171,5 @@ buildNpmPackage (finalAttrs: { ]; platforms = lib.platforms.linux; mainProgram = "pangolin"; - insecure = true; - knownVulnerabilities = [ - "CVE-2025-55182" - ]; }; })