diff options
| author | Peter Simons <simons@cryp.to> | 2021-02-12 20:36:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 20:36:57 +0100 |
| commit | 81af1b95e260efe4135b88718b2f05b0535420f8 (patch) | |
| tree | 6c493f09fcd032c8f1ff49b5458685130264b5ab /pkgs/top-level | |
| parent | ba680416b9f820bf3cb4bdcd375e162e26a8221c (diff) | |
| parent | 3ae580be68cd7bad1d62c6edac51114d2fadd6fe (diff) | |
| download | nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.tar nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.tar.gz nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.tar.bz2 nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.tar.lz nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.tar.xz nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.tar.zst nixlib-81af1b95e260efe4135b88718b2f05b0535420f8.zip | |
Merge pull request #112893 from NixOS/haskell-updates
Update Haskell package set to Stackage Nightly 2021-02-10 (plus other fixes)
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf78fa128d77..d2189090774a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10059,7 +10059,7 @@ in # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8103; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; inherit (haskellPackages) ghc; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 46e222261fc8..6c8e3e7d855d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -114,6 +114,16 @@ in { buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; + ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + }; ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix { bootPkgs = packages.ghc8102Binary; inherit (buildPackages.python3Packages) sphinx; @@ -221,6 +231,11 @@ in { ghc = bh.compiler.ghc8103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; + ghc8104 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8104; + ghc = bh.compiler.ghc8104; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + }; ghc901 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc901; ghc = bh.compiler.ghc901; |