Skip to content

Update Haskell package set to LTS 15.7 (plus other fixes) #84712

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 14 commits into from
Apr 10, 2020
Merged

Update Haskell package set to LTS 15.7 (plus other fixes) #84712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d80ce4b
LTS Haskell 15.7
peti Apr 7, 2020
7467d0a
hackage2nix: disable failing builds to fix Nixpkgs evaluation errors
peti Apr 10, 2020
5c7bf51
haskellPackages.idris: Fix build (new GHC 8.8 & old megaparsec 7)
chkno Apr 2, 2020
0a4769b
haskellPackages.persistent-postgresql: don't check
turboMaCk Apr 4, 2020
267d7a1
hackage2nix: update extra-packages we keep around for tensorflow
mikesperber Apr 8, 2020
c64ba7e
hackage2nix: unbreak hsexif
samdoshi Apr 9, 2020
450396e
hackage-packages.nix: automatic Haskell package set update
peti Apr 7, 2020
5427f5f
haskellPackages.llvm-hs: Use LLVM 9
jtojnar Mar 26, 2020
4675649
ghc: don't use ld.gold with musl libc (fixes #84670)
adamse Apr 8, 2020
08a9d51
ghc: mention why ld.gold is disabled for musl libc
adamse Apr 9, 2020
6ec9d95
haskell-tensorflow: fix evalution errors
peti Apr 10, 2020
a88efcf
hackage-packages.nix: automatic Haskell package set update
peti Apr 10, 2020
556367e
haskell-ShellCheck: drop obsolete patch to fix the build
peti Apr 10, 2020
0eb4bfa
darcs: don't try to build the package with ghc-8.8.x
peti Apr 10, 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
4 changes: 3 additions & 1 deletion 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 @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 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 @@ -79,7 +79,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 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 @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/8.8.1.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion 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 @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 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 @@ -84,7 +84,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/compilers/ghc/head.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ let

targetCC = builtins.head toolsForTarget;

useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false);
# ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl;

in
stdenv.mkDerivation (rec {
Expand Down
31 changes: 15 additions & 16 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,6 @@ self: super: {
# Needs older QuickCheck version
attoparsec-varword = dontCheck super.attoparsec-varword;

# https://github.com/koalaman/shellcheck/issues/1778
ShellCheck = overrideCabal super.ShellCheck (drv: {
patches = [
# cabal 3.0 support
( pkgs.fetchpatch {
url = "https://github.com/koalaman/shellcheck/commit/2c026f1ec7c205c731ff2a0ccd85365f37245.patch";
sha256 = "0z6yf350ngr6rwfkvdy670c476fgzj8a0n4ppdm1xr8r1lij7sfz";
excludes = [ "Dockerfile" ];
})
];
});

# Tests are failing
# https://github.com/bos/statistics/issues/123
statistics = dontCheck super.statistics;
Expand Down Expand Up @@ -716,10 +704,19 @@ self: super: {
'';
});

# The standard libraries are compiled separately
idris = generateOptparseApplicativeCompletion "idris" (
doJailbreak (dontCheck super.idris)
);
# The standard libraries are compiled separately.
# The megaparsec-7 override is needed because https://github.com/idris-lang/Idris-dev/issues/4826 declares that
# idris1 has no plans to migrate to megaparsec-8.
# The idris-lang/Idris-dev#4808 patch is for GHC 8.8 compatibility, and can likely be removed with the next release.
idris = generateOptparseApplicativeCompletion "idris" (doJailbreak (dontCheck
(appendPatches
(super.idris.override { megaparsec = self.megaparsec_7_0_5; }) [
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/pull/4808.diff";
sha256 = "060ib1rczy34ip8xf3bv1pf28655f6s0bvvij19jhh5dpcr0pf71";
excludes = [ ".travis.yml" "Makefile" "appveyor.yml" ];
})
])));

# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;
Expand Down Expand Up @@ -1465,7 +1462,9 @@ self: super: {
vty = self.vty_5_28_2;
});

# Test suite requires database
persistent-mysql = dontCheck super.persistent-mysql;
persistent-postgresql = dontCheck super.persistent-postgresql;

# Fix EdisonAPI and EdisonCore for GHC 8.8:
# https://github.com/robdockins/edison/pull/16
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,9 @@ self: super: {
# ghc-8.8:
# https://github.com/adnelson/semver-range/issues/15
semver-range = dontCheck super.semver-range;

# The current version 2.14.2 does not compile with ghc-8.8.x or newer because
# of issues with Cabal 3.x.
darcs = dontDistribute super.darcs;

}
Loading