From 96da64ff1df08e2f468c00ec3b59f3861344fd17 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 12:21:37 -0400 Subject: [PATCH 1/7] Bump bounds for ghc-9.8 - Bump hpack signature expectation --- lib/StackageToHackage/Hackage.hs | 5 +++++ stack.yaml | 2 +- stack2cabal.cabal | 2 +- tests/hpack/hpack.cabal | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/StackageToHackage/Hackage.hs b/lib/StackageToHackage/Hackage.hs index 0939e60..1f5b3fd 100644 --- a/lib/StackageToHackage/Hackage.hs +++ b/lib/StackageToHackage/Hackage.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DuplicateRecordFields #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE OverloadedStrings #-} @@ -39,7 +40,11 @@ import Data.List.Extra (nubOrd, nubOrdOn, lower, dropPrefix, dropSuffix) import Data.List.NonEmpty (NonEmpty((:|))) import Data.Maybe (fromMaybe, mapMaybe, catMaybes) import Data.Text (Text) +#if MIN_VERSION_Cabal(3, 8, 0) +import Distribution.Simple.PackageDescription (readGenericPackageDescription) +#else import Distribution.PackageDescription.Parsec (readGenericPackageDescription) +#endif import Distribution.Pretty (prettyShow) import Distribution.Types.GenericPackageDescription (GenericPackageDescription(..)) diff --git a/stack.yaml b/stack.yaml index 95bc743..ada9ae3 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,4 +2,4 @@ resolver: lts-18.28 packages: - . extra-deps: -- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726 \ No newline at end of file +- hpack-0.36.0@sha256:48f98f1b607bb856acf890fe4e62a600d16961763102e4e8b9bc76349cce05fe,5229 diff --git a/stack2cabal.cabal b/stack2cabal.cabal index 95cbf1a..d1ef0ea 100644 --- a/stack2cabal.cabal +++ b/stack2cabal.cabal @@ -34,7 +34,7 @@ common deps build-depends: , base >=4.13 && <5.0 , bytestring - , Cabal >=3.0 && <3.8 + , Cabal >=3.0 && <3.12 , containers , directory , exceptions ^>=0.10.4 diff --git a/tests/hpack/hpack.cabal b/tests/hpack/hpack.cabal index 9dd11e7..28e996b 100644 --- a/tests/hpack/hpack.cabal +++ b/tests/hpack/hpack.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.5. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack -- From 29728b2bab345578ee963d4afff0a7d7a5f5ae7d Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 10:45:48 -0400 Subject: [PATCH 2/7] Fix -Wincomplete-uni-patterns warnings --- lib/StackageToHackage/Stackage.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/StackageToHackage/Stackage.hs b/lib/StackageToHackage/Stackage.hs index 4d36952..5d8232c 100644 --- a/lib/StackageToHackage/Stackage.hs +++ b/lib/StackageToHackage/Stackage.hs @@ -141,8 +141,8 @@ mergeResolvers (Resolver r c p f) (Resolver r' c' p' f') = mergeDeps :: [Dep] -> [Dep] -> [Dep] mergeDeps lhs rhs = let nonGits = filter (not . isGitDep) lhs <> filter (not . isGitDep) rhs - gitsLhs = (\(SourceDep dep) -> dep) <$> filter isGitDep lhs - gitsRhs = (\(SourceDep dep) -> dep) <$> filter isGitDep rhs + gitsLhs = [dep | SourceDep dep <- lhs] + gitsRhs = [dep | SourceDep dep <- rhs] gitMerged = foldl' (\m key -> update key m) gitsRhs gitsLhs in (SourceDep <$> gitMerged) <> nonGits From a129b5566e62a207ea41770bccbb9fa7c54be9e0 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 12:38:49 -0400 Subject: [PATCH 3/7] Go with lts-22.13, ghc-9.6.4 --- cabal.project.freeze | 226 ++++++++++++++++++++++--------------------- stack.yaml | 4 +- 2 files changed, 118 insertions(+), 112 deletions(-) diff --git a/cabal.project.freeze b/cabal.project.freeze index fa4ae49..8ce383e 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1,196 +1,204 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.2.1.0, +constraints: any.Cabal ==3.10.1.0, + any.Cabal-syntax ==3.10.1.0, any.Glob ==0.10.2, any.HUnit ==1.6.2.0, - any.HsYAML ==0.2.1.1, + any.HsYAML ==0.2.1.3, HsYAML -exe, - any.OneTuple ==0.3.1, - any.QuickCheck ==2.14.2, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, QuickCheck -old-random +templatehaskell, any.StateVar ==1.2.2, any.adjunctions ==4.4.2, - any.aeson ==2.1.1.0, - aeson -cffi +ordered-keymap, - any.ansi-terminal ==0.11.3, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.ansi-terminal ==1.1, ansi-terminal -example, - any.ansi-wl-pprint ==0.6.9, - ansi-wl-pprint -example, + any.ansi-terminal-types ==1.1, any.appar ==0.1.8, - any.array ==0.5.4.0, + any.array ==0.5.6.0, any.asn1-encoding ==0.9.6, any.asn1-parse ==0.9.5, any.asn1-types ==0.3.4, - any.assoc ==1.0.2, - any.async ==2.2.4, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, async -bench, any.attoparsec ==0.14.4, attoparsec -developer, - any.base ==4.14.3.0, - any.base-compat ==0.12.2, - any.base-compat-batteries ==0.12.2, - any.base-orphans ==0.8.7, + any.base ==4.18.2.0, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, any.base64-bytestring ==1.2.1.0, - any.basement ==0.0.15, - any.bifunctors ==5.5.13, - bifunctors +semigroups +tagged, - any.binary ==0.8.8.0, - any.bitvec ==1.1.3.0, - bitvec -libgmp, - any.blaze-builder ==0.4.2.2, + any.basement ==0.0.16, + any.bifunctors ==5.6.1, + bifunctors +tagged, + any.binary ==0.8.9.1, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, any.byteorder ==1.0.4, - any.bytestring ==0.10.12.0, + any.bytestring ==0.11.5.3, any.call-stack ==0.4.0, any.case-insensitive ==1.2.1.0, + any.cborg ==0.2.10.0, + cborg +optimize-gmp, any.cereal ==0.5.8.3, cereal -bytestring-builder, - any.clock ==0.8.3, + any.clock ==0.8.4, clock -llvm, any.colour ==2.3.6, any.comonad ==5.0.8, comonad +containers +distributive +indexed-traversable, - any.conduit ==1.3.4.2, - any.connection ==0.3.1, - any.containers ==0.6.5.1, + any.conduit ==1.3.5, + any.containers ==0.6.7, any.contravariant ==1.5.5, contravariant +semigroups +statevar +tagged, - any.cookie ==0.4.5, - any.cryptonite ==0.30, - cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.cookie ==0.5.0, + any.crypton ==0.34, + crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, + any.crypton-connection ==0.3.2, + any.crypton-x509 ==1.7.6, + any.crypton-x509-store ==1.6.9, + any.crypton-x509-system ==1.6.7, + any.crypton-x509-validation ==1.6.12, any.data-default-class ==0.1.2.0, any.data-fix ==0.3.2, - any.deepseq ==1.4.4.0, - any.directory ==1.3.6.0, + any.deepseq ==1.4.8.1, + any.directory ==1.3.8.1, any.distributive ==0.6.2.1, distributive +semigroups +tagged, any.dlist ==1.0, dlist -werror, - any.exceptions ==0.10.4, - any.extra ==1.7.12, - any.filepath ==1.4.2.1, + any.exceptions ==0.10.7, + any.extra ==1.7.14, + any.filepath ==1.4.200.1, any.filepattern ==0.1.3, - any.free ==5.1.9, + any.free ==5.2, any.fuzzy-dates ==0.1.1.2, - any.generically ==0.1, - any.ghc ==8.10.7, - any.ghc-boot ==8.10.7, - any.ghc-boot-th ==8.10.7, - any.ghc-heap ==8.10.7, - any.ghc-prim ==0.6.1, - any.ghci ==8.10.7, - any.hashable ==1.4.1.0, - hashable +containers +integer-gmp -random-initial-seed, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.6.4, + any.ghc-prim ==0.10.0, + any.half ==0.3.1, + any.hashable ==1.4.3.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, any.hourglass ==0.2.12, - any.hpack ==0.35.0, - any.hpc ==0.6.1.0, - any.hsc2hs ==0.68.8, + any.hpack ==0.36.0, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.6, - any.hspec-core ==2.10.6, - any.hspec-discover ==2.10.6, - any.hspec-expectations ==0.8.2, - any.http-client ==0.7.13.1, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, + any.http-client ==0.7.16, http-client +network-uri, - any.http-client-tls ==0.3.6.1, - any.http-types ==0.12.3, - any.indexed-traversable ==0.1.2, - any.indexed-traversable-instances ==0.1.1.1, + any.http-client-tls ==0.3.6.3, + any.http-types ==0.12.4, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, any.infer-license ==0.2.0, - any.integer-gmp ==1.0.3.0, + any.integer-conversion ==0.1.0.1, + any.integer-gmp ==1.1, any.integer-logarithms ==1.0.3.1, integer-logarithms -check-bounds +integer-gmp, - any.invariant ==0.6, + any.invariant ==0.6.2, any.iproute ==1.7.12, any.kan-extensions ==5.2.5, - any.lens ==5.2, + any.lens ==5.2.3, lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, - any.libyaml ==0.1.2, + any.libyaml ==0.1.4, libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, any.memory ==0.18.0, memory +support_bytestring +support_deepseq, - any.mime-types ==0.1.1.0, - any.mono-traversable ==1.0.15.3, - any.mtl ==2.2.2, - any.network ==3.1.2.7, + any.mime-types ==0.1.2.0, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.3.1, + any.network ==3.1.4.0, network -devel, - any.network-uri ==2.6.4.1, - any.optparse-applicative ==0.17.0.0, + any.network-uri ==2.6.4.2, + any.old-locale ==1.0.0.7, + any.old-time ==1.1.0.4, + any.optparse-applicative ==0.18.1.0, optparse-applicative +process, any.parallel ==3.2.2.0, - any.parsec ==3.1.14.0, + any.parsec ==3.1.16.1, any.pem ==0.2.4, any.pretty ==1.1.3.6, - any.primitive ==0.7.4.0, - any.process ==1.6.13.2, + any.prettyprinter ==1.7.1, + prettyprinter -buildreadme +text, + any.prettyprinter-ansi-terminal ==1.1.3, + any.primitive ==0.9.0.0, + any.process ==1.6.17.0, any.profunctors ==5.6.2, any.quickcheck-io ==0.2.0, - any.random ==1.2.1.1, - any.reflection ==2.1.6, + any.random ==1.2.1.2, + any.reflection ==2.1.7, reflection -slow +template-haskell, - any.resourcet ==1.2.6, - any.rts ==1.0.1, - any.safe ==0.3.19, + any.resourcet ==1.3.0, + any.rts ==1.0.2, + any.safe ==0.3.21, any.scientific ==0.3.7.0, scientific -bytestring-builder -integer-simple, - any.semialign ==1.2.0.1, + any.semialign ==1.3, semialign +semigroupoids, - any.semigroupoids ==5.3.7, + any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, any.semigroups ==0.20, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, - any.setenv ==0.1.1.3, + any.serialise ==0.2.6.1, + serialise +newtime15, any.socks ==0.6.1, - any.split ==0.2.3.5, - any.splitmix ==0.1.0.4, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, splitmix -optimised-mixer, stack2cabal -ghcflags, - any.stm ==2.5.0.1, - any.streaming-commons ==0.2.2.4, + any.stm ==2.5.1.0, + any.streaming-commons ==0.2.2.6, streaming-commons -use-bytestring-builder, - any.strict ==0.4.0.1, - strict +assoc, - any.tagged ==0.8.6.1, + any.strict ==0.5, + any.tagged ==0.8.8, tagged +deepseq +transformers, - any.template-haskell ==2.16.0.0, + any.template-haskell ==2.20.0.0, any.temporary ==1.3, - any.terminfo ==0.4.1.4, - any.text ==1.2.4.1, + any.text ==2.0.2, + any.text-iso8601 ==0.1, any.text-metrics ==0.3.2, text-metrics -dev, any.text-short ==0.1.5, text-short -asserts, any.tf-random ==0.5, - any.th-abstraction ==0.4.5.0, + any.th-abstraction ==0.6.0.0, any.th-compat ==0.1.4, - any.these ==1.1.1.1, - these +assoc, - any.time ==1.9.3, + any.these ==1.2, + any.time ==1.12.2, any.time-compat ==1.9.6.1, time-compat -old-locale, - any.tls ==1.6.0, - tls +compat -hans +network, - any.transformers ==0.5.6.2, + any.tls ==2.0.1, + tls -devel, + any.transformers ==0.6.1.0, any.transformers-base ==0.4.6, transformers-base +orphaninstances, any.transformers-compat ==0.7.2, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, - any.unix ==2.7.2.2, - any.unliftio-core ==0.2.0.1, - any.unordered-containers ==0.2.19.1, + any.unix ==2.8.4.0, + any.unix-time ==0.4.12, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, unordered-containers -debug, - any.uuid-types ==1.0.5, - any.vector ==0.12.3.1, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.9.0.1, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-stream ==0.1.0.1, any.void ==0.7.3, void -safe, any.witherable ==0.4.2, - any.x509 ==1.7.7, - any.x509-store ==1.6.9, - any.x509-system ==1.6.7, - any.x509-validation ==1.6.12, - any.yaml ==0.11.8.0, + any.yaml ==0.11.11.2, yaml +no-examples +no-exe, - any.zlib ==0.6.3.0, - zlib -bundled-c-zlib -non-blocking-ffi -pkg-config -index-state: hackage.haskell.org 2022-09-28T17:08:53Z + any.zlib ==0.7.0.0, + zlib -bundled-c-zlib +non-blocking-ffi +pkg-config +index-state: hackage.haskell.org 2024-03-17T15:41:15Z diff --git a/stack.yaml b/stack.yaml index ada9ae3..aaaa949 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,5 +1,3 @@ -resolver: lts-18.28 +resolver: lts-22.13 packages: - . -extra-deps: -- hpack-0.36.0@sha256:48f98f1b607bb856acf890fe4e62a600d16961763102e4e8b9bc76349cce05fe,5229 From dd57f5e1c435684d99c0c22e2b3c3285233962e1 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 12:41:43 -0400 Subject: [PATCH 4/7] Delete .freeze file, doesn't play nice with CI --- cabal.project.freeze | 204 ------------------------------------------- 1 file changed, 204 deletions(-) delete mode 100644 cabal.project.freeze diff --git a/cabal.project.freeze b/cabal.project.freeze deleted file mode 100644 index 8ce383e..0000000 --- a/cabal.project.freeze +++ /dev/null @@ -1,204 +0,0 @@ -active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.10.1.0, - any.Cabal-syntax ==3.10.1.0, - any.Glob ==0.10.2, - any.HUnit ==1.6.2.0, - any.HsYAML ==0.2.1.3, - HsYAML -exe, - any.OneTuple ==0.4.1.1, - any.QuickCheck ==2.14.3, - QuickCheck -old-random +templatehaskell, - any.StateVar ==1.2.2, - any.adjunctions ==4.4.2, - any.aeson ==2.2.1.0, - aeson +ordered-keymap, - any.ansi-terminal ==1.1, - ansi-terminal -example, - any.ansi-terminal-types ==1.1, - any.appar ==0.1.8, - any.array ==0.5.6.0, - any.asn1-encoding ==0.9.6, - any.asn1-parse ==0.9.5, - any.asn1-types ==0.3.4, - any.assoc ==1.1, - assoc +tagged, - any.async ==2.2.5, - async -bench, - any.attoparsec ==0.14.4, - attoparsec -developer, - any.base ==4.18.2.0, - any.base-orphans ==0.9.1, - any.base16-bytestring ==1.0.2.0, - any.base64-bytestring ==1.2.1.0, - any.basement ==0.0.16, - any.bifunctors ==5.6.1, - bifunctors +tagged, - any.binary ==0.8.9.1, - any.bitvec ==1.1.5.0, - bitvec +simd, - any.blaze-builder ==0.4.2.3, - any.byteorder ==1.0.4, - any.bytestring ==0.11.5.3, - any.call-stack ==0.4.0, - any.case-insensitive ==1.2.1.0, - any.cborg ==0.2.10.0, - cborg +optimize-gmp, - any.cereal ==0.5.8.3, - cereal -bytestring-builder, - any.clock ==0.8.4, - clock -llvm, - any.colour ==2.3.6, - any.comonad ==5.0.8, - comonad +containers +distributive +indexed-traversable, - any.conduit ==1.3.5, - any.containers ==0.6.7, - any.contravariant ==1.5.5, - contravariant +semigroups +statevar +tagged, - any.cookie ==0.5.0, - any.crypton ==0.34, - crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes, - any.crypton-connection ==0.3.2, - any.crypton-x509 ==1.7.6, - any.crypton-x509-store ==1.6.9, - any.crypton-x509-system ==1.6.7, - any.crypton-x509-validation ==1.6.12, - any.data-default-class ==0.1.2.0, - any.data-fix ==0.3.2, - any.deepseq ==1.4.8.1, - any.directory ==1.3.8.1, - any.distributive ==0.6.2.1, - distributive +semigroups +tagged, - any.dlist ==1.0, - dlist -werror, - any.exceptions ==0.10.7, - any.extra ==1.7.14, - any.filepath ==1.4.200.1, - any.filepattern ==0.1.3, - any.free ==5.2, - any.fuzzy-dates ==0.1.1.2, - any.generically ==0.1.1, - any.ghc-bignum ==1.3, - any.ghc-boot-th ==9.6.4, - any.ghc-prim ==0.10.0, - any.half ==0.3.1, - any.hashable ==1.4.3.0, - hashable +integer-gmp -random-initial-seed, - any.haskell-lexer ==1.1.1, - any.hourglass ==0.2.12, - any.hpack ==0.36.0, - any.hsc2hs ==0.68.10, - hsc2hs -in-ghc-tree, - any.hspec ==2.11.7, - any.hspec-core ==2.11.7, - any.hspec-discover ==2.11.7, - any.hspec-expectations ==0.8.4, - any.http-client ==0.7.16, - http-client +network-uri, - any.http-client-tls ==0.3.6.3, - any.http-types ==0.12.4, - any.indexed-traversable ==0.1.3, - any.indexed-traversable-instances ==0.1.1.2, - any.infer-license ==0.2.0, - any.integer-conversion ==0.1.0.1, - any.integer-gmp ==1.1, - any.integer-logarithms ==1.0.3.1, - integer-logarithms -check-bounds +integer-gmp, - any.invariant ==0.6.2, - any.iproute ==1.7.12, - any.kan-extensions ==5.2.5, - any.lens ==5.2.3, - lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy, - any.libyaml ==0.1.4, - libyaml -no-unicode -system-libyaml, - any.libyaml-clib ==0.2.5, - any.memory ==0.18.0, - memory +support_bytestring +support_deepseq, - any.mime-types ==0.1.2.0, - any.mono-traversable ==1.0.17.0, - any.mtl ==2.3.1, - any.network ==3.1.4.0, - network -devel, - any.network-uri ==2.6.4.2, - any.old-locale ==1.0.0.7, - any.old-time ==1.1.0.4, - any.optparse-applicative ==0.18.1.0, - optparse-applicative +process, - any.parallel ==3.2.2.0, - any.parsec ==3.1.16.1, - any.pem ==0.2.4, - any.pretty ==1.1.3.6, - any.prettyprinter ==1.7.1, - prettyprinter -buildreadme +text, - any.prettyprinter-ansi-terminal ==1.1.3, - any.primitive ==0.9.0.0, - any.process ==1.6.17.0, - any.profunctors ==5.6.2, - any.quickcheck-io ==0.2.0, - any.random ==1.2.1.2, - any.reflection ==2.1.7, - reflection -slow +template-haskell, - any.resourcet ==1.3.0, - any.rts ==1.0.2, - any.safe ==0.3.21, - any.scientific ==0.3.7.0, - scientific -bytestring-builder -integer-simple, - any.semialign ==1.3, - semialign +semigroupoids, - any.semigroupoids ==6.0.0.1, - semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.semigroups ==0.20, - semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, - any.serialise ==0.2.6.1, - serialise +newtime15, - any.socks ==0.6.1, - any.split ==0.2.5, - any.splitmix ==0.1.0.5, - splitmix -optimised-mixer, - stack2cabal -ghcflags, - any.stm ==2.5.1.0, - any.streaming-commons ==0.2.2.6, - streaming-commons -use-bytestring-builder, - any.strict ==0.5, - any.tagged ==0.8.8, - tagged +deepseq +transformers, - any.template-haskell ==2.20.0.0, - any.temporary ==1.3, - any.text ==2.0.2, - any.text-iso8601 ==0.1, - any.text-metrics ==0.3.2, - text-metrics -dev, - any.text-short ==0.1.5, - text-short -asserts, - any.tf-random ==0.5, - any.th-abstraction ==0.6.0.0, - any.th-compat ==0.1.4, - any.these ==1.2, - any.time ==1.12.2, - any.time-compat ==1.9.6.1, - time-compat -old-locale, - any.tls ==2.0.1, - tls -devel, - any.transformers ==0.6.1.0, - any.transformers-base ==0.4.6, - transformers-base +orphaninstances, - any.transformers-compat ==0.7.2, - transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, - any.unix ==2.8.4.0, - any.unix-time ==0.4.12, - any.unliftio-core ==0.2.1.0, - any.unordered-containers ==0.2.20, - unordered-containers -debug, - any.uuid-types ==1.0.5.1, - any.vector ==0.13.1.0, - vector +boundschecks -internalchecks -unsafechecks -wall, - any.vector-algorithms ==0.9.0.1, - vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.vector-stream ==0.1.0.1, - any.void ==0.7.3, - void -safe, - any.witherable ==0.4.2, - any.yaml ==0.11.11.2, - yaml +no-examples +no-exe, - any.zlib ==0.7.0.0, - zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2024-03-17T15:41:15Z From a64ab6f1da4c779b60b1b802599e9fa75a2b9f64 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 13:08:20 -0400 Subject: [PATCH 5/7] Bump docker ghc version to 9.6.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5f123b2..d2ab63d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.12 as builder -ARG GHC=8.10.7 +ARG GHC=9.6.4 # install ghc and stack RUN \ From 3641573fdb8be0f9aafe55683c888e852687fb6f Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 13:41:11 -0400 Subject: [PATCH 6/7] Bump ghc and cabal in github workflows --- .github/workflows/haskell.yml | 8 ++++---- .github/workflows/release.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 5195abd..b77f922 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -14,13 +14,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - ghc: ['8.10.7'] - cabal: ['3.6.2.0'] + ghc: ['9.6'] + cabal: ['3.10'] exclude: # can't build zlib - os: windows-latest - ghc: '8.10.7' - cabal: '3.6.2.0' + ghc: '9.6' + cabal: '3.10' steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 86641f9..cd47ada 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -48,8 +48,8 @@ jobs: - name: Install GHC and cabal run: | - ghcup install ghc --force -i /usr/local 8.10.7 - ghcup install cabal --force -i /usr/local/bin 3.6.2.0 + ghcup install ghc --force -i /usr/local 9.6.4 + ghcup install cabal --force -i /usr/local/bin 3.10.2.1 shell: bash - name: Update cabal cache From 4f828abb4347ed06ab9a9bf40fc394ddf4cc226a Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Sun, 17 Mar 2024 13:43:57 -0400 Subject: [PATCH 7/7] Switch to haskell-actions/setup --- .github/workflows/haskell.yml | 4 ++-- .github/workflows/release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index b77f922..4b68978 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1.2 + - uses: haskell-actions/setup@v2 with: ghc-version: ${{ matrix.ghc }} cabal-version: ${{ matrix.cabal }} @@ -99,7 +99,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1.2 + - uses: haskell-actions/setup@v2 with: enable-stack: true stack-no-global: true diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index cd47ada..677169a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -144,7 +144,7 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1.2 + - uses: haskell-actions/setup@v2 with: ghc-version: 8.10.7 cabal-version: 3.6.2.0