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

haskell.compiler.ghc{924,963,984}Binary: remove LLVM‐related dead code

Browse Source 
These binary packages are available for a fixed set of platforms,
all of which support the native code generator. Therefore, the
`llvmPackages` argument was never used. We leave an assertion around,
just in case.
This commit is contained in:
Emily
2025-09-03 03:42:44 +01:00
parent a9b8698728
commit 1bda5b199d
4 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/9.2.4-binary.nix
+3 -7
View File
@@ -10,7 +10,6 @@
libiconv,
numactl,
libffi,
llvmPackages,
coreutils,
targetPackages,
@@ -193,8 +192,6 @@ let
) binDistUsed.archSpecificLibraries
)).nixPackage;
useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
libPath = lib.makeLibraryPath (
# Add arch-specific libraries.
map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
@@ -207,9 +204,6 @@ let
targetPackages.stdenv.cc.bintools
coreutils # for cat
]
++ lib.optionals useLLVM [
(lib.getBin llvmPackages.llvm)
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
@@ -217,6 +211,8 @@ let
in
assert import ./common-have-ncg.nix { inherit lib stdenv version; };
stdenv.mkDerivation {
inherit version;
pname = "ghc-binary${binDistUsed.variantSuffix}";
@@ -470,7 +466,7 @@ stdenv.mkDerivation {
targetPrefix = "";
enableShared = true;
inherit llvmPackages;
llvmPackages = null;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
pkgs/development/compilers/ghc/9.6.3-binary.nix
+3 -7
View File
@@ -10,7 +10,6 @@
libiconv,
numactl,
libffi,
llvmPackages,
coreutils,
targetPackages,
@@ -192,8 +191,6 @@ let
) binDistUsed.archSpecificLibraries
)).nixPackage;
useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
libPath = lib.makeLibraryPath (
# Add arch-specific libraries.
map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
@@ -206,9 +203,6 @@ let
targetPackages.stdenv.cc.bintools
coreutils # for cat
]
++ lib.optionals useLLVM [
(lib.getBin llvmPackages.llvm)
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
@@ -216,6 +210,8 @@ let
in
assert import ./common-have-ncg.nix { inherit lib stdenv version; };
stdenv.mkDerivation {
inherit version;
pname = "ghc-binary${binDistUsed.variantSuffix}";
@@ -449,7 +445,7 @@ stdenv.mkDerivation {
targetPrefix = "";
enableShared = true;
inherit llvmPackages;
llvmPackages = null;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
pkgs/development/compilers/ghc/9.8.4-binary.nix
+3 -7
View File
@@ -9,7 +9,6 @@
libiconv,
numactl,
libffi,
llvmPackages,
coreutils,
targetPackages,
@@ -206,8 +205,6 @@ let
) binDistUsed.archSpecificLibraries
)).nixPackage;
useLLVM = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
libPath = lib.makeLibraryPath (
# Add arch-specific libraries.
map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
@@ -220,9 +217,6 @@ let
targetPackages.stdenv.cc.bintools
coreutils # for cat
]
++ lib.optionals useLLVM [
(lib.getBin llvmPackages.llvm)
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
@@ -230,6 +224,8 @@ let
in
assert import ./common-have-ncg.nix { inherit lib stdenv version; };
stdenv.mkDerivation {
inherit version;
pname = "ghc-binary${binDistUsed.variantSuffix}";
@@ -464,7 +460,7 @@ stdenv.mkDerivation {
targetPrefix = "";
enableShared = true;
inherit llvmPackages;
llvmPackages = null;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
pkgs/top-level/haskell-packages.nix
+3 -9
View File
@@ -74,17 +74,11 @@ in
llvmPackages = pkgs.llvmPackages_12;
};
ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix {
llvmPackages = pkgs.llvmPackages_12;
};
ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { };
ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix {
llvmPackages = pkgs.llvmPackages_15;
};
ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix { };
ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix {
llvmPackages = pkgs.llvmPackages_15;
};
ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { };
ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix {
bootPkgs =