fetchPnpmDeps: remove fetcherVersion = 1 and 2 (#523933)

doc/languages-frameworks/javascript.section.md

@@ -513,10 +513,10 @@ Changes can include workarounds or bug fixes to existing PNPM issues.
 
 ##### Version history {#javascript-pnpm-fetcherVersion-versionHistory}
 
-Version 3 is the recommended value for new packages. Versions 1 and 2 are deprecated and scheduled for removal in the 26.11 release; existing packages must migrate.
+Version 3 is the minimum supported value. Versions 1 and 2 were removed in the 26.11 release; packages that still use them fail to evaluate and must migrate to `fetcherVersion = 3` (or later) and regenerate their hashes.
 
-- 1: Initial version, nothing special.
-- 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975)
+- 1: Initial version, nothing special. (removed in 26.11)
+- 2: [Ensure consistent permissions](https://github.com/NixOS/nixpkgs/pull/422975) (removed in 26.11)
 - 3: [Build a reproducible tarball](https://github.com/NixOS/nixpkgs/pull/469950)
 - 4: [Dump SQLite database to an SQL file](https://github.com/NixOS/nixpkgs/pull/522703)
 

doc/release-notes/rl-2611.section.md

@@ -29,6 +29,13 @@
 
 - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias.
 
+- `fetchPnpmDeps`' `fetcherVersion = 1` and `fetcherVersion = 2` have been
+  removed, as announced in the 26.05 release. Packages still using them now
+  throw an evaluation error and must migrate to `fetcherVersion = 3` (or later)
+  and regenerate their hashes. See the
+  [pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the manual
+  for details.
+
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

pkgs/build-support/node/fetch-pnpm-deps/default.nix

@@ -17,8 +17,6 @@ let
   pnpmLatest = pnpm;
 
   supportedFetcherVersions = [
-    1 # First version. Here to preserve backwards compatibility
-    2 # Ensure consistent permissions. See https://github.com/NixOS/nixpkgs/pull/422975
     3 # Build a reproducible tarball. See https://github.com/NixOS/nixpkgs/pull/469950
     4 # Dump SQLite database to an SQL file. See https://github.com/NixOS/nixpkgs/pull/522703
   ];
@@ -63,15 +61,15 @@ in
       fetcherVersion != null
       || throw "fetchPnpmDeps: `fetcherVersion` is not set, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion.";
 
+    assert
+      !(fetcherVersion == 1 || fetcherVersion == 2)
+      || throw "fetchPnpmDeps: `fetcherVersion = ${toString fetcherVersion}` was removed in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion.";
+
     assert
       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.";
 
-    lib.warnIf (fetcherVersion < 3)
-      "fetchPnpmDeps: `fetcherVersion = ${toString fetcherVersion}` is deprecated and scheduled for removal in the 26.11 release. Please migrate `${pname}` to `fetcherVersion = 3` and regenerate the hash. See https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."
-
-      stdenvNoCC.mkDerivation
-      (
+    stdenvNoCC.mkDerivation (
       finalAttrs:
       (
         args'
@@ -108,15 +106,10 @@ in
               exit 1
             fi
 
-              # For fetcherVersion < 3, the pnpm store files are placed directly into $out.
-              # For fetcherVersion >= 3, it is bundled into a compressed tarball within $out,
+            # The pnpm store is bundled into a compressed tarball within $out,
             # without distributing the uncompressed store files.
-              if [[ ${toString fetcherVersion} -ge 3 ]]; then
             mkdir $out
             storePath=$(mktemp -d)
-              else
-                storePath=$out
-              fi
 
             pushd "$HOME"
             pnpmVersion=$(pnpm --version)
@@ -155,10 +148,8 @@ in
                 --registry="$NIX_NPM_REGISTRY" \
                 --frozen-lockfile
 
-              # Store newer fetcherVersion in case pnpmConfigHook also needs it
-              if [[ ${toString fetcherVersion} -gt 1 ]]; then
+            # Record the fetcherVersion in the output for introspection.
             echo ${toString fetcherVersion} > $out/.fetcher-version
-              fi
 
             runHook postInstall
           '';
@@ -198,13 +189,10 @@ in
             # * All folders have 555.
             # See https://github.com/NixOS/nixpkgs/pull/350063
             # See https://github.com/NixOS/nixpkgs/issues/422889
-              if [[ ${toString fetcherVersion} -ge 2 ]]; then
             find $storePath -type f -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 555
             find $storePath -type f -not -name "*-exec" -print0 | xargs --no-run-if-empty -0 chmod 444
             find $storePath -type d -print0 | xargs --no-run-if-empty -0 chmod 555
-              fi
 
-              if [[ ${toString fetcherVersion} -ge 3 ]]; then
             (
               cd $storePath
 
@@ -215,7 +203,6 @@ in
                 --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
                 --zstd -cf $out/pnpm-store.tar.zst .
             )
-              fi
 
             runHook postFixup
           '';

pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh

@@ -40,7 +40,7 @@ pnpmConfigHook() {
 
     echo "Found 'pnpm' with version '$pnpmVersion'"
 
-    fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version" || echo 1)
+    fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version")
 
     echo "Using fetcherVersion: $fetcherVersion"
 
@@ -52,11 +52,7 @@ pnpmConfigHook() {
     export npm_config_platform="@npmPlatform@"
     export pnpm_config_platform="@npmPlatform@"
 
-    if [[ $fetcherVersion -ge 3 ]]; then
     tar --zstd -xf "$pnpmDeps/pnpm-store.tar.zst" -C "$STORE_PATH"
-    else
-      cp -Tr "$pnpmDeps" "$STORE_PATH"
-    fi
 
     chmod -R +w "$STORE_PATH"
 

pkgs/build-support/node/fetch-pnpm-deps/serve.nix

@@ -17,8 +17,6 @@ writeShellApplication {
   text = ''
     storePath=$(mktemp -d)
 
-    fetcherVersion=$(cat "${pnpmDeps}/.fetcher-version" || echo 1)
-
     clean() {
       echo "Cleaning up temporary store at '$storePath'..."
 
@@ -27,11 +25,7 @@ writeShellApplication {
 
     echo "Copying pnpm store '${pnpmDeps}' to temporary store..."
 
-    if [[ $fetcherVersion -ge 3 ]]; then
     tar --zstd -xf "${pnpmDeps}/pnpm-store.tar.zst" -C "$storePath"
-    else
-      cp -Tr "${pnpmDeps}" "$storePath"
-    fi
 
     chmod -R +w "$storePath"