stack: Get building with old version of pantry
This commit is contained in:
parent
39e8cc9c30
commit
9857e570e9
@ -1074,9 +1074,16 @@ self: super: {
|
|||||||
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
|
cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix;
|
||||||
|
|
||||||
stack =
|
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
|
generateOptparseApplicativeCompletion
|
||||||
"stack"
|
"stack"
|
||||||
(appendPatches super.stack [
|
(appendPatches stackWithOverrides [
|
||||||
# This PR fixes stack up to be able to build with Cabal-3. This patch
|
# 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
|
# can probably be dropped when the next stack release is made after
|
||||||
# 2.1.3.1.
|
# 2.1.3.1.
|
||||||
@ -1416,11 +1423,12 @@ self: super: {
|
|||||||
# https://github.com/bergmark/feed/issues/43
|
# https://github.com/bergmark/feed/issues/43
|
||||||
feed = dontCheck super.feed;
|
feed = dontCheck super.feed;
|
||||||
|
|
||||||
pantry = appendPatches super.pantry [
|
pantry_0_2_0_0 = appendPatches super.pantry_0_2_0_0 [
|
||||||
# Pantry has been updated for ghc-8.8 upstream, but there hasn't been a
|
# pantry-0.2.0.0 doesn't build with ghc-8.8, but there is a PR adding support.
|
||||||
# release yet with this patch. This can probably be removed when a
|
|
||||||
# version of pantry is released after 0.2.0.0.
|
|
||||||
# https://github.com/commercialhaskell/pantry/pull/6
|
# 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 {
|
(pkgs.fetchpatch {
|
||||||
url = "https://github.com/commercialhaskell/pantry/pull/6.diff";
|
url = "https://github.com/commercialhaskell/pantry/pull/6.diff";
|
||||||
sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k";
|
sha256 = "0aml06jshpjh3aiscs5av7y33m3d6s6x5pzdvh7pky476izfg87k";
|
||||||
|
@ -2396,6 +2396,7 @@ extra-packages:
|
|||||||
- network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30)
|
- 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
|
- parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3
|
||||||
- patience ^>= 0.1 # required by chell-0.4.x
|
- 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 >=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
|
- 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
|
- prettyprinter == 1.6.1 # required by ghc 8.8.x, and dhall-1.29.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user