diff --git a/dev.Dockerfile b/dev.Dockerfile index f6379260..6c47a1e7 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -70,7 +70,7 @@ RUN \ RUN \ stack --no-terminal update && \ - stack --no-terminal --resolver lts-16.29 install \ + stack --no-terminal --resolver lts-16.31 install \ brittany \ ghcid \ ormolu \ diff --git a/dev.rootless.Dockerfile b/dev.rootless.Dockerfile index 0cca8688..9d6cd0f5 100644 --- a/dev.rootless.Dockerfile +++ b/dev.rootless.Dockerfile @@ -98,7 +98,7 @@ RUN \ RUN \ stack --no-terminal update && \ - stack --no-terminal --resolver lts-16.29 install \ + stack --no-terminal --resolver lts-16.31 install \ brittany \ ghcid \ ormolu \ diff --git a/ghc-toolkit/boot-libs/cabal.config b/ghc-toolkit/boot-libs/cabal.config index e31c440c..bb1ec38a 100644 --- a/ghc-toolkit/boot-libs/cabal.config +++ b/ghc-toolkit/boot-libs/cabal.config @@ -1,4 +1,4 @@ -index-state: 2021-01-13T00:00:00Z +index-state: 2021-01-17T00:00:00Z constraints: HsOpenSSL -fast-bignum, @@ -94,7 +94,7 @@ constraints: LambdaHack ==0.9.5.0, LibZip ==1.0.1, List ==0.6.2, - ListLike ==4.7.3, + ListLike ==4.7.4, ListTree ==0.2.3, MemoTrie ==0.6.10, MissingH ==1.4.3.0, @@ -118,6 +118,7 @@ constraints: Rasterific ==0.7.5.3, RefSerialize ==0.4.0, SHA ==1.6.4.4, + STMonadTrans ==0.4.5, SVGFonts ==1.7.0.1, SafeSemaphore ==0.10.1, ShellCheck ==0.7.1, @@ -262,7 +263,7 @@ constraints: amazonka-waf ==1.6.1, amazonka-workspaces ==1.6.1, amazonka-xray ==1.6.1, - amqp ==0.20.0, + amqp ==0.20.0.1, amqp-utils ==0.4.4.1, annotated-wl-pprint ==0.7.0, ansi-terminal ==0.10.3, @@ -383,6 +384,7 @@ constraints: bits-extra ==0.0.2.0, bitset-word8 ==0.1.1.2, bitvec ==1.0.3.0, + bitwise-enum ==1.0.0.3, blake2 ==0.3.0, blanks ==0.3.0, blas-carray ==0.1.0.1, @@ -644,6 +646,7 @@ constraints: data-fix ==0.2.1, data-forest ==0.1.0.8, data-has ==0.3.0.0, + data-hash ==0.2.0.1, data-interval ==2.0.1, data-inttrie ==0.1.4, data-lens-light ==0.1.2.2, @@ -776,6 +779,7 @@ constraints: eq ==4.2.1, equal-files ==0.0.5.3, equational-reasoning ==0.6.0.3, + equivalence ==0.3.5, erf ==2.0.0.0, errors ==2.3.0, errors-ext ==0.4.2, @@ -910,6 +914,7 @@ constraints: generic-random ==1.3.0.1, generics-sop ==0.5.1.0, generics-sop-lens ==0.2.0.1, + geniplate-mirror ==0.7.7, genvalidity ==0.11.0.0, genvalidity-aeson ==0.3.0.0, genvalidity-bytestring ==0.6.0.0, @@ -1115,7 +1120,7 @@ constraints: hpack ==0.34.3, hpack-dhall ==0.5.2, hpc ==0.6.0.3, - hpc-codecov ==0.2.0.0, + hpc-codecov ==0.2.0.1, hpc-lcov ==1.0.1, hreader ==1.1.0, hreader-lens ==0.1.3.0, @@ -1920,11 +1925,11 @@ constraints: safe-foldable ==0.1.0.0, safe-json ==1.1.1.1, safe-money ==0.9, - safecopy ==0.10.3, + safecopy ==0.10.3.1, safeio ==0.0.5.0, salak ==0.3.6, salak-yaml ==0.3.5.3, - saltine ==0.1.1.0, + saltine ==0.1.1.1, salve ==1.0.10, sample-frame ==0.0.3, sample-frame-np ==0.0.4.1, @@ -2006,7 +2011,7 @@ constraints: setenv ==0.1.1.3, setlocale ==1.0.0.9, sexp-grammar ==2.1.0, - shake ==0.19.2, + shake ==0.19.4, shake-plus ==0.1.10.0, shakespeare ==2.0.25, shared-memory ==0.2.0.0, @@ -2181,7 +2186,7 @@ constraints: tasty-hunit ==0.10.0.3, tasty-kat ==0.0.3, tasty-leancheck ==0.0.1, - tasty-lua ==0.2.3.1, + tasty-lua ==0.2.3.2, tasty-program ==1.0.5, tasty-quickcheck ==0.10.1.2, tasty-rerun ==1.1.18, diff --git a/pkgs.txt b/pkgs.txt index a903e794..6435c9f1 100644 --- a/pkgs.txt +++ b/pkgs.txt @@ -83,6 +83,7 @@ Ranged-sets Rasterific RefSerialize SHA +STMonadTrans SVGFonts SafeSemaphore ShellCheck @@ -343,6 +344,7 @@ bits bits-extra bitset-word8 bitvec +bitwise-enum blake2 blanks blas-carray @@ -598,6 +600,7 @@ data-endian data-fix data-forest data-has +data-hash data-interval data-inttrie data-lens-light @@ -726,6 +729,7 @@ epub-metadata eq equal-files equational-reasoning +equivalence erf errors errors-ext @@ -855,6 +859,7 @@ generic-optics generic-random generics-sop generics-sop-lens +geniplate-mirror genvalidity genvalidity-aeson genvalidity-bytestring diff --git a/stack-profile.yaml b/stack-profile.yaml index ef409046..5f92dfc8 100644 --- a/stack-profile.yaml +++ b/stack-profile.yaml @@ -4,7 +4,7 @@ build: library-profiling: true executable-profiling: true -resolver: lts-16.29 +resolver: lts-16.31 extra-deps: - binaryen-0.0.6.0 - url: https://github.com/tweag/inline-js/archive/ef675745e84d23d51c50660d40acf9e684fbb2d6.tar.gz diff --git a/stack.yaml b/stack.yaml index b06810f5..4bd17227 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-16.29 +resolver: lts-16.31 extra-deps: - binaryen-0.0.6.0 - url: https://github.com/tweag/inline-js/archive/ef675745e84d23d51c50660d40acf9e684fbb2d6.tar.gz diff --git a/utils/gen-pkgs.hs b/utils/gen-pkgs.hs index 52291e89..64670bf1 100755 --- a/utils/gen-pkgs.hs +++ b/utils/gen-pkgs.hs @@ -1,6 +1,6 @@ #!/usr/bin/env stack {- - stack --resolver lts-16.29 script + stack --resolver lts-16.31 script --package Cabal --package containers --package pantry diff --git a/utils/make-packages.py b/utils/make-packages.py index 11b2bc02..ea2f9777 100755 --- a/utils/make-packages.py +++ b/utils/make-packages.py @@ -101,7 +101,7 @@ def ghc_configure(): def patch_hadrian(): with open(os.path.join(ghc_repo_path, "hadrian", "stack.yaml"), mode="w") as f: - f.write("resolver: lts-16.29\n") + f.write("resolver: lts-16.31\n") with open(os.path.join(ghc_repo_path, "hadrian", "src", "Oracles", "Setting.hs"), mode="r") as h: