From 5d260912babf592d1d7dda69292194e9f7135f18 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Tue, 25 Jul 2023 09:22:29 -0400 Subject: [PATCH] Update stack-lts versions Move default resolver to 9.4 and add an explicit 9.2 case. Nightly is also 9.6 now. --- .github/workflows/ci.yml | 6 ++++-- graphula.cabal | 8 ++++---- package.yaml | 1 + stack-lts-19.33.yaml | 1 + stack-lts-19.33.yaml.lock | 12 ++++++++++++ stack-lts-20.26.yaml | 1 + stack-lts-20.26.yaml.lock | 12 ++++++++++++ stack-nightly.yaml | 2 +- stack-nightly.yaml.lock | 8 ++++---- stack.yaml | 2 +- stack.yaml.lock | 8 ++++---- 11 files changed, 45 insertions(+), 16 deletions(-) create mode 100644 stack-lts-19.33.yaml create mode 100644 stack-lts-19.33.yaml.lock create mode 100644 stack-lts-20.26.yaml create mode 100644 stack-lts-20.26.yaml.lock diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c71a2ea..576ab48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,10 @@ jobs: strategy: matrix: stack-yaml: - - stack-nightly.yaml # ghc-9.0 - - stack.yaml # ghc-9.0 + - stack-nightly.yaml # ghc-9.6 + - stack.yaml # ghc-9.4 + - stack-lts-20.26.yaml # ghc-9.2 + - stack-lts-19.33.yaml # ghc-9.0 - stack-lts-18.28.yaml # ghc-8.10 - stack-lts-16.31.yaml # ghc-8.8 - stack-lts-14.27.yaml # ghc-8.6 diff --git a/graphula.cabal b/graphula.cabal index 5253192..4886a65 100644 --- a/graphula.cabal +++ b/graphula.cabal @@ -1,10 +1,10 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.0. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack -- --- hash: 708be6abd7543f73652eb13a394e846b7310dbc15b9a90b1446c37f7363bb07d +-- hash: ca3c9631f0eb250d085bf4e69cf99d4cd5d82c6c7975a14ce18b57fc549575c5 name: graphula version: 2.0.2.2 @@ -64,7 +64,7 @@ library , unliftio-core default-language: Haskell2010 if impl(ghc >= 9.2) - ghc-options: -Wno-missing-kind-signatures + ghc-options: -Wno-missing-kind-signatures -Wno-operator-whitespace if impl(ghc >= 8.10) ghc-options: -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module if impl(ghc < 8.6) @@ -93,7 +93,7 @@ test-suite readme , unliftio-core default-language: Haskell2010 if impl(ghc >= 9.2) - ghc-options: -Wno-missing-kind-signatures + ghc-options: -Wno-missing-kind-signatures -Wno-operator-whitespace if impl(ghc >= 8.10) ghc-options: -Wno-missing-safe-haskell-mode -Wno-prepositive-qualified-module if impl(ghc < 8.6) diff --git a/package.yaml b/package.yaml index ad269ec..80f5dfc 100644 --- a/package.yaml +++ b/package.yaml @@ -23,6 +23,7 @@ when: - condition: impl(ghc >= 9.2) ghc-options: - -Wno-missing-kind-signatures + - -Wno-operator-whitespace - condition: impl(ghc >= 8.10) ghc-options: - -Wno-missing-safe-haskell-mode diff --git a/stack-lts-19.33.yaml b/stack-lts-19.33.yaml new file mode 100644 index 0000000..f9994e6 --- /dev/null +++ b/stack-lts-19.33.yaml @@ -0,0 +1 @@ +resolver: lts-19.33 diff --git a/stack-lts-19.33.yaml.lock b/stack-lts-19.33.yaml.lock new file mode 100644 index 0000000..d79c369 --- /dev/null +++ b/stack-lts-19.33.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4 + size: 619204 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml + original: lts-19.33 diff --git a/stack-lts-20.26.yaml b/stack-lts-20.26.yaml new file mode 100644 index 0000000..fc9172f --- /dev/null +++ b/stack-lts-20.26.yaml @@ -0,0 +1 @@ +resolver: lts-20.26 diff --git a/stack-lts-20.26.yaml.lock b/stack-lts-20.26.yaml.lock new file mode 100644 index 0000000..ea5a850 --- /dev/null +++ b/stack-lts-20.26.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2 + size: 650475 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml + original: lts-20.26 diff --git a/stack-nightly.yaml b/stack-nightly.yaml index cd3dc84..ba559fb 100644 --- a/stack-nightly.yaml +++ b/stack-nightly.yaml @@ -1 +1 @@ -resolver: nightly-2022-08-15 +resolver: nightly-2023-07-25 diff --git a/stack-nightly.yaml.lock b/stack-nightly.yaml.lock index fe01827..5c8a85d 100644 --- a/stack-nightly.yaml.lock +++ b/stack-nightly.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 630638 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/8/15.yaml - sha256: faa92f1bd6eb0ec0535c43ff1d1719de0968a57e60a2e954d55c0e2ec37a25aa - original: nightly-2022-08-15 + sha256: e4162106c3c7d9a71f1034ab31582fbeee1cc5b3266a49c0d52f577a6002df8e + size: 559903 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/7/25.yaml + original: nightly-2023-07-25 diff --git a/stack.yaml b/stack.yaml index cb1396f..5f2793c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-19.1 +resolver: lts-21.4 ghc-options: "$locals": -fwrite-ide-info diff --git a/stack.yaml.lock b/stack.yaml.lock index 365f070..24d61c7 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 617355 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/1.yaml - sha256: cbd5e8593869445794924668479b5bd9f1738d075898623dceacc13b2576b6e3 - original: lts-19.1 + sha256: caa77fdbc5b9f698262b21ee78030133272ec53116ad6ddbefdc4c321f668e0c + size: 640014 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/4.yaml + original: lts-21.4