Skip to content

Update Haskell package set to LTS 15.10 (plus other fixes) #86116

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 15 commits into from
May 1, 2020
Merged

Update Haskell package set to LTS 15.10 (plus other fixes) #86116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9b8d17
LTS Haskell 15.10
peti Apr 27, 2020
b208708
fix haskellPackages.headed-megaparsec
chrbauer Apr 23, 2020
278589f
hasql-th isn't broken
chrbauer Apr 27, 2020
e689b32
haskellPackages.hadolint: mark unbroken, remove override
zowoq Apr 28, 2020
766b79b
hackage2nix: update list of broken builds to fix evaluation
peti May 1, 2020
4abd2ae
hackage-packages.nix: automatic Haskell package set update
peti Apr 25, 2020
89acd1a
haskell-email-validate: jailbreak for ghc-8.10.x to fix the build
peti Apr 27, 2020
8dd2b73
haskell-feed: jailbreak for ghc-8.10.x to fix the build
peti Apr 27, 2020
60f6da9
haskell-tasty-rerun: jailbreak for ghc-8.10.x to fix the build
peti Apr 27, 2020
402b437
darcs: patches integrated upstream (in 2.14.3)
dguibert Apr 27, 2020
b0c0ba6
haskell-ed25519: jailbreak to fix build with ghc-8.10.1
peti May 1, 2020
c752d37
cabal-install: patch the ghc-8.10.x build to succeed
peti May 1, 2020
0c6e37e
configuration-common.nix: cosmetic
peti May 1, 2020
ff61b07
all-cabal-hashes: update to Hackage at 2020-04-28T23:45:54Z
peti May 1, 2020
1d4449c
haskell-stack: update overrides for the new 2.3.1 version
peti May 1, 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: 2 additions & 2 deletions pkgs/data/misc/hackage/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ fetchurl }:

fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3e87a900a11faa97a8a068874c932f3172d0aa76.tar.gz";
sha256 = "0cf35vics1211pr1g8a804zm3w4lsdacqkgw3hqk7wdrrbasb8ip";
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9d50cd974714cdcfdaabd089923b571a66bae55a.tar.gz";
sha256 = "1hv4pxp47850l36ci2ywmc75c95fvdqr3swz9qymy25gd6rbfs9f";
}
42 changes: 7 additions & 35 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,12 +45,6 @@ self: super: {
# Needs older QuickCheck version
attoparsec-varword = dontCheck super.attoparsec-varword;

# http://bugs.darcs.net/issue2642
darcs = doJailbreak (appendPatches super.darcs [
./patches/darcs-setup.patch
./patches/darcs-2.14.2-Compile-against-GHC-8.8.patch
]);

# Tests are failing
# https://github.com/bos/statistics/issues/123
statistics = dontCheck super.statistics;
Expand Down Expand Up @@ -1073,35 +1067,8 @@ self: super: {

# Generate shell completion.
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;

stack =
let
stackWithOverrides =
super.stack.override {
# stack-2.1.3.1 requires pantry-0.2.0.0.
pantry = self.pantry_0_2_0_0;
};
in
generateOptparseApplicativeCompletion
"stack"
(appendPatches stackWithOverrides [
# This PR fixes stack up to be able to build with Cabal-3. This patch
# can probably be dropped when the next stack release is made after
# 2.1.3.1.
(pkgs.fetchpatch {
url = "https://github.com/commercialhaskell/stack/pull/5156.diff";
sha256 = "0knk6f9fh1b4fxkhvx5gfrwclal4vi2va4zy34gpmwnjr7knf42y";
excludes = [
"snapshot-lts-12.yaml"
"snapshot-nightly.yaml"
"snapshot.yaml"
];
})
# This patch fixes stack up to be able to build various GHC-8.8 changes.
# This can hopefully be dropped when the next stack release is made
# after 2.1.3.1 (assuming the next stack release uses GHC-8.8).
./patches/stack-ghc882-support.patch
]);
stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; }));
http-download_0_2_0_0 = dontCheck super.http-download_0_2_0_0;

