diff options
| author | Peter Simons <simons@cryp.to> | 2018-11-02 17:42:42 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2018-11-02 19:21:58 +0100 |
| commit | 508ce6e208c2cce1522c6b399a1344c3008133d4 (patch) | |
| tree | 8d45f30128aee80762e4c44a52d44e65e74aa4d5 /pkgs | |
| parent | c9e13806267f7fd3351d52a19cc6db5fa2985ca9 (diff) | |
| download | nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.tar nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.tar.gz nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.tar.bz2 nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.tar.lz nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.tar.xz nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.tar.zst nixlib-508ce6e208c2cce1522c6b399a1344c3008133d4.zip | |
haskellPackages: default to ghc 8.4.4 as per Stackage LTS 12.16
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1b85a564e31b..aa96bebc21b8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,6 +1,6 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.4.3 +compiler: ghc-8.4.4 core-packages: - array-0.5.2.0 @@ -12,12 +12,12 @@ core-packages: - deepseq-1.4.3.0 - directory-1.3.1.5 - filepath-1.4.2 - - ghc-8.4.3 - - ghc-boot-8.4.3 - - ghc-boot-th-8.4.3 + - ghc-8.4.4 + - ghc-boot-8.4.4 + - ghc-boot-th-8.4.4 - ghc-compact-0.1.0.0 - ghc-prim-0.5.2.0 - - ghci-8.4.3 + - ghci-8.4.4 - haskeline-0.7.4.2 - hpc-0.6.0.3 - integer-gmp-1.0.2.0 @@ -26,10 +26,10 @@ core-packages: - pretty-1.1.3.6 - process-1.6.3.0 - rts-1.0 - - stm-2.4.5.0 + - stm-2.4.5.1 - template-haskell-2.13.0.0 - terminfo-0.4.1.1 - - text-1.2.3.0 + - text-1.2.3.1 - time-1.8.0.2 - transformers-0.5.5.0 - unix-2.7.2.2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 192d90132298..9b9bcacc4512 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6861,7 +6861,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc843.override { + haskellPackages = haskell.packages.ghc844.override { overrides = config.haskellPackageOverrides or haskell.packageOverrides; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e654b35d258d..dea3ba954253 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -103,7 +103,7 @@ in { stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix; }; ghcjs84 = callPackage ../development/compilers/ghcjs-ng { - bootPkgs = packages.ghc843; + bootPkgs = packages.ghc844; ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json; stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix; ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {}; |