From de25c842e5e610b2aabc255df9e6ff6be0b6590b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 7 Jul 2026 13:34:28 +0200 Subject: [PATCH] fetchPnpmDeps: drop fetcherVersion = 3 for pnpm_11 and the related test --- .../node/fetch-pnpm-deps/default.nix | 4 ++ pkgs/test/pnpm/default.nix | 1 - pkgs/test/pnpm/pnpm_11_v3/default.nix | 60 ------------------- pkgs/test/pnpm/pnpm_11_v3/src/.gitignore | 2 - pkgs/test/pnpm/pnpm_11_v3/src/index.ts | 1 - pkgs/test/pnpm/pnpm_11_v3/src/package.json | 20 ------- pkgs/test/pnpm/pnpm_11_v3/src/pnpm-lock.yaml | 39 ------------ pkgs/test/pnpm/pnpm_11_v3/src/tsconfig.json | 13 ---- 8 files changed, 4 insertions(+), 136 deletions(-) delete mode 100644 pkgs/test/pnpm/pnpm_11_v3/default.nix delete mode 100644 pkgs/test/pnpm/pnpm_11_v3/src/.gitignore delete mode 100644 pkgs/test/pnpm/pnpm_11_v3/src/index.ts delete mode 100644 pkgs/test/pnpm/pnpm_11_v3/src/package.json delete mode 100644 pkgs/test/pnpm/pnpm_11_v3/src/pnpm-lock.yaml delete mode 100644 pkgs/test/pnpm/pnpm_11_v3/src/tsconfig.json diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 4305521667ca..fc1bafcb1b0c 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -65,6 +65,10 @@ in builtins.elem fetcherVersion supportedFetcherVersions || throw "fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."; + assert + !(fetcherVersion == 3 && lib.versionAtLeast pnpm.version "11.0.0") + || throw "fetchPnpmDeps `fetcherVersion = 3` is no longer supported for `pnpm_11`. Please upgrade to the latest, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."; + stdenvNoCC.mkDerivation ( finalAttrs: ( diff --git a/pkgs/test/pnpm/default.nix b/pkgs/test/pnpm/default.nix index 3a75e146cafa..aa2da06e1ac8 100644 --- a/pkgs/test/pnpm/default.nix +++ b/pkgs/test/pnpm/default.nix @@ -8,7 +8,6 @@ pnpm-empty-lockfile = callPackage ./pnpm-empty-lockfile { }; pnpm-fixup-state-db = callPackage ./pnpm-fixup-state-db { }; pnpm-workspaces = lib.recurseIntoAttrs (callPackage ./pnpm-workspaces { }); - pnpm_11_v3 = callPackage ./pnpm_11_v3 { }; pnpm_11_v4 = callPackage ./pnpm_11_v4 { }; # pnpm reverse dependencies that don't have a top-level package diff --git a/pkgs/test/pnpm/pnpm_11_v3/default.nix b/pkgs/test/pnpm/pnpm_11_v3/default.nix deleted file mode 100644 index fb07efe96667..000000000000 --- a/pkgs/test/pnpm/pnpm_11_v3/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - fetchPnpmDeps, - lib, - makeShellWrapper, - nodejs-slim, - pnpmConfigHook, - pnpm_11, - stdenv, - testers, -}: -let - pnpm = pnpm_11; -in -stdenv.mkDerivation (finalAttrs: { - pname = "pnpm-test"; - inherit (pnpm) version; - - src = ./src; - - pnpmDeps = testers.invalidateFetcherByDrvHash fetchPnpmDeps { - inherit (finalAttrs) pname version src; - inherit pnpm; - fetcherVersion = 3; - hash = "sha256-+Vrv5ZiVIARDZrR5/4OYRmaecQQZmcZFtMjK4qhXKb8="; - }; - - nativeBuildInputs = [ - makeShellWrapper - nodejs-slim - pnpm - pnpmConfigHook - ]; - - buildPhase = '' - runHook preBuild - - pnpm build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib/pnpm-11-test dist/index.js - - makeWrapper ${lib.getExe nodejs-slim} $out/bin/pnpm-11-test \ - --add-flags "$out/lib/pnpm-11-test" - - runHook postInstall - ''; - - __structuredAttrs = true; - - meta = { - license = lib.licenses.mit; - mainProgram = "pnpm-11-test"; - inherit (pnpm.meta) maintainers; - }; -}) diff --git a/pkgs/test/pnpm/pnpm_11_v3/src/.gitignore b/pkgs/test/pnpm/pnpm_11_v3/src/.gitignore deleted file mode 100644 index 1eae0cf6700c..000000000000 --- a/pkgs/test/pnpm/pnpm_11_v3/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -dist/ -node_modules/ diff --git a/pkgs/test/pnpm/pnpm_11_v3/src/index.ts b/pkgs/test/pnpm/pnpm_11_v3/src/index.ts deleted file mode 100644 index accefceba62b..000000000000 --- a/pkgs/test/pnpm/pnpm_11_v3/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello World"); diff --git a/pkgs/test/pnpm/pnpm_11_v3/src/package.json b/pkgs/test/pnpm/pnpm_11_v3/src/package.json deleted file mode 100644 index 1eb3b51b3886..000000000000 --- a/pkgs/test/pnpm/pnpm_11_v3/src/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "pnpm11test", - "version": "1.0.0", - "description": "", - "main": "dist/index.js", - "scripts": { - "build": "tsc", - "start": "node dist/index.js" - }, - "license": "MIT", - "packageManager": "pnpm", - "type": "module", - "files": [ - "dist/" - ], - "devDependencies": { - "@types/node": "^25.5.0", - "typescript": "^6.0.2" - } -} diff --git a/pkgs/test/pnpm/pnpm_11_v3/src/pnpm-lock.yaml b/pkgs/test/pnpm/pnpm_11_v3/src/pnpm-lock.yaml deleted file mode 100644 index def71aa4e5a2..000000000000 --- a/pkgs/test/pnpm/pnpm_11_v3/src/pnpm-lock.yaml +++ /dev/null @@ -1,39 +0,0 @@ -lockfileVersion: '9.0' - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false - -importers: - - .: - devDependencies: - '@types/node': - specifier: ^25.5.0 - version: 25.5.0 - typescript: - specifier: ^6.0.2 - version: 6.0.2 - -packages: - - '@types/node@25.5.0': - resolution: {integrity: sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==} - - typescript@6.0.2: - resolution: {integrity: sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==} - engines: {node: '>=14.17'} - hasBin: true - - undici-types@7.18.2: - resolution: {integrity: sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==} - -snapshots: - - '@types/node@25.5.0': - dependencies: - undici-types: 7.18.2 - - typescript@6.0.2: {} - - undici-types@7.18.2: {} diff --git a/pkgs/test/pnpm/pnpm_11_v3/src/tsconfig.json b/pkgs/test/pnpm/pnpm_11_v3/src/tsconfig.json deleted file mode 100644 index 3471bd329666..000000000000 --- a/pkgs/test/pnpm/pnpm_11_v3/src/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "compilerOptions": { - "target": "ESNext", - "module": "NodeNext", - "moduleResolution": "NodeNext", - "outDir": "dist", - "rootDir": ".", - "strict": true, - "esModuleInterop": true, - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true - } -}