# musl fixes
# dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
Expand Down Expand Up @@ -1516,4 +1483,9 @@ self: super: {
sha256 = "sha256:0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2";
});

# Depends on selective >= 0.4, but the default of selective is 0.3
headed-megaparsec = super.headed-megaparsec.override {
selective = self.selective_0_4_1;
};

} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
19 changes: 19 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,30 @@ self: super: {
unix = null;
xhtml = null;

# The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the
# hitherto unreleased next version from the '3.2' branch of the upstream git
# repository for the time being.
cabal-install = assert super.cabal-install.version == "3.2.0.0";
overrideCabal super.cabal-install (drv: {
postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot";
version = "3.2.0.0-git";
editedCabalFile = null;
src = pkgs.fetchgit {
url = "git://github.com/haskell/cabal.git";
rev = "9bd4cc0591616aeae78e17167338371a2542a475";
sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0";
};
});

# Deviate from Stackage LTS-15.x to fix the build.
haddock-library = self.haddock-library_1_9_0;

# Jailbreak to fix the build.
async = doJailbreak super.async;
ChasingBottoms = doJailbreak super.ChasingBottoms;
ed25519 = doJailbreak super.ed25519;
email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51
feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48
hashable = doJailbreak super.hashable;
pandoc = doJailbreak super.pandoc;
parallel = doJailbreak super.parallel;
Expand All @@ -60,6 +78,7 @@ self: super: {
system-fileio = doJailbreak super.system-fileio;
tar = doJailbreak super.tar;
tasty-expected-failure = doJailbreak super.tasty-expected-failure;
tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18
unliftio-core = doJailbreak super.unliftio-core;
vector = doJailbreak super.vector;
zlib = doJailbreak super.zlib;
Expand Down
59 changes: 33 additions & 26 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
- gi-gdkx11 < 4
# LTS Haskell 15.9
# LTS Haskell 15.10
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Angle ==1.0
Expand Down Expand Up @@ -319,7 +319,7 @@ default-package-overrides:
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.1.0
- blaze-html ==0.9.1.2
- blaze-markup ==0.8.2.4
- blaze-markup ==0.8.2.5
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- bmp ==1.2.6.3
Expand Down Expand Up @@ -437,9 +437,9 @@ default-package-overrides:
- codec-rpm ==0.2.2
- code-page ==0.2
- coercible-utils ==0.1.0
- co-log ==0.4.0.0
- co-log-core ==0.2.1.0
- co-log-polysemy ==0.0.1.1
- co-log ==0.4.0.1
- co-log-core ==0.2.1.1
- co-log-polysemy ==0.0.1.2
- Color ==0.1.4
- colorful-monoids ==0.2.1.2
- colorize-haskell ==1.0.1
Expand Down Expand Up @@ -859,7 +859,7 @@ default-package-overrides:
- gi-glib ==2.0.23
- gi-gobject ==2.0.22
- gi-graphene ==1.0.1
- gi-gtk ==3.0.32
- gi-gtk ==3.0.33
- gi-gtk-hs ==0.3.8.1
- gingersnap ==0.3.1.0
- gi-pango ==1.0.22
Expand Down Expand Up @@ -889,7 +889,7 @@ default-package-overrides:
- graphviz ==2999.20.0.4
- graph-wrapper ==0.2.6.0
- gravatar ==0.8.0
- greskell ==1.0.0.1
- greskell ==1.0.1.0
- greskell-core ==0.1.3.2
- greskell-websocket ==0.1.2.1
- groom ==0.1.2.1
Expand Down Expand Up @@ -932,6 +932,8 @@ default-package-overrides:
- HaXml ==1.25.5
- haxr ==3000.11.4
- hdaemonize ==0.5.6
- HDBC ==2.4.0.3
- HDBC-session ==0.1.2.0
- headroom ==0.1.3.0
- heap ==1.0.4
- heaps ==0.3.6.1
Expand All @@ -958,7 +960,7 @@ default-package-overrides:
- highlighting-kate ==0.6.4
- hinfo ==0.0.3.0
- hinotify ==0.4
- hint ==0.9.0.2
- hint ==0.9.0.3
- hjsmin ==0.2.0.4
- hkgr ==0.2.5.2
- hlibcpuid ==0.2.0
Expand Down Expand Up @@ -1471,7 +1473,7 @@ default-package-overrides:
- OneTuple ==0.2.2.1
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.6.7004.1
- opaleye ==0.6.7004.2
- OpenAL ==1.7.0.5
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
Expand Down Expand Up @@ -1541,6 +1543,7 @@ default-package-overrides:
- perfect-vector-shuffle ==0.1.1.1
- persist ==0.1.1.4
- persistable-record ==0.6.0.4
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.10.5.2
- persistent-mysql ==2.10.2.3
- persistent-pagination ==0.1.1.1
Expand Down Expand Up @@ -1625,7 +1628,7 @@ default-package-overrides:
- print-console-colors ==0.1.0.0
- process-extras ==0.7.4
- product-isomorphic ==0.0.3.3
- product-profunctors ==0.10.0.0
- product-profunctors ==0.10.0.1
- profiterole ==0.1
- profunctors ==5.5.2
- projectroot ==0.2.0.1
Expand Down Expand Up @@ -1727,6 +1730,8 @@ default-package-overrides:
- reinterpret-cast ==0.1.0
- relapse ==1.0.0.0
- relational-query ==0.12.2.2
- relational-query-HDBC ==0.7.2.0
- relational-record ==0.2.2.0
- relational-schemas ==0.1.8.0
- relude ==0.6.0.0
- renderable ==0.2.0.1
Expand All @@ -1738,10 +1743,10 @@ default-package-overrides:
- rerebase ==1.4.1
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
- resourcet ==1.2.3
- resourcet ==1.2.4
- result ==0.2.6.0
- rethinkdb-client-driver ==0.0.25
- retry ==0.8.1.1
- retry ==0.8.1.2
- rev-state ==0.1.2
- rfc1751 ==0.1.2
- rfc5051 ==0.1.0.4
Expand Down Expand Up @@ -1779,8 +1784,8 @@ default-package-overrides:
- sampling ==0.3.3
- say ==0.1.0.1
- sbp ==2.6.3
- scalpel ==0.6.1
- scalpel-core ==0.6.1
- scalpel ==0.6.2
- scalpel-core ==0.6.2
- scanf ==0.1.0.0
- scanner ==0.3.1
- scheduler ==1.4.2.2
Expand Down Expand Up @@ -1844,7 +1849,7 @@ default-package-overrides:
- servant-swagger-ui-redoc ==0.3.3.1.22.3
- servant-websockets ==2.0.0
- servant-yaml ==0.1.0.1
- serverless-haskell ==0.10.2
- serverless-haskell ==0.10.5
- serversession ==1.0.1
- serversession-frontend-wai ==1.0
- ses-html ==0.4.0.0
Expand Down Expand Up @@ -1889,7 +1894,7 @@ default-package-overrides:
- skip-var ==0.1.1.0
- skylighting ==0.8.3.4
- skylighting-core ==0.8.3.4
- slist ==0.1.0.0
- slist ==0.1.1.0
- small-bytearray-builder ==0.3.4.0
- smallcheck ==1.1.5
- smoothie ==0.4.2.10
Expand Down Expand Up @@ -1946,7 +1951,7 @@ default-package-overrides:
- streaming ==0.2.3.0
- streaming-bytestring ==0.1.6
- streaming-commons ==0.2.1.2
- streamly ==0.7.1
- streamly ==0.7.2
- streams ==3.3
- strict ==0.3.2
- strict-base-types ==0.6.1
Expand All @@ -1960,8 +1965,8 @@ default-package-overrides:
- string-qq ==0.0.4
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
- stripe-concepts ==1.0.2.0
- stripe-signature ==1.0.0.1
- stripe-concepts ==1.0.2.2
- stripe-signature ==1.0.0.2
- strive ==5.0.10
- structs ==0.1.3
- structured-cli ==2.5.2.0
Expand Down Expand Up @@ -2035,7 +2040,7 @@ default-package-overrides:
- test-framework-th ==0.2.4
- testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1
- texmath ==0.12.0.1
- texmath ==0.12.0.2
- text-binary ==0.2.1.1
- text-builder ==0.6.6.1
- text-conversions ==0.3.0
Expand Down Expand Up @@ -2131,7 +2136,7 @@ default-package-overrides:
- typed-uuid ==0.0.0.2
- type-equality ==1
- type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.0
- type-errors-pretty ==0.0.1.1
- type-fun ==0.1.1
- type-hint ==0.1
- type-level-integers ==0.0.1
Expand All @@ -2143,7 +2148,7 @@ default-package-overrides:
- type-of-html ==1.5.1.0
- type-of-html-static ==0.1.0.2
- type-operators ==0.2.0.0
- typerep-map ==0.3.2
- typerep-map ==0.3.3.0
- type-spec ==0.4.0.0
- tzdata ==0.1.20190911.0
- ua-parser ==0.7.5.1
Expand Down Expand Up @@ -2201,7 +2206,7 @@ default-package-overrides:
- validity ==0.9.0.3
- validity-aeson ==0.2.0.3
- validity-bytestring ==0.4.1.1
- validity-containers ==0.5.0.1
- validity-containers ==0.5.0.3
- validity-path ==0.4.0.1
- validity-primitive ==0.0.0.1
- validity-scientific ==0.2.0.3
Expand Down Expand Up @@ -4419,6 +4424,8 @@ broken-packages:
- elision
- elm-street
- elm-websocket
- elynx
- elynx-markov
- elynx-seq
- elynx-tools
- elynx-tree
Expand Down Expand Up @@ -5333,7 +5340,6 @@ broken-packages:
- haddock-leksah
- haddock-test
- haddocset
- hadolint
- hadoop-formats
- hadoop-rpc
- hadoop-tools
Expand Down Expand Up @@ -5626,7 +5632,6 @@ broken-packages:
- hasql-postgres
- hasql-postgres-options
- hasql-simple
- hasql-th
- hastache
- hastache-aeson
- haste
Expand Down Expand Up @@ -5708,7 +5713,6 @@ broken-packages:
- hdph-closure
- hdr-histogram
- HDRUtils
- headed-megaparsec
- headergen
- heapsort
- heart-app
Expand Down Expand Up @@ -8658,6 +8662,7 @@ broken-packages:
- reflex-basic-host
- reflex-dom-retractable
- reflex-dom-svg
- reflex-dynamic-containers
- reflex-fsnotify
- reflex-ghci
- reflex-gloss
Expand All @@ -8666,6 +8671,7 @@ broken-packages:
- reflex-orphans
- reflex-process
- reflex-sdl2
- reflex-test-host
- reflex-transformers
- reflex-vty
- reformat
Expand Down Expand Up @@ -9151,6 +9157,7 @@ broken-packages:
- shake-pack
- shake-path
- shake-persist
- shakebook
- shaker
- shakespeare-babel
- shakespeare-sass
Expand Down
5 changes: 0 additions & 5 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,11 +628,6 @@ self: super: builtins.intersectAttrs super {
http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry;

# Hadolint wants to build a statically linked binary by default.
hadolint = overrideCabal super.hadolint (drv: {
preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
});

# gtk2hs-buildtools is listed in setupHaskellDepends, but we
# need it during the build itself, too.
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
Expand Down
Loading