diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 53 |
1 files changed, 12 insertions, 41 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e654b35d258d..ebf1d264f590 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -7,9 +7,8 @@ let integerSimpleExcludes = [ "ghc7103Binary" "ghc821Binary" + "ghc844" "ghcjs" - "ghcjs710" - "ghcjs80" "ghcjs82" "ghcjs84" "integer-simple" @@ -47,28 +46,12 @@ in { ghc7103Binary = callPackage ../development/compilers/ghc/7.10.3-binary.nix { }; ghc821Binary = callPackage ../development/compilers/ghc/8.2.1-binary.nix { }; - ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix { - bootPkgs = packages.ghc7103Binary; - buildLlvmPackages = buildPackages.llvmPackages_35; - llvmPackages = pkgs.llvmPackages_35; - }; - ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix { - bootPkgs = packages.ghc7103Binary; - inherit (buildPackages.python27Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_37; - llvmPackages = pkgs.llvmPackages_37; - }; ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix { bootPkgs = packages.ghc821Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_39; llvmPackages = pkgs.llvmPackages_39; }; - ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix { - bootPkgs = packages.ghc821Binary; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc821Binary; buildLlvmPackages = buildPackages.llvmPackages_5; @@ -79,31 +62,24 @@ 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; llvmPackages = pkgs.llvmPackages_5; }; ghcjs = compiler.ghcjs84; - # Use `import` because `callPackage inside`. - ghcjs710 = import ../development/compilers/ghcjs/7.10 { - bootPkgs = packages.ghc7103; - inherit (pkgs) cabal-install; - inherit (buildPackages) fetchgit fetchFromGitHub; - }; - # `import` on purpose; see above. - ghcjs80 = import ../development/compilers/ghcjs/8.0 { - bootPkgs = packages.ghc802; - inherit (pkgs) cabal-install; - inherit (buildPackages) fetchgit fetchFromGitHub; - }; ghcjs82 = callPackage ../development/compilers/ghcjs-ng { bootPkgs = packages.ghc822; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json; stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc843; + bootPkgs = packages.ghc844; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; @@ -126,22 +102,12 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc7103 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc7103; - ghc = bh.compiler.ghc7103; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; - }; 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; }; - ghc802 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc802; - ghc = bh.compiler.ghc802; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; - }; ghc821Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc821Binary; ghc = bh.compiler.ghc821Binary; @@ -168,6 +134,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; |