diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 052b84f269e..13c5b721301 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -56,12 +56,6 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; - ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; @@ -81,10 +75,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc865Binary; + bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; + buildLlvmPackages = buildPackages.llvmPackages_10; + llvmPackages = pkgs.llvmPackages_10; + libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs86; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { @@ -133,11 +128,6 @@ in { ghc = bh.compiler.ghc865; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; - ghc881 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc881; - ghc = bh.compiler.ghc881; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; ghc882 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc882; ghc = bh.compiler.ghc882; |