Merge pull request #114 from msakai/update-stack-lts-202411

Update stack resolvers (2024-11)
msakai · Nov 9, 2024 · 6eb5e14 · 6eb5e14
2 parents 6b1b737 + 7c95d5b
commit 6eb5e14
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 58 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -17,19 +17,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - ghc: '9.8.2'
+            os: ubuntu-latest
+            stack_yaml: 'stack-ghc-9.8.yaml'
+            stack_args: ''
+            flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:optparse-applicative-018'
+            platform: linux-x86_64
+            coveralls: false
+
           - ghc: '9.6.6'
             os: ubuntu-latest
             stack_yaml: 'stack-ghc-9.6.yaml'
             stack_args: '--haddock --no-haddock-deps'
-            flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms'
+            flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:optparse-applicative-018'
             platform: linux-x86_64
             coveralls: false
             release: true
           - ghc: '9.6.6'
             os: macos-13  # Intel Mac
             stack_yaml: 'stack-ghc-9.6.yaml'
             stack_args: ''
-            flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms'
+            flags: '--flag toysolver:BuildToyFMF --flag toysolver:BuildSamplePrograms --flag toysolver:BuildMiscPrograms --flag toysolver:optparse-applicative-018'
             platform: macos
             coveralls: false
             release: true

diff --git a/stack-ghc-8.10.yaml b/stack-ghc-8.10.yaml
@@ -44,8 +44,6 @@ extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
 - logic-TPTP-0.4.7.0
-#- git: /~https://github.com/msakai/logic-TPTP.git
-#  commit: 9041314569aff4117c0da677f2af04614caf1aa5
 - finite-field-0.9.0
 - pseudo-boolean-0.1.10.0@sha256:c6a8b6c23c84cce8cecb37683755bde54db80b1ca817ce72de772c98d31dae44,2552
 - sign-0.4.4
@@ -55,10 +53,6 @@ extra-deps:
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
 flags: {}
 

diff --git a/stack-ghc-8.8.yaml b/stack-ghc-8.8.yaml
@@ -44,8 +44,6 @@ extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
 - logic-TPTP-0.4.7.0
-#- git: /~https://github.com/msakai/logic-TPTP.git
-#  commit: 9041314569aff4117c0da677f2af04614caf1aa5
 - finite-field-0.9.0
 - pseudo-boolean-0.1.10.0@sha256:c6a8b6c23c84cce8cecb37683755bde54db80b1ca817ce72de772c98d31dae44,2552
 - sign-0.4.4
@@ -55,10 +53,6 @@ extra-deps:
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
 flags: {}
 

diff --git a/stack-ghc-9.0.yaml b/stack-ghc-9.0.yaml
@@ -44,8 +44,6 @@ extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
 - logic-TPTP-0.4.7.0
-#- git: /~https://github.com/msakai/logic-TPTP.git
-#  commit: 9041314569aff4117c0da677f2af04614caf1aa5
 - finite-field-0.9.0
 - pseudo-boolean-0.1.10.0@sha256:c6a8b6c23c84cce8cecb37683755bde54db80b1ca817ce72de772c98d31dae44,2552
 - sign-0.4.4
@@ -55,10 +53,6 @@ extra-deps:
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
 flags: {}
 

diff --git a/stack-ghc-9.2.yaml b/stack-ghc-9.2.yaml
@@ -44,8 +44,6 @@ extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
 - logic-TPTP-0.4.7.0
-#- git: /~https://github.com/msakai/logic-TPTP.git
-#  commit: 9041314569aff4117c0da677f2af04614caf1aa5
 - finite-field-0.9.0
 - pseudo-boolean-0.1.10.0@sha256:c6a8b6c23c84cce8cecb37683755bde54db80b1ca817ce72de772c98d31dae44,2552
 - sign-0.4.4
@@ -55,10 +53,6 @@ extra-deps:
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
 flags: {}
 

diff --git a/stack-ghc-9.4.yaml b/stack-ghc-9.4.yaml
@@ -44,8 +44,6 @@ extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
 - logic-TPTP-0.4.7.0
-#- git: /~https://github.com/msakai/logic-TPTP.git
-#  commit: 9041314569aff4117c0da677f2af04614caf1aa5
 - finite-field-0.9.0
 - pseudo-boolean-0.1.10.0@sha256:50b8b5b4403c282d00d9951216106b64738767b154b43fa1633db58972dac732,2552
 - sign-0.4.4
@@ -55,10 +53,6 @@ extra-deps:
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
 flags: {}
 

diff --git a/stack-ghc-9.6.yaml b/stack-ghc-9.6.yaml
@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-22.33
+resolver: lts-22.40
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -43,7 +43,7 @@ packages:
 extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
-- logic-TPTP-0.5.1.0
+- logic-TPTP-0.6.0.0
 - finite-field-0.9.0
 - pseudo-boolean-0.1.11.0@sha256:3e03a1fd845c70397d4e47c0da79a126c747bf4c3b0e4553eb4026297376dfd7
 - sign-0.4.4
