diff options
| author | Peter Simons <simons@cryp.to> | 2019-03-16 10:24:20 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-03-16 20:30:58 +0100 |
| commit | 93e4a90502b1a3710f3aa52ead204ec847d5ff3f (patch) | |
| tree | 2805b263300eb083d115e114ac3b207a7b755439 /pkgs/top-level/haskell-packages.nix | |
| parent | 106db715f9d7b2c2a87e2142ebefa77d7231214f (diff) | |
ghc: switch our default compiler to version 8.6.4
Also, drop obsolete 8.6.x minor releases 8.6.1, 8.6.2, and 8.6.3.
(cherry picked from commit 7fde42b8ebddbd673342b98d9d7c892a0c521583)
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aeb3b471a149..6551fb9aff17 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -59,12 +59,6 @@ in { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghc863 = callPackage ../development/compilers/ghc/8.6.3.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; - }; ghc864 = callPackage ../development/compilers/ghc/8.6.4.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -85,7 +79,7 @@ in { ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; }; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc863; + bootPkgs = packages.ghc864; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.6/git.json; stage0 = ../development/compilers/ghcjs-ng/8.6/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.6/dep-overrides.nix {}; @@ -130,11 +124,6 @@ in { ghc = bh.compiler.ghc844; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; }; - ghc863 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc863; - ghc = bh.compiler.ghc863; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - }; ghc864 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc864; ghc = bh.compiler.ghc864; |