pyrox.dev / nixpkgs
lol
fork atom

llvmPackages: Dedupe monorepoSrc

Artturin e6751897 5ac86a99

+24 -47
+1 -15
pkgs/development/compilers/llvm/15/default.nix
··· 54 54 let 55 55 monorepoSrc' = monorepoSrc; 56 56 in let 57 - monorepoSrc = if monorepoSrc' != null then 58 - monorepoSrc' 59 - else let 60 - sha256 = releaseInfo.original.sha256; 61 - rev = if gitRelease != null then 62 - gitRelease.rev 63 - else 64 - "llvmorg-${releaseInfo.version}"; 65 - in fetchFromGitHub { 66 - owner = "llvm"; 67 - repo = "llvm-project"; 68 - inherit rev sha256; 69 - }; 70 - 71 57 # Import releaseInfo separately to avoid infinite recursion 72 58 inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; 73 59 inherit (releaseInfo) release_version version; 74 - inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; 60 + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; 75 61 76 62 tools = lib.makeExtensible (tools: let 77 63 callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });
+1 -15
pkgs/development/compilers/llvm/16/default.nix
··· 54 54 let 55 55 monorepoSrc' = monorepoSrc; 56 56 in let 57 - monorepoSrc = if monorepoSrc' != null then 58 - monorepoSrc' 59 - else let 60 - sha256 = releaseInfo.original.sha256; 61 - rev = if gitRelease != null then 62 - gitRelease.rev 63 - else 64 - "llvmorg-${releaseInfo.version}"; 65 - in fetchFromGitHub { 66 - owner = "llvm"; 67 - repo = "llvm-project"; 68 - inherit rev sha256; 69 - }; 70 - 71 57 # Import releaseInfo separately to avoid infinite recursion 72 58 inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; 73 59 inherit (releaseInfo) release_version version; 74 - inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; 60 + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; 75 61 76 62 tools = lib.makeExtensible (tools: let 77 63 callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });
+21 -1
pkgs/development/compilers/llvm/common/common-let.nix
··· 1 1 { lib 2 + , fetchFromGitHub ? null 2 3 , release_version ? null 3 4 , gitRelease ? null 4 5 , officialRelease ? null 6 + , monorepoSrc' ? null 5 7 }: 6 8 7 - { 9 + rec { 8 10 llvm_meta = { 9 11 license = lib.licenses.ncsa; 10 12 maintainers = lib.teams.llvm.members; ··· 36 38 else 37 39 release_version; 38 40 }; 41 + 42 + monorepoSrc = 43 + if monorepoSrc' != null then 44 + monorepoSrc' 45 + else 46 + let 47 + sha256 = releaseInfo.original.sha256; 48 + rev = 49 + if gitRelease != null then 50 + gitRelease.rev 51 + else 52 + "llvmorg-${releaseInfo.version}"; 53 + in 54 + fetchFromGitHub { 55 + owner = "llvm"; 56 + repo = "llvm-project"; 57 + inherit rev sha256; 58 + }; 39 59 40 60 }
+1 -16
pkgs/development/compilers/llvm/git/default.nix
··· 53 53 let 54 54 monorepoSrc' = monorepoSrc; 55 55 in let 56 - monorepoSrc = if monorepoSrc' != null then 57 - monorepoSrc' 58 - else let 59 - sha256 = releaseInfo.original.sha256; 60 - rev = if gitRelease != null then 61 - gitRelease.rev 62 - else 63 - "llvmorg-${releaseInfo.version}"; 64 - in fetchFromGitHub { 65 - owner = "llvm"; 66 - repo = "llvm-project"; 67 - inherit rev sha256; 68 - }; 69 - 70 - 71 56 # Import releaseInfo separately to avoid infinite recursion 72 57 inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo; 73 58 inherit (releaseInfo) release_version version; 74 - inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta; 59 + inherit (import ../common/common-let.nix { inherit lib fetchFromGitHub release_version gitRelease officialRelease monorepoSrc'; }) llvm_meta monorepoSrc; 75 60 76 61 tools = lib.makeExtensible (tools: let 77 62 callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });