diff options
| author | (cdep)illabout <cdep.illabout@gmail.com> | 2020-03-05 22:07:35 +0900 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2020-03-06 22:15:13 +0100 |
| commit | 9857e570e9775ec69760f1e30a41598629a4de7a (patch) | |
| tree | d6b567b5d667a26ea056f7b3e9ce7a272539a654 /pkgs/development/haskell-modules | |
| parent | 39e8cc9c3032707a216a32e6683de3422e877bde (diff) | |
| download | nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.tar nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.tar.gz nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.tar.bz2 nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.tar.lz nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.tar.xz nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.tar.zst nixlib-9857e570e9775ec69760f1e30a41598629a4de7a.zip | |
stack: Get building with old version of pantry
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 18 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9dc6a30d379a..ff589b3b455c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1074,9 +1074,16 @@ self: super: { 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 super.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. @@ -1416,11 +1423,12 @@ self: super: { # https://github.com/bergmark/feed/issues/43 feed = dontCheck super.feed; - pantry = appendPatches super.pantry [ - # Pantry has been updated for ghc-8.8 upstream, but there hasn't been a - # release yet with this patch. This can probably be removed when a - # version of pantry is released after 0.2.0.0. + pantry_0_2_0_0 = appendPatches super.pantry_0_2_0_0 [ + # pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support. # https://github.com/commercialhaskell/pantry/pull/6 + # Currently stack-2.1.3.1 requires pantry-0.2.0.0, but when a newer version of + # stack is released, it will probably use the newer pantry version, so we + # can completely get rid of pantry-0.2.0.0. (pkgs.fetchpatch { url = "https://github.com/commercialhaskell/pantry/pull/6.diff"; sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e00b1b0e2d08..5c66ad9a3909 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2396,6 +2396,7 @@ extra-packages: - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x + - pantry == 0.2.0.0 # required by stack-2.1.3.1 - persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227 - persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227 - prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0 |