summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2022-03-13 13:33:21 +0100
committerMichael Weiss <dev.primeos@gmail.com>2022-03-13 13:34:50 +0100
commit90d9b7c8dc770611f744aa6fad2e1f32a167e807 (patch)
treefca2ebd62ecbde361b10252d9337bba54284ddef /pkgs/development/compilers
parente7eaee7da81d8b41dd231981b6d58059723e7696 (diff)
downloadnixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.tar
nixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.tar.gz
nixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.tar.bz2
nixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.tar.lz
nixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.tar.xz
nixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.tar.zst
nixpkgs-90d9b7c8dc770611f744aa6fad2e1f32a167e807.zip
llvmPackages: Fix the update script
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/llvm/14/llvm/default.nix3
-rwxr-xr-xpkgs/development/compilers/llvm/update.sh8
2 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix
index d2059cc66ba..05aac728b45 100644
--- a/pkgs/development/compilers/llvm/14/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/14/llvm/default.nix
@@ -209,6 +209,9 @@ in stdenv.mkDerivation (rec {
 
   checkTarget = "check-all";
 
+  # For the update script:
+  passthru.monorepoSrc = monorepoSrc;
+
   requiredSystemFeatures = [ "big-parallel" ];
   meta = llvm_meta // {
     homepage = "https://llvm.org/";
diff --git a/pkgs/development/compilers/llvm/update.sh b/pkgs/development/compilers/llvm/update.sh
index 603c603f275..95ad356dbd9 100755
--- a/pkgs/development/compilers/llvm/update.sh
+++ b/pkgs/development/compilers/llvm/update.sh
@@ -20,7 +20,11 @@ sed -Ei \
 
 readonly ATTRSET="llvmPackages_$VERSION_MAJOR"
 
-if [ "$VERSION_MAJOR" -ge "13" ]; then
+if [ "$VERSION_MAJOR" -ge "14" ]; then
+  readonly SOURCES=(
+    "llvm.monorepoSrc"
+  )
+elif [ "$VERSION_MAJOR" -eq "13" ]; then
   readonly SOURCES=(
     "llvm.src"
   )
@@ -43,7 +47,7 @@ fi
 for SOURCE in "${SOURCES[@]}"; do
   echo "Updating the hash of $SOURCE:"
   declare ATTR="$ATTRSET.$SOURCE"
-  declare OLD_HASH="$(nix eval -f . $ATTR.outputHash)"
+  declare OLD_HASH="$(nix --extra-experimental-features nix-command eval -f . $ATTR.outputHash)"
   declare NEW_HASH="\"$(nix-prefetch-url -A $ATTR)\""
   find "$DIR" -type f -exec sed -i "s/$OLD_HASH/$NEW_HASH/" {} +
 done