From 9c592a6ff613f99820edfa6e6c9e3f816e0d3baa Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 13 Aug 2018 20:56:46 +0300 Subject: [PATCH] Use a custom snapshot This bumps us to newer versions of some libraries, in particular conduit, which were previously blocked by commercialhaskell/stack#4125. Using a custom snapshot should allow this by bypassing that bug. --- snapshot.yaml | 17 +++++++++++++++++ stack.yaml | 24 +----------------------- 2 files changed, 18 insertions(+), 23 deletions(-) create mode 100644 snapshot.yaml diff --git a/snapshot.yaml b/snapshot.yaml new file mode 100644 index 0000000000..c3d6ba8ff5 --- /dev/null +++ b/snapshot.yaml @@ -0,0 +1,17 @@ +resolver: lts-11.19 +name: snapshot-for-building-stack-with-ghc-8.2.2 + +packages: +- Cabal-2.2.0.1@rev:0 +- cabal-install-2.2.0.0@rev:1 +- resolv-0.1.1.1@rev:0 +- infer-license-0.2.0@rev:0 +- hpack-0.29.6@rev:0 +- http-api-data-0.3.8.1@rev:0 +- githash-0.1.0.1@rev:0 +- rio-orphans-0.1.1.0@sha256:15600084c56ef4e1f22ac2091d10fa6ed62f01f531d819c6a5a19492212a76c9 + +flags: + cabal-install: + # https://github.com/haskell/cabal/issues/4883 + native-dns: false diff --git a/stack.yaml b/stack.yaml index f03486aae7..43d1dda3a9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-11.19 +resolver: snapshot.yaml # docker: # enable: true @@ -16,28 +16,6 @@ flags: stack: hide-dependency-versions: true supported-build: true - # https://github.com/haskell/cabal/issues/4883 - cabal-install: - native-dns: false -extra-deps: -- Cabal-2.2.0.1@rev:0 -- cabal-install-2.2.0.0@rev:1 -- resolv-0.1.1.1@rev:0 -- infer-license-0.2.0@rev:0 -- hpack-0.29.6@rev:0 -- http-api-data-0.3.8.1@rev:0 -- githash-0.1.0.1@rev:0 - -# Avoid https://github.com/commercialhaskell/stack/issues/4125 -# (triggered because later versions of persistent transitively depends -# on haskell-src-exts, which needs the 'happy' build tool) -# THIS IS FIXED AS OF STACK 1.8, but keep these here until next major -# version to maintain the ability to build stack with older versions. -- persistent-2.7.1@rev:0 -- persistent-sqlite-2.6.4@rev:0 -- resourcet-1.1.11@rev:0 -- conduit-1.2.13.1@rev:0 -- conduit-extra-1.2.3.2@rev:0 ghc-options: "$locals": -fhide-source-paths