@@ -53,19 +53,10 @@ extra-deps:
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-- ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448
-- base-compat-0.12.3@sha256:4ef57766629fda9a5a6e41777e5279beb48a37b9d6cf5904c78643ad11a8a1ee,7490
-- base-compat-batteries-0.12.3@sha256:398c0d3c01407d5f79d7737961e79d0da1272ea11285238c6082850afc60dd9d,9666
-- criterion-1.5.13.0@sha256:6d627a4c269981d3c94bff5aca7c377e838336faf666ac5a4447863bf1044727,5650
-- criterion-measurement-0.1.4.0@sha256:a1e16321f63bb2de4eb9fe2ad9982479d0fed590be82ec0b99cfa082f4ed1821,2121
-- optparse-applicative-0.17.1.0@sha256:cb5f5f0dc9749846fc0e3df0041a8efee6368cc1cff07336acd4c3b02a951ed6,5147
-
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
-flags: {}
+flags:
+  toysolver:
+    optparse-applicative-018: true
 
 # Extra package databases containing global packages
 extra-package-dbs: []

diff --git a/stack-ghc-9.8.yaml b/stack-ghc-9.8.yaml
@@ -0,0 +1,80 @@
+# This file was automatically generated by 'stack init'
+# 
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# http://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+# 
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+# resolver: ghcjs-0.1.0_ghc-7.10.2
+# resolver:
+#  name: custom-snapshot
+#  location: "./custom-snapshot.yaml"
+resolver: nightly-2024-10-21
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+# 
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+# - location:
+#    git: /~https://github.com/commercialhaskell/stack.git
+#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+# - location: /~https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#   extra-dep: true
+#  subdirs:
+#  - auto-update
+#  - wai
+# 
+# A package marked 'extra-dep: true' will only be built if demanded by a
+# non-dependency (i.e. a user package), and its test suites and benchmarks
+# will not be run. This is useful for tweaking upstream packages.
+packages:
+- .
+
+# Dependency packages to be pulled from upstream that are not in the resolver
+# (e.g., acme-missiles-0.3)
+extra-deps:
+- queue-0.1.2
+- OptDir-0.0.3
+- logic-TPTP-0.6.0.0
+- finite-field-0.9.0
+- pseudo-boolean-0.1.11.0
+- sign-0.4.4@sha256:e97cc7f11e67a99b1eeeefb9d7552ec867bf29d3c8ce11338850c31fc09637fb
+- bytestring-encoding-0.1.2.0
+- MIP-0.1.2.0
+# Patched version of tasty-th for reading UTF-8 files on non UTF-8 environment.
+- git: /~https://github.com/msakai/tasty-th/
+  commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
+
+# Override default flag values for local packages and extra-deps
+flags:
+  toysolver:
+    optparse-applicative-018: true
+
+# Extra package databases containing global packages
+extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+# 
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=1.1"
+# 
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+# 
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+# 
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
diff --git a/stack.yaml b/stack.yaml
@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-20.25
+resolver: lts-22.40
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -43,24 +43,20 @@ packages:
 extra-deps:
 - queue-0.1.2
 - OptDir-0.0.3
-- logic-TPTP-0.4.7.0
-#- git: /~https://github.com/msakai/logic-TPTP.git
-#  commit: 9041314569aff4117c0da677f2af04614caf1aa5
+- logic-TPTP-0.6.0.0
 - finite-field-0.9.0
-- pseudo-boolean-0.1.10.0@sha256:c6a8b6c23c84cce8cecb37683755bde54db80b1ca817ce72de772c98d31dae44,2552
+- pseudo-boolean-0.1.11.0@sha256:3e03a1fd845c70397d4e47c0da79a126c747bf4c3b0e4553eb4026297376dfd7
 - sign-0.4.4
-- bytestring-encoding-0.1.1.0
-- MIP-0.1.1.0
+- bytestring-encoding-0.1.2.0
+- MIP-0.1.2.0
 # Patched version of tasty-th for reading UTF-8 files on non UTF-8 environment.
 - git: /~https://github.com/msakai/tasty-th/
   commit: ebbe5a79b3c7a537ceafc6291744c4d531bef63c
 
-# hack for avoiding haddock error of MemoTrie-0.6.4
-#- MemoTrie-0.6.7
-#- newtype-generics-0.5
-
 # Override default flag values for local packages and extra-deps
-flags: {}
+flags:
+  toysolver:
+    optparse-applicative-018: true
 
 # Extra package databases containing global packages
 extra-package-dbs: []

diff --git a/toysolver.cabal b/toysolver.cabal
@@ -18,6 +18,7 @@ Tested-With:
    GHC ==9.2.8
    GHC ==9.4.8
    GHC ==9.6.6
+   GHC ==9.8.2
 Extra-Source-Files:
    README.md
    INSTALL.md