diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-11-19 18:51:52 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-12-04 19:43:07 +0100 |
| commit | 274c1f0970e715ba4793fcd68b666af03a79a83e (patch) | |
| tree | 99a33514ebe8988dd79c29b239622423ebc44d14 | |
| parent | bd151aad5bceba29d3c78f4df848ef9fabe55939 (diff) | |
| download | nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.tar nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.tar.gz nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.tar.bz2 nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.tar.lz nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.tar.xz nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.tar.zst nixlib-274c1f0970e715ba4793fcd68b666af03a79a83e.zip | |
haskell.compiler.ghc865Binary: don't pass llvmPackages_6
We want to remove llvmPackages_6, but it is the only version GHC 8.6.5 supports. Luckily, we actually don't need LLVM in any case, since all X86 architectures have native codegen for Darwin and Linux, as well as POWER for Linux. Consequently, we can just pass `null` and add an extra assert to make this more transparent to future tinkerers.
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5-binary.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 7de4bd035448..58e61604cd61 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -40,7 +40,7 @@ let targetPackages.stdenv.cc.bintools coreutils # for cat ] - ++ lib.optionals useLLVM [ + ++ lib.optionals (assert useLLVM -> !(llvmPackages == null); useLLVM) [ (lib.getBin llvmPackages.llvm) ] # On darwin, we need unwrapped bintools as well (for otool) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 02a30c5fadb2..44ff6a6dd59e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -65,7 +65,8 @@ in { compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { - llvmPackages = pkgs.llvmPackages_6; + # Should be llvmPackages_6 which has been removed from nixpkgs + llvmPackages = null; }; ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { |