diff options
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 121 |
1 files changed, 51 insertions, 70 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3e85109527e..86a09b4a1fa 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,12 +1,11 @@ -{ buildPackages, pkgs, newScope }: +{ buildPackages, pkgs, newScope, stdenv }: let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ - "ghc822Binary" "ghc865Binary" - "ghcjs" - "ghcjs86" + "ghc8102Binary" + "ghc8102BinaryMinimal" "integer-simple" "native-bignum" "ghcHEAD" @@ -43,62 +42,60 @@ let in { lib = haskellLib; - compiler = { + package-list = callPackage ../development/haskell-modules/package-list.nix {}; - ghc822Binary = callPackage ../development/compilers/ghc/8.2.2-binary.nix { }; + compiler = { ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; - ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { - bootPkgs = packages.ghc822Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; - }; - ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; + ghc8102Binary = callPackage ../development/compilers/ghc/8.10.2-binary.nix { + llvmPackages = pkgs.llvmPackages_9; }; - ghc883 = callPackage ../development/compilers/ghc/8.8.3.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; + + ghc8102BinaryMinimal = callPackage ../development/compilers/ghc/8.10.2-binary.nix { + llvmPackages = pkgs.llvmPackages_9; + minimal = true; }; + ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + bootPkgs = if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then + packages.ghc8102BinaryMinimal + else + 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; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; - ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { - bootPkgs = packages.ghc865Binary; + ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { + # aarch64 ghc8102Binary exceeds max output size on hydra + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_9; - llvmPackages = pkgs.llvmPackages_9; + buildLlvmPackages = buildPackages.llvmPackages_10; + llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc883; # no binary yet + bootPkgs = packages.ghc901; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; libffi = pkgs.libffi; }; - ghcjs = compiler.ghcjs86; - ghcjs86 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc865; - 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 {}; - }; # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. @@ -127,60 +124,44 @@ in { # Always get compilers from `buildPackages` packages = let bh = buildPackages.haskell; in { - ghc822Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc822Binary; - ghc = bh.compiler.ghc822Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc865Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865Binary; ghc = bh.compiler.ghc865Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc865 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc865; - ghc = bh.compiler.ghc865; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - }; - ghc882 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc882; - ghc = bh.compiler.ghc882; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; + ghc8102Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8102Binary; + ghc = bh.compiler.ghc8102Binary; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = bootstrapPackageSet; }; - ghc883 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc883; - ghc = bh.compiler.ghc883; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; + ghc8102BinaryMinimal = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8102BinaryMinimal; + ghc = bh.compiler.ghc8102BinaryMinimal; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = bootstrapPackageSet; }; 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; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; - ghc8102 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8102; - ghc = bh.compiler.ghc8102; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + ghc901 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc901; + ghc = bh.compiler.ghc901; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs86; - ghcjs86 = callPackage ../development/haskell-modules rec { - buildHaskellPackages = ghc.bootPkgs; - ghc = bh.compiler.ghcjs86; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; - packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; - }; # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. |