Support GHC 8.6.1 nightlies, and add stack-lts-12.yaml

borsboom · borsboom · commit ed340b7fccbc · 2018-10-12T12:09:36.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -29,10 +29,14 @@ matrix:
       compiler: ": #stack 8.2.2"
       addons: {apt: {packages: [ghc-8.2.2, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}
 
-    - env: BUILD=stack GHCVER=8.4.3 STACK_YAML=stack-nightly.yaml
+    - env: BUILD=stack GHCVER=8.4.3 STACK_YAML=stack-lts-12.yaml
       compiler: ": #stack 8.4.3"
       addons: {apt: {packages: [ghc-8.4.3, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}
 
+    - env: BUILD=stack GHCVER=8.6.1 STACK_YAML=stack-nightly.yaml
+      compiler: ": #stack 8.6.1"
+      addons: {apt: {packages: [ghc-8.6.1, alex-3.1.7, happy-1.19.5], sources: [hvr-ghc]}}
+
     - env: BUILD=stack GHCVER=8.2.2 STACK_YAML=stack.yaml
       compiler: ": #stack 8.2.2 osx"
       os: osx
diff --git a/src/Stack/Fetch.hs b/src/Stack/Fetch.hs
@@ -377,9 +377,13 @@ lookupPackageIdentifierExact
   -> RIO env (Maybe ByteString)
 lookupPackageIdentifierExact identRev cache = do
   cl <- view cabalLoaderL
-  forM (lookupResolvedPackage cl identRev cache) $ \rp -> do
-    [bs] <- withCabalFiles (indexName (rpIndex rp)) [(rp, ())] $ \_ _ bs -> return bs
-    return bs
+  case lookupResolvedPackage cl identRev cache of
+    Nothing -> return Nothing
+    Just rp -> do
+      bss <- withCabalFiles (indexName (rpIndex rp)) [(rp, ())] $ \_ _ bs -> return bs
+      case bss of
+        [bs] -> return (Just bs)
+        _ -> return Nothing
 
 data FuzzyResults
   = FRNameNotFound !(Maybe (NonEmpty T.Text))
diff --git a/src/Stack/PackageIndex.hs b/src/Stack/PackageIndex.hs
@@ -405,7 +405,9 @@ getPackageCaches = do
             result <- liftM mconcat $ forM (clIndices cl) $ \index -> do
                 fp <- configPackageIndexCache (indexName index)
                 PackageCache pis <-
-#if MIN_VERSION_template_haskell(2,13,0)
+#if MIN_VERSION_template_haskell(2,14,0)
+                    $(versionedDecodeOrLoad (storeVersionConfig "pkg-v5" "35_zXZ4b4CIWfrLXtjWteR4nb6o="
+#elif MIN_VERSION_template_haskell(2,13,0)
                     $(versionedDecodeOrLoad (storeVersionConfig "pkg-v5" "LLL6OCcimOqRm3r0JmsSlLHcaLE="
 #else
                     $(versionedDecodeOrLoad (storeVersionConfig "pkg-v5" "A607WaDwhg5VVvZTxNgU9g52DO8="
diff --git a/src/Stack/Types/Build.hs b/src/Stack/Types/Build.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveGeneric              #-}
@@ -686,4 +687,8 @@ instance Store PrecompiledCache
 instance NFData PrecompiledCache
 
 precompiledCacheVC :: VersionConfig PrecompiledCache
+#if MIN_VERSION_template_haskell(2,14,0)
+precompiledCacheVC = storeVersionConfig "precompiled-v2" "1Q08F5_iKDGDMPCuBG0-Av9nEKk="
+#else
 precompiledCacheVC = storeVersionConfig "precompiled-v2" "55vMMtbIlS4UukKnSmjs1SrI01o="
+#endif
diff --git a/src/Stack/Types/BuildPlan.hs b/src/Stack/Types/BuildPlan.hs
@@ -1,4 +1,5 @@
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE NoImplicitPrelude          #-}
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DataKinds                  #-}
 {-# LANGUAGE DeriveDataTypeable         #-}
 {-# LANGUAGE DeriveFunctor              #-}
@@ -102,7 +103,11 @@ instance Store SnapshotDef
 instance NFData SnapshotDef
 
 snapshotDefVC :: VersionConfig SnapshotDef
+#if MIN_VERSION_template_haskell(2,14,0)
+snapshotDefVC = storeVersionConfig "sd-v1" "u-V-7pmU0YA-nXZFI0UBIST3JdY="
+#else
 snapshotDefVC = storeVersionConfig "sd-v1" "CKo7nln8EXkw07Gq-4ATxszNZiE="
+#endif
 
 -- | A relative file path including a unique string for the given
 -- snapshot.
@@ -310,7 +315,11 @@ instance Store LoadedSnapshot
 instance NFData LoadedSnapshot
 
 loadedSnapshotVC :: VersionConfig LoadedSnapshot
+#if MIN_VERSION_template_haskell(2,14,0)
+loadedSnapshotVC = storeVersionConfig "ls-v5" "Rl-3KjZ1LqhIyGy-o0HCC-I6cRc="
+#else
 loadedSnapshotVC = storeVersionConfig "ls-v5" "CeSRWh1VU8v0__kwA__msbe6WlU="
+#endif
 
 -- | Information on a single package for the 'LoadedSnapshot' which
 -- can be installed.
diff --git a/stack-lts-12.yaml b/stack-lts-12.yaml
@@ -0,0 +1,25 @@
+resolver: lts-12.12
+
+extra-deps:
+- Cabal-2.4.0.0@rev:0
+- githash-0.1.1.0@rev:0
+- hpack-0.31.0@rev:0
+- infer-license-0.2.0@rev:0 #for hpack-0.31
+- yaml-0.10.4.0@rev:0 #for hpack-0.31
+
+# docker:
+#   enable: true
+#   repo: fpco/stack-full
+# image:
+#   containers:
+#     - base: "fpco/stack-base" # see ./etc/docker/stack-base/Dockerfile
+#       name: "fpco/stack-test"
+nix:
+  # --nix on the command-line to enable.
+  enable: false
+  packages:
+    - zlib
+    - unzip
+
+ghc-options:
+   "$locals": -fhide-source-paths
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
@@ -1,11 +1,25 @@
-resolver: nightly-2018-09-02
+resolver: nightly-2018-10-12
 
 extra-deps:
-- Cabal-2.4.0.0@rev:0
+- git: https://github.com/yesodweb/persistent.git
+  commit: e8e1b723403da2b45baf165dfbedf5abedc06178
+  subdirs:
+  - persistent
+  - persistent-sqlite
+  - persistent-template
 - cabal-install-2.4.0.0@rev:1
-- http-api-data-0.3.8.1@rev:1
-- cabal-doctest-1.0.6@rev:2
-- happy-1.19.9@rev:3
+- cryptohash-0.11.9@rev:0
+- cryptohash-sha256-0.11.101.0@rev:2
+- cryptonite-conduit-0.2.2@rev:0
+- ed25519-0.0.5.0@rev:2
+- hackage-security-0.5.3.0@rev:3
+- hpack-0.31.0@rev:0
+- infer-license-0.2.0@rev:0
+- project-template-0.2.0.1@rev:0
+- resolv-0.1.1.1@rev:0
+- store-0.5.0@rev:0
+- store-core-0.4.4@rev:0
+- th-utilities-0.2.0.1@rev:0
 
 # docker:
 #   enable: true
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-11.19
+resolver: lts-11.22
 
 # docker:
 #   enable: true
@@ -20,11 +20,11 @@ extra-deps:
 - Cabal-2.4.0.1@rev:0
 - cabal-install-2.4.0.0@rev:1
 - resolv-0.1.1.1@rev:0
-- infer-license-0.2.0@rev:0
+- infer-license-0.2.0@rev:0 #for hpack-0.31
 - hpack-0.31.0@rev:0
 - http-api-data-0.3.8.1@rev:1
-- githash-0.1.0.1@rev:0
-- yaml-0.10.1.1@rev:0 #for hpack-0.31
+- githash-0.1.1.0@rev:0
+- yaml-0.10.4.0@rev:0 #for hpack-0.31
 - windns-0.1.0.0@rev:0
 - hackage-security-0.5.3.0@rev:2
 - cabal-doctest-1.0.6@rev:2
