Skip to content

Update Haskell package set to LTS 15.9 (plus other fixes) #85926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peti merged 17 commits into from
Apr 24, 2020
Merged

Update Haskell package set to LTS 15.9 (plus other fixes) #85926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0e82313
compilers/ghc: fix a few typos
ggreif Apr 11, 2020
daf79ea
compilers/ghc: apply structuredAttrs patch to other ghcs
ggreif Apr 11, 2020
a634bd0
ghc: drop 8.8.1
ggreif Apr 11, 2020
3186054
LTS Haskell 15.9
peti Apr 24, 2020
ea1aa65
hackage2nix: update list of broken builds to fix evaluation
peti Apr 24, 2020
b7f35fd
haskellPackages.tensorflow*: unmark newly unbroken packages
mikesperber Apr 20, 2020
f3ec558
haskellPackages.text-format: don't mark as broken
pbogdan Apr 20, 2020
86e2dd2
haskellPackages.{binary-strict,webify}: fix build
erictapen Apr 10, 2020
3359dca
haskellPackages.Euterpea: fix build, unbreak
sternenseemann Apr 20, 2020
7c1c9dc
hackage-packages.nix: automatic Haskell package set update
peti Apr 18, 2020
8ab67c7
haskell-packages: made darcs compile with ghc 8.8
dguibert Apr 7, 2020
32c8e79
Additional docs for doJailbreak
asheshambasta Apr 19, 2020
28556cd
Haskell: apply-refact version has to match ghc
andys8 Apr 20, 2020
5b3104a
Update pkgs/development/haskell-modules/configuration-hackage2nix.yaml
cdepillabout Apr 22, 2020
da45fd9
haskell-microlens-th: drop obsolete override
peti Apr 24, 2020
a1463ef
haskell-haddock: fix build with our default compiler ghc-8.8.3
peti Apr 24, 2020
e567a3b
haskell-haddock: fix build with for the latest compiler ghc-8.10.1
peti Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions doc/languages-frameworks/haskell.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ haskell.compiler.ghc844 ghc-8.4.4
haskell.compiler.ghc863Binary ghc-8.6.3-binary
haskell.compiler.ghc865 ghc-8.6.5
haskell.compiler.integer-simple.ghc865 ghc-8.6.5
haskell.compiler.ghc881 ghc-8.8.1
haskell.compiler.integer-simple.ghc881 ghc-8.8.1
haskell.compiler.ghc882 ghc-8.8.2
haskell.compiler.integer-simple.ghc882 ghc-8.8.2
haskell.compiler.ghc883 ghc-8.8.3
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/compilers/elm/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
let
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };

hsPkgs = haskell.packages.ghc881.override {
hsPkgs = haskell.packages.ghc883.override {
overrides = self: super: with haskell.lib;
let elmPkgs = rec {
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
Expand All @@ -28,7 +28,7 @@ let
`package/nix/build.sh`
*/
elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: {
# GHC 8.8.1 support
# GHC 8.8.3 support
# https://github.com/avh4/elm-format/pull/640
patches = [(
fetchpatch {
Expand All @@ -39,7 +39,7 @@ let
# Tests are failing after upgrade to ghc881.
# Cause is probably just a minor change in stdout output
# see https://github.com/avh4/elm-format/pull/640
doCheck = false;
# doCheck = false;
jailbreak = true;
}));

Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/compilers/ghc/8.10.1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ let
'';

# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
Expand Down Expand Up @@ -160,10 +160,10 @@ stdenv.mkDerivation (rec {
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
Expand All @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.6.5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
Expand Down
236 changes: 0 additions & 236 deletions pkgs/development/compilers/ghc/8.8.1.nix
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions pkgs/development/compilers/ghc/8.8.2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ let
'';

# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
libDeps = platform: stdenv.lib.optional enableTerminfo ncurses
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
Expand Down Expand Up @@ -160,10 +160,10 @@ stdenv.mkDerivation (rec {
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
Expand All @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.8.3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec {
"--disable-large-address-space"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
Expand Down
Loading