Merge pull request commercialhaskell#4229 from commercialhaskell/avoid-gpl-libs

snoyberg · web-flow · commit e7b570e34cac · 2018-08-14T07:37:16.000+03:00
Avoid GPL-3 libs haskell/cabal#4883
diff --git a/snapshot.yaml 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-nightly.yaml b/stack-nightly.yaml
@@ -14,5 +14,10 @@ nix:
     - zlib
     - unzip
 
+flags:
+  # https://github.com/haskell/cabal/issues/4883
+  cabal-install:
+    native-dns: false
+
 ghc-options:
    "$locals": -fhide-source-paths
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-11.19
+resolver: snapshot.yaml
 
 # docker:
 #   enable: true
@@ -16,25 +16,6 @@ flags:
   stack:
     hide-dependency-versions: true
     supported-build: true
-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
