Skip to content

Commit b56ea06

Browse files
committed
Upgrade to cabal2nix-2.11. Should fix #117
1 parent 7c52120 commit b56ea06

File tree

4 files changed

+133
-45
lines changed

4 files changed

+133
-45
lines changed

scripts/check-nix-is-updated.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ fail_stack2nix_check() {
1111
exit 1
1212
}
1313

14-
\time ~/.local/bin/stack2nix --hackage-snapshot 2018-07-20T08:56:04Z . > $scriptDir/../stack2nix.nix
14+
\time ~/.local/bin/stack2nix --hackage-snapshot 2018-09-03T15:17:10Z . > $scriptDir/../stack2nix.nix
1515

1616
git diff --text --exit-code || fail_stack2nix_check

stack.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ packages:
44
- '.'
55

66
extra-deps:
7-
- cabal2nix-2.10.0
7+
- cabal2nix-2.11
8+
- hpack-0.29.6 # dependency of cabal2nix-2.10.0
9+
- infer-license-0.2.0 # dependency of hpack-0.29.6
810

911
nix:
1012
packages: [zlib,gmp,git,pcre,openssl]

stack2nix.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ library
2222
build-depends: base >=4.9 && <4.12
2323
, Cabal >= 2.0.0.2 && < 2.3
2424
, async >= 2.1.1.1 && < 2.3
25-
, cabal2nix >= 2.10 && < 2.11
25+
, cabal2nix >= 2.11 && < 2.12
2626
, containers >= 0.5.7.1 && < 0.6
2727
, directory >= 1.3 && < 1.4
2828
, distribution-nixpkgs >= 1.1 && < 1.2

0 commit comments

Comments
 (0)