diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a6044c7d6c4b..cca0b7ba3460 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -75,8 +75,8 @@ in rec { ghc861 = callPackage ../development/compilers/ghc/8.6.1.nix rec { bootPkgs = packages.ghc822; inherit (bootPkgs) alex happy hscolour; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; + buildLlvmPackages = buildPackages.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_6; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc821Binary; @@ -156,6 +156,11 @@ in rec { ghc = bh.compiler.ghc843; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; + ghc861 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc861; + ghc = bh.compiler.ghc861; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; @@ -195,6 +200,7 @@ in rec { (pkgs.lib.attrNames packages); in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override { ghc = bh.compiler.integer-simple."${name}"; + buildHaskellPackages = bh.packages.integer-simple."${name}"; overrides = _self : _super : { integer-simple = null; integer-gmp = null; |