diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 38d081b62d5a..d5f7f0a8405a 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -478,18 +478,7 @@ let stripLen = 1; hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg="; }) - ] - ++ - lib.optional (lib.versions.major metadata.release_version == "20") - # Fix for vt_gen, remove during next git bump - # https://github.com/llvm/llvm-project/pull/109817 - ( - fetchpatch { - url = "https://github.com/llvm/llvm-project/commit/cace9869775a185793122f845d81a5ff46f15728.patch"; - stripLen = 1; - hash = "sha256-lt1iQfNIc3ot1+6J7d7dbqULwT0MyLIwR2EZB7RfPp4="; - } - ); + ]; pollyPatches = [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ] ++ lib.optional (lib.versionAtLeast metadata.release_version "15") diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 94c7d66556ed..813c4d44fcb8 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -30,9 +30,9 @@ let "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE="; "19.1.0".officialRelease.sha256 = "sha256-/Ano8LwpGmW3C1ovJyvY3WIfliVkQi130f70WazwzGc="; "20.0.0-git".gitRelease = { - rev = "81c3499531c3fe03827bd8bc890e3a16db9e4c3c"; - rev-version = "20.0.0-unstable-2024-09-22"; - sha256 = "sha256-mQZhQ0qfWs4NmL62H3wNwG28iARUasWh9m8zMCNkRis="; + rev = "64f2bff12b8ac40c79004ffacf46a5294600d219"; + rev-version = "20.0.0-unstable-2024-09-29"; + sha256 = "sha256-BUlnks9rFjvKRIy7lWhOJQKKNVTewBiCFDbgyRBvuEw="; }; } // llvmVersions;