llvmPackages_{19,20,git}.bolt: move patches out of common

authored by Tristan Ross and committed by Alyssa Ross 41d68f67 72a9bc94

+13 -11
+13 -1
pkgs/development/compilers/llvm/common/bolt/default.nix
··· 15 buildLlvmTools, 16 patches ? [ ], 17 devExtraCmakeFlags ? [ ], 18 }: 19 20 stdenv.mkDerivation (finalAttrs: { 21 pname = "bolt"; 22 - inherit version patches; 23 24 # Blank llvm dir just so relative path works 25 src = runCommand "bolt-src-${finalAttrs.version}" { inherit (monorepoSrc) passthru; } ( ··· 40 ); 41 42 sourceRoot = "${finalAttrs.src.name}/bolt"; 43 44 nativeBuildInputs = [ 45 cmake
··· 15 buildLlvmTools, 16 patches ? [ ], 17 devExtraCmakeFlags ? [ ], 18 + fetchpatch, 19 }: 20 21 stdenv.mkDerivation (finalAttrs: { 22 pname = "bolt"; 23 + inherit version; 24 25 # Blank llvm dir just so relative path works 26 src = runCommand "bolt-src-${finalAttrs.version}" { inherit (monorepoSrc) passthru; } ( ··· 41 ); 42 43 sourceRoot = "${finalAttrs.src.name}/bolt"; 44 + 45 + patches = lib.optionals (lib.versions.major release_version == "19") [ 46 + (fetchpatch { 47 + url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; 48 + hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; 49 + }) 50 + (fetchpatch { 51 + url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; 52 + hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; 53 + }) 54 + ]; 55 56 nativeBuildInputs = [ 57 cmake
-10
pkgs/development/compilers/llvm/common/default.nix
··· 988 } 989 // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") { 990 bolt = callPackage ./bolt { 991 - patches = lib.optionals (lib.versions.major metadata.release_version == "19") [ 992 - (fetchpatch { 993 - url = "https://github.com/llvm/llvm-project/commit/abc2eae68290c453e1899a94eccc4ed5ea3b69c1.patch"; 994 - hash = "sha256-oxCxOjhi5BhNBEraWalEwa1rS3Mx9CuQgRVZ2hrbd7M="; 995 - }) 996 - (fetchpatch { 997 - url = "https://github.com/llvm/llvm-project/commit/5909979869edca359bcbca74042c2939d900680e.patch"; 998 - hash = "sha256-l4rQHYbblEADBXaZIdqTG0sZzH4fEQvYiqhLYNZDMa8="; 999 - }) 1000 - ]; 1001 }; 1002 } 1003 );
··· 988 } 989 // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") { 990 bolt = callPackage ./bolt { 991 }; 992 } 993 );