diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 13c5b7213013d..662ba91514dd6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -5,7 +5,6 @@ let integerSimpleExcludes = [ "ghc822Binary" "ghc865Binary" - "ghc844" "ghcjs" "ghcjs86" "integer-simple" @@ -44,12 +43,6 @@ in { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; - ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { - bootPkgs = packages.ghc822Binary; - sphinx = buildPackages.python3Packages.sphinx_1_7_9; - buildLlvmPackages = buildPackages.llvmPackages_5; - llvmPackages = pkgs.llvmPackages_5; - }; ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -68,6 +61,12 @@ in { buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; + ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { + bootPkgs = packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_7; + llvmPackages = pkgs.llvmPackages_7; + }; ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix { bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; @@ -118,11 +117,6 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc844 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc844; - ghc = bh.compiler.ghc844; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; - }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; @@ -138,6 +132,11 @@ in { ghc = bh.compiler.ghc883; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; + ghc884 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc884; + ghc = bh.compiler.ghc884; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; + }; ghc8101 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc8101; ghc = bh.compiler.ghc8101; |