From a1e221199ceaef5ae8d089effb5b7deb93847a64 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Wed, 5 Aug 2020 16:01:07 +0100 Subject: [PATCH] Bump dependencies, remove allow-newer --- cabal.project | 6 +----- stack-8.10.1.yaml | 9 ++++----- stack-8.6.4.yaml | 10 ++++------ stack-8.6.5.yaml | 10 ++++------ stack-8.8.2.yaml | 10 ++++------ stack-8.8.3.yaml | 8 ++++---- stack-8.8.4.yaml | 8 ++++---- stack.yaml | 9 ++++----- 8 files changed, 29 insertions(+), 41 deletions(-) diff --git a/cabal.project b/cabal.project index 17b6a9210eb..2618181aa4d 100644 --- a/cabal.project +++ b/cabal.project @@ -14,8 +14,4 @@ package ghcide write-ghc-environment-files: never -index-state: 2020-08-01T17:01:19Z - -allow-newer: - floskell:aeson - stylish-haskell:aeson +index-state: 2020-08-05T14:24:10Z diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml index 1fc5165f2ff..dab872f00c6 100644 --- a/stack-8.10.1.yaml +++ b/stack-8.10.1.yaml @@ -13,15 +13,16 @@ extra-deps: - hie-bios-0.6.1 - cabal-plan-0.7.0.0 - clock-0.7.2 -- floskell-0.10.3 -- fourmolu-0.1.0.0 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 - ghc-exactprint-0.6.3 +- HsYAML-aeson-0.2.0.0@rev:2 - lens-4.19.1 - lsp-test-0.11.0.3 - monad-dijkstra-0.1.1.2 - optics-core-0.3 - ormolu-0.1.2.0 -- stylish-haskell-0.11.0.0 +- stylish-haskell-0.11.0.3 - semigroups-0.18.5 - temporary-1.2.1.1 - these-1.1 @@ -40,5 +41,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml index 5f4f0ad3578..41d7c8204af 100644 --- a/stack-8.6.4.yaml +++ b/stack-8.6.4.yaml @@ -19,8 +19,8 @@ extra-deps: - deque-0.4.3 # - ghcide-0.1.0 - extra-1.7.3 -- floskell-0.10.3 -- fourmolu-0.1.0.0 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 - fuzzy-0.1.0.0 - ghc-check-0.5.0.1 - ghc-exactprint-0.6.2 # for HaRe @@ -38,7 +38,7 @@ extra-deps: - hoogle-5.0.17.11 - hsimport-0.11.0@rev:2 - HsYAML-0.2.1.0@rev:1 -- HsYAML-aeson-0.2.0.0@rev:1 +- HsYAML-aeson-0.2.0.0@rev:2 - lens-4.18 - lsp-test-0.11.0.3 - microlens-th-0.4.2.3@rev:1 @@ -53,7 +53,7 @@ extra-deps: - rope-utf16-splay-0.3.1.0 - shake-0.19.1 - strict-list-0.1.5 -- stylish-haskell-0.11.0.0 +- stylish-haskell-0.11.0.3 - syz-0.2.0.0 - tasty-rerun-1.1.17 - temporary-1.2.1.1 @@ -77,5 +77,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml index 131ec5f364b..d7da02b1919 100644 --- a/stack-8.6.5.yaml +++ b/stack-8.6.5.yaml @@ -17,8 +17,8 @@ extra-deps: - cabal-plan-0.6.2.0 - clock-0.7.2 - extra-1.7.3 -- floskell-0.10.3 -- fourmolu-0.1.0.0 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 - fuzzy-0.1.0.0 # - ghcide-0.1.0 - ghc-check-0.5.0.1 @@ -30,7 +30,7 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - hie-bios-0.6.1 - HsYAML-0.2.1.0@rev:1 -- HsYAML-aeson-0.2.0.0@rev:1 +- HsYAML-aeson-0.2.0.0@rev:2 - indexed-profunctors-0.1 - lens-4.18 - lsp-test-0.11.0.3 @@ -46,7 +46,7 @@ extra-deps: - semialign-1.1 # - github: wz1000/shake # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef -- stylish-haskell-0.11.0.0 +- stylish-haskell-0.11.0.3 - tasty-rerun-1.1.17 - temporary-1.2.1.1 - type-equality-1 @@ -62,5 +62,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml index d67a593fb60..36c1731f64f 100644 --- a/stack-8.8.2.yaml +++ b/stack-8.8.2.yaml @@ -16,8 +16,8 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - extra-1.7.3 -- floskell-0.10.3 -- fourmolu-0.1.0.0 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 # - ghcide-0.1.0 - ghc-check-0.5.0.1 - ghc-lib-parser-8.10.1.20200523 @@ -31,7 +31,7 @@ extra-deps: - hoogle-5.0.17.11 - hsimport-0.11.0 - HsYAML-0.2.1.0@rev:1 -- HsYAML-aeson-0.2.0.0@rev:1 +- HsYAML-aeson-0.2.0.0@rev:2 - ilist-0.3.1.0 - lsp-test-0.11.0.3 - monad-dijkstra-0.1.1.2 @@ -40,7 +40,7 @@ extra-deps: - semigroups-0.18.5 # - github: wz1000/shake # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef -- stylish-haskell-0.11.0.0 +- stylish-haskell-0.11.0.3 - temporary-1.2.1.1 flags: @@ -53,5 +53,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 5f827194883..791bbfebdc5 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -15,12 +15,13 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - extra-1.7.3 -- floskell-0.10.3 -- fourmolu-0.1.0.0 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 # - ghcide-0.1.0 - haskell-src-exts-1.21.1 - hie-bios-0.6.1 - hlint-2.2.8 +- HsYAML-aeson-0.2.0.0@rev:2 - hoogle-5.0.17.11 - hsimport-0.11.0 - ilist-0.3.1.0 @@ -29,6 +30,7 @@ extra-deps: - semigroups-0.18.5 # - github: wz1000/shake # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef +- stylish-haskell-0.11.0.3 - temporary-1.2.1.1 flags: @@ -41,5 +43,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 8049d080fed..ab5d399cc2c 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -17,18 +17,20 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - extra-1.7.3 -- floskell-0.10.3 -- fourmolu-0.1.0.0 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 # - ghcide-0.1.0 - haskell-src-exts-1.21.1 - hie-bios-0.6.1 - hlint-2.2.8 +- HsYAML-aeson-0.2.0.0@rev:2 - hoogle-5.0.17.11 - hsimport-0.11.0 - ilist-0.3.1.0 - lsp-test-0.11.0.3 - monad-dijkstra-0.1.1.2 - semigroups-0.18.5 +- stylish-haskell-0.11.0.3 # - github: wz1000/shake # commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef - temporary-1.2.1.1 @@ -43,5 +45,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true diff --git a/stack.yaml b/stack.yaml index f692ed89ecc..bc533a15c88 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,8 @@ extra-deps: - cabal-plan-0.6.2.0 - clock-0.7.2 - extra-1.7.3 -- floskell-0.10.3 +- floskell-0.10.4 +- fourmolu-0.1.0.0@rev:1 - fuzzy-0.1.0.0 # - ghcide-0.1.0 - ghc-check-0.5.0.1 @@ -29,7 +30,7 @@ extra-deps: - haskell-lsp-types-0.22.0.0 - hie-bios-0.6.1 - HsYAML-0.2.1.0@rev:1 -- HsYAML-aeson-0.2.0.0@rev:1 +- HsYAML-aeson-0.2.0.0@rev:2 - indexed-profunctors-0.1 - lens-4.18 - lsp-test-0.11.0.3 @@ -43,7 +44,7 @@ extra-deps: - regex-pcre-builtin-0.95.1.1.8.43 - regex-tdfa-1.3.1.0 - semialign-1.1 -- stylish-haskell-0.11.0.0 +- stylish-haskell-0.11.0.3 - tasty-rerun-1.1.17 - temporary-1.2.1.1 - type-equality-1 @@ -59,5 +60,3 @@ nix: packages: [ icu libcxx zlib ] concurrent-tests: false - -allow-newer: true