gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages: Dedupe releaseInfo

Browse Source
This commit is contained in:
Artturin
2023-11-21 01:46:51 +02:00
parent 2902f99c57
commit 5ac86a99e7
4 changed files with 30 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/15/default.nix
+3 -15
View File
@@ -54,19 +54,6 @@ in
let
monorepoSrc' = monorepoSrc;
in let
releaseInfo = if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version = if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc = if monorepoSrc' != null then
monorepoSrc'
else let
@@ -81,9 +68,10 @@ in let
inherit rev sha256;
};
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });
pkgs/development/compilers/llvm/16/default.nix
+3 -15
View File
@@ -54,19 +54,6 @@ in
let
monorepoSrc' = monorepoSrc;
in let
releaseInfo = if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version = if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc = if monorepoSrc' != null then
monorepoSrc'
else let
@@ -81,9 +68,10 @@ in let
inherit rev sha256;
};
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });
pkgs/development/compilers/llvm/common/common-let.nix
+20 -1
View File
@@ -1,4 +1,8 @@
{ lib, release_version }:
{ lib
, release_version ? null
, gitRelease ? null
, officialRelease ? null
}:
{
llvm_meta = {
@@ -18,4 +22,19 @@
lib.optionals (lib.versionAtLeast release_version "14") lib.platforms.m68k;
};
releaseInfo =
if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version =
if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
}
pkgs/development/compilers/llvm/git/default.nix
+4 -15
View File
@@ -53,19 +53,6 @@ in
let
monorepoSrc' = monorepoSrc;
in let
releaseInfo = if gitRelease != null then rec {
original = gitRelease;
release_version = original.version;
version = gitRelease.rev-version;
} else rec {
original = officialRelease;
release_version = original.version;
version = if original ? candidate then
"${release_version}-${original.candidate}"
else
release_version;
};
monorepoSrc = if monorepoSrc' != null then
monorepoSrc'
else let
@@ -80,9 +67,11 @@ in let
inherit rev sha256;
};
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib release_version; }) llvm_meta;
# Import releaseInfo separately to avoid infinite recursion
inherit (import ../common/common-let.nix { inherit lib gitRelease officialRelease; }) releaseInfo;
inherit (releaseInfo) release_version version;
inherit (import ../common/common-let.nix { inherit lib release_version gitRelease officialRelease; }) llvm_meta;
tools = lib.makeExtensible (tools: let
callPackage = newScope (tools // { inherit stdenv cmake ninja libxml2 python3 release_version version monorepoSrc buildLlvmTools; });