diff options
| -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 { |