Skip to content
This repository has been archived by the owner on Nov 24, 2022. It is now read-only.

Commit

Permalink
Toolchain update (#708)
Browse files Browse the repository at this point in the history
  • Loading branch information
TerrorJack authored Jul 7, 2020
1 parent 189053a commit 76f6228
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ jobs:

- name: gen-pkgs
run: |
utils/gen-pkgs.hs lts-16.3
utils/gen-pkgs.hs lts-16.4
mkdir gen-pkgs
mv cabal.config pkgs.txt gen-pkgs
Expand Down
46 changes: 23 additions & 23 deletions ghc-toolkit/boot-libs/cabal.config
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ constraints:
LambdaHack ==0.9.5.0,
LibZip ==1.0.1,
List ==0.6.2,
ListLike ==4.7,
ListLike ==4.7.1,
ListTree ==0.2.3,
MemoTrie ==0.6.10,
MissingH ==1.4.3.0,
Expand Down Expand Up @@ -329,7 +329,7 @@ constraints:
base32-lens ==0.1.0.0,
base32string ==0.9.1,
base58string ==0.10.0,
base64 ==0.4.2.1,
base64 ==0.4.2.2,
base64-bytestring ==1.0.0.3,
base64-bytestring-type ==1.0.1,
base64-lens ==0.3.0,
Expand Down Expand Up @@ -379,7 +379,7 @@ constraints:
blaze-bootstrap ==0.1.0.1,
blaze-builder ==0.4.1.0,
blaze-html ==0.9.1.2,
blaze-markup ==0.8.2.5,
blaze-markup ==0.8.2.7,
blaze-svg ==0.3.6.1,
blaze-textual ==0.2.1.0,
bmp ==1.2.6.3,
Expand Down Expand Up @@ -428,7 +428,7 @@ constraints:
c2hs ==0.28.6,
ca-province-codes ==1.0.0.0,
cabal-appimage ==0.3.0.0,
cabal-debian ==5.0.2,
cabal-debian ==5.0.3,
cabal-doctest ==1.0.8,
cabal-rpm ==2.0.6,
cabal2nix ==2.15.1,
Expand Down Expand Up @@ -783,7 +783,7 @@ constraints:
exact-pi ==0.5.0.1,
exception-hierarchy ==0.1.0.3,
exception-mtl ==0.4.0.1,
exception-transformers ==0.4.0.8,
exception-transformers ==0.4.0.9,
exceptions ==0.10.4,
executable-path ==0.0.3.1,
exit-codes ==1.0.0,
Expand Down Expand Up @@ -817,7 +817,7 @@ constraints:
file-modules ==0.1.2.4,
file-path-th ==0.1.0.0,
filecache ==0.4.1,
filelock ==0.1.1.4,
filelock ==0.1.1.5,
filemanip ==0.3.6.3,
filepath ==1.4.2.1,
filepattern ==0.1.2,
Expand Down Expand Up @@ -935,7 +935,7 @@ constraints:
ghc-heap ==8.8.3,
ghc-lib ==8.10.1.20200523,
ghc-lib-parser ==8.10.1.20200523,
ghc-lib-parser-ex ==8.10.0.14,
ghc-lib-parser-ex ==8.10.0.15,
ghc-parser ==0.2.2.0,
ghc-paths ==0.1.0.12,
ghc-prim ==0.5.3,
Expand Down Expand Up @@ -1007,7 +1007,7 @@ constraints:
haddock-library ==1.8.0,
hadolint ==1.18.0,
hadoop-streaming ==0.2.0.3,
hakyll ==4.13.3.0,
hakyll ==4.13.4.0,
half ==0.3,
hamtsolo ==1.0.3,
hapistrano ==0.4.1.0,
Expand Down Expand Up @@ -1047,7 +1047,7 @@ constraints:
heap ==1.0.4,
heaps ==0.3.6.1,
hebrew-time ==0.1.2,
hedgehog ==1.0.2,
hedgehog ==1.0.3,
hedgehog-corpus ==0.2.0,
hedgehog-fakedata ==0.0.1.3,
hedgehog-fn ==1.0,
Expand Down Expand Up @@ -1135,7 +1135,7 @@ constraints:
hspec-expectations ==0.8.2,
hspec-expectations-lifted ==0.10.0,
hspec-expectations-pretty-diff ==0.7.2.5,
hspec-golden ==0.1.0.1,
hspec-golden ==0.1.0.2,
hspec-golden-aeson ==0.7.0.0,
hspec-hedgehog ==0.0.1.2,
hspec-leancheck ==0.0.4,
Expand Down Expand Up @@ -1170,10 +1170,10 @@ constraints:
http-reverse-proxy ==0.6.0,
http-streams ==0.8.7.1,
http-types ==0.12.3,
http2 ==2.0.4,
http2 ==2.0.5,
httpd-shed ==0.4.1.1,
human-readable-duration ==0.2.1.4,
hunit-dejafu ==2.0.0.3,
hunit-dejafu ==2.0.0.4,
hvect ==0.4.0.0,
hvega ==0.9.1.0,
hw-balancedparens ==0.4.1.0,
Expand Down Expand Up @@ -1251,7 +1251,7 @@ constraints:
intro ==0.7.0.0,
intset-imperative ==0.1.0.0,
invariant ==0.5.3,
invertible ==0.2.0.5,
invertible ==0.2.0.6,
invertible-grammar ==0.1.2,
io-machine ==0.2.0.0,
io-manager ==0.1.0.2,
Expand Down Expand Up @@ -1306,7 +1306,7 @@ constraints:
kind-generics-th ==0.2.2.0,
kmeans ==0.1.3,
koofr-client ==1.0.0.3,
krank ==0.2.1,
krank ==0.2.2,
kubernetes-webhook-haskell ==0.2.0.2,
l10n ==0.1.0.1,
labels ==0.3.3,
Expand Down Expand Up @@ -1358,7 +1358,7 @@ constraints:
libyaml ==0.1.2,
life-sync ==1.1.1.0,
lift-generics ==0.1.3,
lifted-async ==0.10.0.6,
lifted-async ==0.10.1.1,
lifted-base ==0.2.3.12,
line ==4.0.1,
linear ==1.21.1,
Expand Down Expand Up @@ -1477,7 +1477,7 @@ constraints:
monad-coroutine ==0.9.0.4,
monad-extras ==0.6.0,
monad-journal ==0.8.1,
monad-logger ==0.3.32,
monad-logger ==0.3.33,
monad-logger-json ==0.1.0.0,
monad-logger-prefix ==0.1.11,
monad-loops ==0.4.3,
Expand Down Expand Up @@ -1507,7 +1507,7 @@ constraints:
morpheus-graphql ==0.12.0,
morpheus-graphql-core ==0.12.0,
mountpoints ==1.0.2,
mpi-hs ==0.7.1.2,
mpi-hs ==0.7.2.0,
mpi-hs-binary ==0.1.1.0,
mpi-hs-cereal ==0.1.0.0,
mtl ==2.2.2,
Expand Down Expand Up @@ -1857,7 +1857,7 @@ constraints:
regex-posix ==0.96.0.0,
regex-tdfa ==1.3.1.0,
regex-with-pcre ==1.1.0.0,
registry ==0.1.9.0,
registry ==0.1.9.1,
reinterpret-cast ==0.1.0,
relapse ==1.0.0.0,
relational-query ==0.12.2.3,
Expand Down Expand Up @@ -1894,7 +1894,7 @@ constraints:
rope-utf16-splay ==0.3.1.0,
rosezipper ==0.2,
rot13 ==0.2.0.1,
rpmbuild-order ==0.3,
rpmbuild-order ==0.3.1,
rts ==1.0,
runmemo ==1.0.0.1,
safe ==0.3.19,
Expand Down Expand Up @@ -1967,7 +1967,7 @@ constraints:
servant-elm ==0.7.2,
servant-errors ==0.1.6.0,
servant-foreign ==0.15,
servant-js ==0.9.4.1,
servant-js ==0.9.4.2,
servant-lucid ==0.9,
servant-machines ==0.15,
servant-mock ==0.8.5,
Expand All @@ -1992,7 +1992,7 @@ constraints:
setlocale ==1.0.0.9,
sexp-grammar ==2.1.0,
shake ==0.19.1,
shake-plus ==0.1.7.0,
shake-plus ==0.1.10.0,
shakespeare ==2.0.24.1,
shared-memory ==0.2.0.0,
shell-conduit ==4.7.0,
Expand Down Expand Up @@ -2156,7 +2156,7 @@ constraints:
tardis ==0.4.1.0,
tasty ==1.2.3,
tasty-ant-xml ==1.1.6,
tasty-dejafu ==2.0.0.5,
tasty-dejafu ==2.0.0.6,
tasty-discover ==4.2.1,
tasty-expected-failure ==0.11.1.2,
tasty-golden ==2.3.3.2,
Expand Down Expand Up @@ -2498,7 +2498,7 @@ constraints:
yesod-auth ==1.6.10,
yesod-auth-fb ==1.10.1,
yesod-auth-hashdb ==1.7.1.2,
yesod-bin ==1.6.0.4,
yesod-bin ==1.6.0.5,
yesod-core ==1.6.18,
yesod-fb ==0.6.1,
yesod-form ==1.6.7,
Expand Down
4 changes: 2 additions & 2 deletions stack-profile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ build:
library-profiling: true
executable-profiling: true

resolver: lts-16.3
resolver: lts-16.4
extra-deps:
- binaryen-0.0.1.1
- url: https://github.com/tweag/inline-js/archive/55f6530683aeda8f7235996197ded3509e2ed09f.tar.gz
- url: https://github.com/tweag/inline-js/archive/9ef93df2026c11d0bbee0b96287eb41042bf437d.tar.gz
subdirs:
- inline-js-core
packages:
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
resolver: lts-16.3
resolver: lts-16.4
extra-deps:
- binaryen-0.0.1.1
- url: https://github.com/tweag/inline-js/archive/55f6530683aeda8f7235996197ded3509e2ed09f.tar.gz
- url: https://github.com/tweag/inline-js/archive/9ef93df2026c11d0bbee0b96287eb41042bf437d.tar.gz
subdirs:
- inline-js-core
packages:
Expand Down
2 changes: 1 addition & 1 deletion utils/gen-pkgs.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env stack
{-
stack --resolver lts-16.3 script
stack --resolver lts-16.4 script
--package Cabal
--package containers
--package pantry
Expand Down

0 comments on commit 76f6228

Please sign in to comment.