GHC 8.10 support (#388)

* GHC 8.10 support Fixes #381. * Add stack-8.10.yaml to proto-lens-tutorial * Fix the test warnings. * address comments Co-authored-by: Judah Jacobson <[email protected]>
google · Jun 3, 2020 · 465f87f · 465f87f
1 parent e8f190e
commit 465f87f
Show file tree

Hide file tree

Showing 21 changed files with 196 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 dist/
 # Generated automatically by hpack:
 *.cabal
+# Generated automatically by stack:
+*.yaml.lock
 # For "cabal sandbox"
 .cabal-sandbox
 cabal.sandbox.config
diff --git a/.travis.yml b/.travis.yml
@@ -25,7 +25,9 @@ matrix:
     addons: {apt: {packages: [libgmp-dev]}}
   - env: BUILD=stack STACK='stack'  # Use the resolver in stack.yaml
     addons: {apt: {packages: [libgmp-dev]}}
-  - env: BUILD=stack STACK='stack --stack-yaml=stack-nightly.yaml'
+  - env: BUILD=stack STACK='stack --stack-yaml=stack-8.8.yaml'
+    addons: {apt: {packages: [libgmp-dev]}}
+  - env: BUILD=stack STACK='stack --stack-yaml=stack-8.10.yaml'
     addons: {apt: {packages: [libgmp-dev]}}
 
 before_install:

diff --git a/discrimination-ieee754/package.yaml b/discrimination-ieee754/package.yaml
@@ -12,7 +12,7 @@ license: BSD3
 github: google/proto-lens/discrimination-ieee754
 
 dependencies:
-  - base >= 4.10 && < 4.14
+  - base >= 4.10 && < 4.15
   - data-binary-ieee754 >= 0.4 && < 0.5
   - contravariant >= 1.3 && < 1.6
   - discrimination >= 0.3 && < 0.5

diff --git a/proto-lens-arbitrary/package.yaml b/proto-lens-arbitrary/package.yaml
@@ -15,7 +15,7 @@ extra-source-files:
 
 dependencies:
   - proto-lens >= 0.4 && < 0.8
-  - base >= 4.10 && < 4.14
+  - base >= 4.10 && < 4.15
   - bytestring == 0.10.*
   - containers >= 0.5 && < 0.7
   - text == 1.2.*

diff --git a/proto-lens-discrimination/package.yaml b/proto-lens-discrimination/package.yaml
@@ -15,14 +15,14 @@ extra-source-files:
 
 custom-setup:
   dependencies:
-    - base >= 4.10 && < 4.14
+    - base >= 4.10 && < 4.15
     - Cabal
     - proto-lens-setup >= 0.4 && < 0.5
 
 build-tools: proto-lens-protoc:proto-lens-protoc
 
 dependencies:
-  - base >= 4.11 && < 4.14
+  - base >= 4.11 && < 4.15
   - bytestring == 0.10.*
   - contravariant >= 1.3 && < 1.6
   - containers >= 0.5 && < 0.7

diff --git a/proto-lens-optparse/package.yaml b/proto-lens-optparse/package.yaml
@@ -16,7 +16,7 @@ extra-source-files:
 
 dependencies:
   - proto-lens >= 0.1 && < 0.8
-  - base >= 4.10 && < 4.14
+  - base >= 4.10 && < 4.15
   - optparse-applicative >= 0.13 && < 0.16
   - text == 1.2.*
 

diff --git a/proto-lens-protobuf-types/package.yaml b/proto-lens-protobuf-types/package.yaml
@@ -22,14 +22,14 @@ extra-source-files:
 
 custom-setup:
   dependencies:
-    - base >= 4.10 && < 4.14
+    - base >= 4.10 && < 4.15
     - Cabal
     - proto-lens-setup == 0.4.*
 
 build-tools: proto-lens-protoc:proto-lens-protoc
 
 dependencies:
-  - base >= 4.10 && < 4.14
+  - base >= 4.10 && < 4.15
   - lens-family >= 1.2 && < 2.1
   - proto-lens == 0.7.*
   - proto-lens-runtime == 0.7.*

diff --git a/proto-lens-protoc/app/Data/ProtoLens/Compiler/Generate.hs b/proto-lens-protoc/app/Data/ProtoLens/Compiler/Generate.hs
@@ -30,7 +30,11 @@ import Data.Text (unpack)
 import qualified Data.Text as T
 import Data.Tuple (swap)
 import GHC.SourceGen
+#if MIN_VERSION_ghc(8,10,0)
+import GHC.Hs (ideclName, ideclAs)
+#else
 import HsSyn (ideclName, ideclAs)
+#endif
 import Module (moduleNameString, mkModuleName)
 import qualified Outputable
 import SrcLoc (unLoc, noLoc)

diff --git a/proto-lens-protoc/app/Data/ProtoLens/Compiler/Generate/Commented.hs b/proto-lens-protoc/app/Data/ProtoLens/Compiler/Generate/Commented.hs
@@ -1,10 +1,15 @@
+{-# LANGUAGE CPP #-}
 -- | Enables pretty-printing Haddock comments along with top-level declarations.
 module Data.ProtoLens.Compiler.Generate.Commented where
 
 import Data.Maybe (fromMaybe)
 import GHC.SourceGen
 import Outputable (Outputable(..), SDoc, (<+>), ($+$), vcat, empty, text)
+#if MIN_VERSION_ghc(8,10,0)
+import GHC.Hs (hsmodName)
+#else
 import HsSyn (hsmodName)
+#endif
 import GHC (ModuleName)
 import SrcLoc (unLoc)
 

diff --git a/proto-lens-protoc/package.yaml b/proto-lens-protoc/package.yaml
@@ -17,7 +17,7 @@ extra-source-files:
   - Changelog.md
 
 dependencies:
-  - base >= 4.9 && < 4.14
+  - base >= 4.9 && < 4.15
   - filepath >= 1.4 && < 1.6
 
 library:
@@ -32,9 +32,9 @@ executables:
     dependencies:
       - bytestring == 0.10.*
       - containers >= 0.5 && < 0.7
-      - ghc >= 8.2 && < 8.10
+      - ghc >= 8.2 && < 8.11
       - ghc-paths == 0.1.*
-      - ghc-source-gen >= 0.3 && < 0.5
+      - ghc-source-gen >= 0.4 && < 0.5
       - lens-family >= 1.2 && < 2.1
       - pretty == 1.1.*
       - proto-lens == 0.7.*

diff --git a/proto-lens-runtime/package.yaml b/proto-lens-runtime/package.yaml
@@ -16,7 +16,7 @@ extra-source-files:
 
 library:
   dependencies:
-    - base >= 4.10 && < 4.14
+    - base >= 4.10 && < 4.15
     - bytestring == 0.10.*
     - containers >= 0.5 && < 0.7
     - deepseq == 1.4.*

diff --git a/proto-lens-setup/package.yaml b/proto-lens-setup/package.yaml
@@ -50,10 +50,10 @@ extra-source-files:
 library:
   source-dirs: src
   dependencies:
-    - base >= 4.10 && < 4.14
+    - base >= 4.10 && < 4.15
     - bytestring == 0.10.*
     - containers >= 0.5 && < 0.7
-    - Cabal >= 2.0 && < 3.1
+    - Cabal >= 2.0 && < 3.3
     - deepseq == 1.4.*
     - directory >= 1.2 && < 1.4
     - filepath >= 1.4 && < 1.6

diff --git a/proto-lens-tests/tests/enum_test.hs b/proto-lens-tests/tests/enum_test.hs
@@ -1,10 +1,10 @@
+{-# LANGUAGE OverloadedStrings #-}
+
 -- Copyright 2016 Google Inc. All Rights Reserved.
 --
 -- Use of this source code is governed by a BSD-style
 -- license that can be found in the LICENSE file or at
 -- https://developers.google.com/open-source/licenses/bsd
-
-{-# LANGUAGE OverloadedStrings #-}
 module Main where
 
 import Proto.Enum
@@ -154,13 +154,15 @@ testAliases = testCase "alias" $ do
     True @?= case Alias2 of
               Alias2a -> True
               _ -> False
-    Alias2 @?= case Alias2 of
-        -- Check that this explicit list (which doesn't include Alias2) covers
-        -- all the constructor cases for this type.
-        -- We turn on warnings and -Werror for this test in the .cabal file.
-        Alias1 -> Alias1
-        Alias2 -> Alias2
-        Alias3 -> Alias3
+    Alias2 @?= caseTest Alias2
+
+-- Check that this explicit list covers all the constructor cases for this
+-- type and satisfies GHC's warnings even without including Alias2a.
+-- Note: we turn on warnings and -Werror for this test in the .cabal file.
+caseTest :: Alias -> Alias
+caseTest Alias1 = Alias1
+caseTest Alias2 = Alias2
+caseTest Alias3 = Alias3
 
 testManyCases =
     runTypedTest (roundTripTest "many cases" :: TypedTest ManyCasesProto)

diff --git a/proto-lens-tutorial/stack-8.10.yaml b/proto-lens-tutorial/stack-8.10.yaml
@@ -0,0 +1,32 @@
+resolver: ghc-8.10.1
+packages:
+- person
+- coffee-order
+
+extra-deps:
+- ghc-source-gen-0.4.0.0
+- ../proto-lens
+- ../proto-lens-protoc
+- ../proto-lens-runtime
+- ../proto-lens-setup
+- StateVar-1.2@sha256:9ab3e4a0e252d28bc2f799c83e0725c3e23e8d3b722cff0fdb9822e64b6c16ac,1413
+- base-orphans-0.8.2@sha256:40ef37ed043aac2cbb6c538fdebfc62e601ee65ee161e4a6327452133b574d7e,2958
+- bifunctors-5.5.7@sha256:54c38cffb60213bfbb9474d92226696c30d07bc6f88e1e9c887ab7c5a5721b45,3410
+- cabal-doctest-1.0.8@sha256:34dff6369d417df2699af4e15f06bc181d495eca9c51efde173deae2053c197c,1491
+- comonad-5.0.6@sha256:65117d3d9e75ded548d2bbbd5ca9f5e6e1e42ecee08175aa6a77666753f797e3,3348
+- contravariant-1.5.2@sha256:853259271870000c007a281f0bf0bf6e1aaa97c5fd5cd5734d7b0d79b9de2af5,2761
+- distributive-0.6.2@sha256:6e97ccea6b887eecd74896dcc96cece54a0c5ff4848a977c1db81b8a67bc7aea,3062
+- ghc-paths-0.1.0.12@sha256:85370fdc615d4be5e09d9269eebb9a3fc7017c40b1a9e0050b121d75908564bd,632
+- lens-family-2.0.0@sha256:b915001e862bda2ad5e0e5c17ba59f4483d02a02cbac020fd35f58e6736bc9a7,1989
+- lens-family-core-2.0.0@sha256:645b0553e16a3857b08fa44f11f0664296e1db5d6494a83634711c7f4f1707a7,2290
+- microlens-0.4.11.2@sha256:765ec5cdd12a459e65161f0e3cdbce84652bf634d62af3911ba24e4bf8d4d944,4455
+- primitive-0.7.0.1@sha256:a381571c36edc7dca28b77fe8159b43c14c640087ec5946adacf949feec64231,3433
+- profunctors-5.5.2@sha256:55132b7e8a5461e8f7fdc4e06839109fe42ad581225cd151342753fddb824aa8,2075
+- random-1.1@sha256:7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df,1777
+- tagged-0.8.6@sha256:1f7ca84e6c88cbb923641c60041c9f56c34f1a889759cc073cdf10542b441ff9,2606
+- temporary-1.3@sha256:3a66c136f700dbf42f3c5000ca93e80b26dead51e54322c83272b236c1ec8ef1,1485
+- th-abstraction-0.3.2.0@sha256:9b5b4e6e2bbff9b075ad7751ee98e2107090bd17b51d5442695b8990e4db6521,1851
+- transformers-compat-0.6.5@sha256:50b00c57bf3fc379ec2477bfc261a2aebc983084488478adb29854f193af4696,5490
+- vector-0.12.1.2@sha256:9291bc581f36e51d5bda9fce57cb980fbec3dd292996896f285fef39eb80a9a0,7364
+
+allow-newer: true
diff --git a/proto-lens-tutorial/stack-nightly.yaml → proto-lens-tutorial/stack-8.8.yaml b/proto-lens-tutorial/stack-nightly.yaml → proto-lens-tutorial/stack-8.8.yaml
@@ -1,10 +1,10 @@
-resolver: nightly-2019-09-28
+resolver: lts-15.15
 packages:
 - person
 - coffee-order
 
 extra-deps:
-- ghc-source-gen-0.3.0.0
+- ghc-source-gen-0.4.0.0
 - ../proto-lens
 - ../proto-lens-protoc
 - ../proto-lens-runtime

diff --git a/proto-lens-tutorial/stack.yaml b/proto-lens-tutorial/stack.yaml
@@ -4,7 +4,7 @@ packages:
 - coffee-order
 
 extra-deps:
-- ghc-source-gen-0.3.0.0
+- ghc-source-gen-0.4.0.0
 - ../proto-lens
 - ../proto-lens-protoc
 - ../proto-lens-runtime

diff --git a/proto-lens/package.yaml b/proto-lens/package.yaml
@@ -34,11 +34,11 @@ library:
     - Data.ProtoLens.Encoding.Parser.Internal
     - Data.ProtoLens.TextFormat.Parser
   dependencies:
-    - base >= 4.10 && < 4.14
+    - base >= 4.10 && < 4.15
     - bytestring == 0.10.*
     - containers >= 0.5 && < 0.7
     - deepseq == 1.4.*
-    - ghc-prim >= 0.4 && < 0.6
+    - ghc-prim >= 0.4 && < 0.7
     - lens-family >= 1.2 && < 2.1
     - parsec == 3.1.*
     - pretty == 1.1.*

diff --git a/stack-8.10.yaml b/stack-8.10.yaml
@@ -0,0 +1,117 @@
+# Copyright 2019 Google LLC
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+
+resolver: ghc-8.10.1
+packages:
+- discrimination-ieee754
+- proto-lens
+- proto-lens-arbitrary
+- proto-lens-benchmarks
+- proto-lens-discrimination
+- proto-lens-optparse
+- proto-lens-protobuf-types
+- proto-lens-protoc
+- proto-lens-runtime
+- proto-lens-setup
+- proto-lens-tests
+- proto-lens-tests-dep
+flags:
+  cassava:
+    bytestring--lt-0_10_4: false
+extra-deps:
+- ghc-source-gen-0.4.0.0
+- discrimination-0.4
+- promises-0.3
+- Glob-0.10.0@sha256:bbccaf21bff9071dcf369f55cc1a07250bdc84c432bdf4277ed53e5e2327cd7d,2947
+- Only-0.1@sha256:f92f5da97e647451f1ee7f5bf44914fb75062d08ccd3f36b2000d649c63d13aa,1373
+- QuickCheck-2.13.2@sha256:636e7265bf75122e7e2f97627c47aad3b772ee3b35b134cafb6095116ce8d07a,6974
+- StateVar-1.2@sha256:9ab3e4a0e252d28bc2f799c83e0725c3e23e8d3b722cff0fdb9822e64b6c16ac,1413
+- abstract-deque-0.3@sha256:308bff92bb8b6621ed1dae718e859da145c8f31b8a9050aeacac40a8a21c9c90,2565
+- abstract-par-0.3.3@sha256:2c80c194429e8ed9a8f37a4c58a61b36b11e04c637d3e0bfb32d111978fd8885,1488
+- aeson-1.5.1.0@sha256:2eb9ab1e15696ed7e9771fd99206cdf86c4566bf5df78dccded25294b130d50b,6859
+- ansi-terminal-0.10.3@sha256:e2fbcef5f980dc234c7ad8e2fa433b0e8109132c9e643bc40ea5608cd5697797,3226
+- ansi-wl-pprint-0.6.9@sha256:f6fd6dbd4adcad0432bf75e5f5b19bb1deda00a1d8056faf18090026e577652d,2388
+- assoc-1.0.1@sha256:305770dfe76319749f704a1f23240f806d22905dae1aa54e6d57dc747662dae0,1205
+- async-2.2.2@sha256:a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd,2934
+- attoparsec-0.13.2.4@sha256:e10c2a5070a344a0973e6f9486d148c690b6955468cfd61ee09a41b5adc48873,5735
+- base-compat-0.11.1@sha256:e49c1ce84f556621ef1142a169e4349049c516f5b3e3c3ec6830be503e7d4a93,7140
+- base-compat-batteries-0.11.1@sha256:2763af26f6bd118dc278b805988acc792443f08bd77da03ac5c438c2b1ab4aab,8666
+- base-orphans-0.8.2@sha256:40ef37ed043aac2cbb6c538fdebfc62e601ee65ee161e4a6327452133b574d7e,2958
+- bifunctors-5.5.7@sha256:54c38cffb60213bfbb9474d92226696c30d07bc6f88e1e9c887ab7c5a5721b45,3410
+- binary-orphans-1.0.1@sha256:82eaf63df8fb7ba8da12352de03a14269e9c11bdcc3e052310d959789bf55c1e,2116
+- bytestring-builder-0.10.8.2.0@sha256:6b2b812cdac53f5a2c82376a416dde04adbb5ca3e1604c0d075368a0498f762b,3781
+- cabal-doctest-1.0.8@sha256:34dff6369d417df2699af4e15f06bc181d495eca9c51efde173deae2053c197c,1491
+- call-stack-0.2.0@sha256:5ce796b78d5f964468ec6fe0717b4e7d0430817f37370c47b3e6b38e345b6643,1202
+- cassava-0.5.2.0@sha256:64badd9305134176676bdcaa2ae6a312253c437b4427987d0ece921f92cb08de,5769
+- cereal-0.5.8.1@sha256:37cb7a78c84412e94592a658768320c41f015f2b8707a433de835afb8ebc18d7,2767
+- clock-0.8@sha256:b4ae207e2d3761450060a0d0feb873269233898039c76fceef9cc1a544067767,4113
+- code-page-0.2@sha256:f701393cb1ff7b3ec7880816abc44387647811be31670e884e02d6a20c4aa508,2356
+- colour-2.3.5@sha256:b27db0a3ad40d70bdbd8510a104269f8707592e80757a1abc66a22ba25e5a42f,1801
+- comonad-5.0.6@sha256:65117d3d9e75ded548d2bbbd5ca9f5e6e1e42ecee08175aa6a77666753f797e3,3348
+- contravariant-1.5.2@sha256:853259271870000c007a281f0bf0bf6e1aaa97c5fd5cd5734d7b0d79b9de2af5,2761
+- criterion-1.5.6.2@sha256:da86b8c918ed41d6acd7772142aa62ab293453058ef72cb46e02d93b5cbe270f,5128
+- criterion-measurement-0.1.2.0@sha256:128b778bea62b60a98be25331ab3e07095c9df1f8e91340be160b34432d30f0e,2070
+- data-binary-ieee754-0.4.4@sha256:60a56dd516e3710f05d79310cce25a10ed0f361a388df1e24ef96ce540901e1c,948
+- data-default-class-0.1.2.0@sha256:63e62120b7efd733a5a17cf59ceb43268e9a929c748127172d7d42f4a336e327,542
+- dense-linear-algebra-0.1.0.0@sha256:918e5fa7e367a58446dcd2b2288a7d84113b0820b5b5e1cef5bd1bdc601b4368,1894
+- distributive-0.6.2@sha256:6e97ccea6b887eecd74896dcc96cece54a0c5ff4848a977c1db81b8a67bc7aea,3062
+- dlist-0.8.0.8@sha256:90ca348bffdc62d7070bcf0e97c728f8d01b24fbc7ea08d2909157d0da76534c,2066
+- ghc-paths-0.1.0.12@sha256:85370fdc615d4be5e09d9269eebb9a3fc7017c40b1a9e0050b121d75908564bd,632
+- hashable-1.3.0.0@sha256:4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1,5206
+- integer-logarithms-1.0.3@sha256:63d42595ec92b71ac98a07b984b0a2eb3d4956f4ad2d856c3bf6fc3dc218d228,2820
+- js-flot-0.8.3@sha256:4c1c447a9a2fba0adba6d30678302a30c32b9dfde9e7aa9e9156483e1545096d,1985
+- js-jquery-3.3.1@sha256:59ab6c79159549ef94b584abce8e6d3b336014c2cce1337b59a8f637e2856df5,1670
+- lens-family-2.0.0@sha256:b915001e862bda2ad5e0e5c17ba59f4483d02a02cbac020fd35f58e6736bc9a7,1989
+- lens-family-core-2.1.0@sha256:124b4371ffc147a8f2fb59a7bda339ce20eec83f887a647a63497e1efc56f837,2290
+- math-functions-0.3.4.0@sha256:05965e844d0d6a8aba3b8272778fe03ee9ae31beb907d10445c9b5a03ffbd9bf,4200
+- microstache-1.0.1.1@sha256:870e7b5bfec1df728a4327b08ce08e7e4c06b0a38e7b8b7500b35eee270a2a16,2844
+- monad-par-0.3.5@sha256:553316052d7890be549f319264e368a9a77d34e591e01b7895381637bdfc879e,6527
+- monad-par-extras-0.3.3@sha256:b448c7565958ba5dfe8a0f88f17574059176cbd26e632e40c361520e63a206fd,2106
+- mwc-random-0.14.0.0@sha256:6ae33e246e91f66f621caabb2323b431c8dab57427a417a98f5cac3d82eb7b21,1810
+- optparse-applicative-0.15.1.0@sha256:29ff6146aabf54d46c4c8788e8d1eadaea27c94f6d360c690c5f6c93dac4b07e,4810
+- parallel-3.2.2.0@sha256:c69372af9a39a06739e1d0eaa1f2d8be6b86493a53dbbc455e7b30479c491c6a,1763
+- primitive-0.7.0.1@sha256:a381571c36edc7dca28b77fe8159b43c14c640087ec5946adacf949feec64231,3433
+- profunctors-5.5.2@sha256:55132b7e8a5461e8f7fdc4e06839109fe42ad581225cd151342753fddb824aa8,2075
+- random-1.1@sha256:7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df,1777
+- scientific-0.3.6.2@sha256:dd49abc76bd8e2b57e7a057dc2bb742a00527b4bf9350f9374be03b5934e55d8,4679
+- semigroups-0.19.1@sha256:ecae129621e0d2f77bef2f01e4458c2e0567ab6e1f39579c61d7cec8058ebb0e,6262
+- splitmix-0.0.5@sha256:4a49661be63f5aea0e132e9ab51be918789bb4dceb4ab9b15b85ba9cbbef5999,5412
+- statistics-0.15.2.0@sha256:6bca4f8f9663db10642354f269b6f5c7384d8bbab8719b59daca08b188e5726d,5575
+- tagged-0.8.6@sha256:1f7ca84e6c88cbb923641c60041c9f56c34f1a889759cc073cdf10542b441ff9,2606
+- tasty-1.3.1@sha256:01e35c97f7ee5ccbc28f21debea02a38cd010d53b4c3087f5677c5d06617a507,2520
+- tasty-hunit-0.10.0.2@sha256:8e8bd5807cec650f5aebc5ada07b57620c863e69145e65249651c1b48d97bd70,1515
+- tasty-quickcheck-0.10.1.1@sha256:b0a751bbe706447fd11cac21a7bbcf919631813aafaba3ce460a421348f6935c,1543
+- temporary-1.3@sha256:3a66c136f700dbf42f3c5000ca93e80b26dead51e54322c83272b236c1ec8ef1,1485
+- text-short-0.1.3@sha256:a1f0797b4674b0977ebf8259300be5a9d9a9f55818bd81b36ec2718fc13d8b9d,3214
+- th-abstraction-0.3.2.0@sha256:9b5b4e6e2bbff9b075ad7751ee98e2107090bd17b51d5442695b8990e4db6521,1851
+- these-1.1@sha256:18ff38deaaf314cec509f9bd41c2a7a2a6b64210846eed89976173534b5bccb6,2650
+- time-compat-1.9.3@sha256:a1a0a8b088be6a7be50c7c0bf156ce876151b1cbe14261736965e361c8073b2a,4349
+- transformers-compat-0.6.5@sha256:50b00c57bf3fc379ec2477bfc261a2aebc983084488478adb29854f193af4696,5490
+- unbounded-delays-0.1.1.0@sha256:8e57c6ffb72ed605b85c69d3b3a7ebbbbb70bfb5e9b9816309f1f733240838f2,1184
+- unordered-containers-0.2.10.0@sha256:5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204,5199
+- uuid-types-1.0.3@sha256:2cab161f274309cfd9ef62694a6bd1b47525bc4c79a827293b055e4a9eadb4d2,2473
+- vector-0.12.1.2@sha256:9291bc581f36e51d5bda9fce57cb980fbec3dd292996896f285fef39eb80a9a0,7364
+- vector-algorithms-0.8.0.3@sha256:477ef5ac82fdd28a39536ed0a767faec3425802827abee485be31db5bc6f5e90,3488
+- vector-binary-instances-0.2.5.1@sha256:dde16050ebc4f6da36a75f10b8b933742793e94366086cc752636679f0894945,2577
+- vector-th-unbox-0.2.1.7@sha256:a707fe2c7d721006e1e2ef0d9cac4bf95b12379a1d7cd0eee9c3379672841087,1445
+- void-0.7.3@sha256:13d30f62fcdf065e595d679d4ac8b4b0c1bb1a1b73db7b5b5a8f857cb5c8a546,1857
+- wcwidth-0.0.2@sha256:77531eb6683c505c22ab3fa11bbc43d3ce1e7dac21401d4d5a19677d348bb5f3,1998
+# For tests
+- HUnit-1.6.0.0@sha256:8014b27c884becd8041214a1ab263fa92244ca62700a911aff604a1047869298,1570
+- extensible-exceptions-0.1.1.4@sha256:eb5fe684a7ffe8d1ed2ed6cdaec7dfb29efc780811ea7158a64edc2abc516f47,1205
+- hostname-1.0@sha256:8203b6ecd14ca1ef12f73a471b0a6a4be3ad4568d8b84f2bc4bc9e0abb8c4153,813
+- old-locale-1.0.0.7@sha256:fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911,1071
+- regex-base-0.94.0.0@sha256:44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e,2253
+- regex-posix-0.96.0.0@sha256:690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3,2531
+- test-framework-0.8.2.0@sha256:065a1a6f5d43cee0c01c9d7f1a9539c62661a91012c6314db31fbed1a512e9a1,6395
+- test-framework-hunit-0.3.0.2@sha256:7fd007e9cb082cd64a2213a6d36acf057f7d6df6b5343a088e81b2b3a9a23545,1487
+- test-framework-quickcheck2-0.3.0.5@sha256:c25bfe518324a584334baa8139491624d72ee0e04942692a384058b54372efaa,1840
+- xml-1.3.14@sha256:edb7cf08e80013cab3f80e1cb1765cb8e4f0772cf5de8a50ba3bbdfa2ae61d8c,942
+
+ghc-options:
+  "$locals": -Wall -Werror
+
+allow-newer: true
diff --git a/stack-nightly.yaml → stack-8.8.yaml b/stack-nightly.yaml → stack-8.8.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2019-09-28
+resolver: lts-15.15
 packages:
 - proto-lens
 - proto-lens-arbitrary
@@ -11,7 +11,7 @@ packages:
 - proto-lens-tests
 - proto-lens-tests-dep
 extra-deps:
-- ghc-source-gen-0.3.0.0
+- ghc-source-gen-0.4.0.0
 
 ghc-options:
   "$locals": -Wall -Werror
diff --git a/stack-bootstrap.yaml b/stack-bootstrap.yaml
@@ -6,7 +6,7 @@ packages:
 # Build the current HEAD proto-lens-protoc against older revisions of proto-lens
 # and proto-lens-descriptors that are consistent with each other.
 extra-deps:
-- ghc-source-gen-0.3.0.0
+- ghc-source-gen-0.4.0.0
 - git: https://github.com/google/proto-lens
   # To use the current repository:
   # git: ../..  # stack runs 'git clone' in a subdirectory