dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

stack: Get building with old version of pantry

Browse Source
This commit is contained in:
(cdep)illabout 2020-03-05 22:07:35 +09:00 committed by Peter Simons
parent 39e8cc9c30
commit 9857e570e9
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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";

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -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