diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 13250ea8814..80dd1a04e73 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -5,8 +5,8 @@ let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ - "ghc7103Binary" "ghc821Binary" + "ghc844" "ghcjs" "ghcjs82" "ghcjs84" @@ -42,7 +42,6 @@ in { compiler = { - ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { @@ -61,6 +60,11 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; + ghc862 = callPackage ../development/compilers/ghc/8.6.2.nix { + bootPkgs = packages.ghc822; + buildLlvmPackages = buildPackages.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_6; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc821Binary; buildLlvmPackages = buildPackages.llvmPackages_5; @@ -96,12 +100,6 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc7103Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc7103Binary; - ghc = bh.compiler.ghc7103Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc821Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc821Binary; ghc = bh.compiler.ghc821Binary; @@ -113,11 +111,6 @@ in { ghc = bh.compiler.ghc822; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; - ghc843 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc843; - ghc = bh.compiler.ghc843; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc844 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc844; ghc = bh.compiler.ghc844; @@ -128,6 +121,11 @@ in { ghc = bh.compiler.ghc861; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; + ghc862 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc862; + ghc = bh.compiler.ghc862; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; |