tarball-mirror: roll back to nix 2.18 for now

Undefined subroutine &main::isValidPath called at ./maintainers/scripts/copy-tarballs.pl line 25. Nix got upgraded by switching the default stable NixOS to 24.11.
NixOS · Dec 1, 2024 · e8ae7d8 · e8ae7d8
1 parent b312050
commit e8ae7d8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/modules/tarball-mirror.nix b/modules/tarball-mirror.nix
@@ -59,7 +59,8 @@ in
       fi
       cd $dir
       git remote update origin
-      git checkout origin/${branch}
+      git checkout -f origin/${branch}
+      git apply ${./tarball-mirror.patch}
       # FIXME: use IAM role.
       export AWS_ACCESS_KEY_ID=$(sed 's/aws_access_key_id=\(.*\)/\1/ ; t; d' ${config.age.secrets.tarball-mirror-aws-credentials.path})
       export AWS_SECRET_ACCESS_KEY=$(sed 's/aws_secret_access_key=\(.*\)/\1/ ; t; d' ${config.age.secrets.tarball-mirror-aws-credentials.path})

diff --git a/modules/tarball-mirror.patch b/modules/tarball-mirror.patch
@@ -0,0 +1,11 @@
+diff --git a/maintainers/scripts/copy-tarballs.pl b/maintainers/scripts/copy-tarballs.pl
+index 30fbac6f002d..71569966d51b 100755
+--- a/maintainers/scripts/copy-tarballs.pl
++++ b/maintainers/scripts/copy-tarballs.pl
+@@ -1,5 +1,5 @@
+ #! /usr/bin/env nix-shell
+-#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nix nix.perl-bindings
++#! nix-shell -i perl -p perl perlPackages.NetAmazonS3 perlPackages.FileSlurp perlPackages.JSON perlPackages.LWPProtocolHttps nixVersions.nix_2_18 nixVersions.nix_2_18.perl-bindings
+
+ # This command uploads tarballs to tarballs.nixos.org, the
+ # content-addressed cache used by fetchurl as a fallback for when