compatiblity with GHC 9.12 and random-1.3

folivetti · Jan 12, 2025 · 6f70a72 · 6f70a72
1 parent 228f522
commit 6f70a72
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest]
+        os: [macOS-latest]
         ghc:
           - 9.10.1
         cabal: ["3.14.1.1"]
@@ -72,6 +72,9 @@ jobs:
         name: Install dependencies
         run: |
           brew install nlopt
+          whereis libnlopt.so
+          echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}"
+          echo "PKG_CONFIG_PATH=$(brew --prefix)/nlopt/lib/pkgconfig" >> "${GITHUB_ENV}"
 
       - if: matrix.os == 'windows-latest'
         name: Build windows binary
@@ -81,19 +84,19 @@ jobs:
           stack exec -- pacman --noconfirm -S mingw-w64-x86_64-nlopt
           mkdir dist
           stack build srtree:egraphGP --copy-bins --local-bin-path=dist
-        #  cabal install exe:egraphSearch --install-method=copy --overwrite-policy=always --installdir=dist --extra-lib-dirs=nlopt/lib --extra-lib-dirs=nlopt/bin --extra-include-dirs=nlopt/include
-        #  cabal install exe:srtools --install-method=copy --overwrite-policy=always --installdir=dist --extra-lib-dirs=nlopt/lib --extra-lib-dirs=nlopt/bin --extra-include-dirs=nlopt/include
-        #  cabal install exe:rEGGression --install-method=copy --overwrite-policy=always --installdir=dist --extra-lib-dirs=nlopt/lib --extra-lib-dirs=nlopt/bin --extra-include-dirs=nlopt/include
-        #  cabal install exe:srsimplify --install-method=copy --overwrite-policy=always --installdir=dist --extra-lib-dirs=nlopt/lib --extra-lib-dirs=nlopt/bin --extra-include-dirs=nlopt/include
+          stack build srtree:egraphSearch --copy-bins --local-bin-path=dist
+          stack build srtree:srtools --copy-bins --local-bin-path=dist
+          stack build srtree:rEGGression --copy-bins --local-bin-path=dist
+          stack build srtree:srsimplify --copy-bins --local-bin-path=dist
       - if: matrix.os != 'windows-latest'
         name: Build binary
         run: |
           mkdir dist
           cabal install srtree:egraphGP --install-method=copy --overwrite-policy=always --installdir=dist
           cabal install srtree:egraphSearch --install-method=copy --overwrite-policy=always --installdir=dist
-          cabal install exe:srtools --install-method=copy --overwrite-policy=always --installdir=dist
-          cabal install exe:rEGGression --install-method=copy --overwrite-policy=always --installdir=dist
-          cabal install exe:srsimplify --install-method=copy --overwrite-policy=always --installdir=dist
+          cabal install srtree:srtools --install-method=copy --overwrite-policy=always --installdir=dist
+          cabal install srtree:rEGGression --install-method=copy --overwrite-policy=always --installdir=dist
+          cabal install srtree:srsimplify --install-method=copy --overwrite-policy=always --installdir=dist
 
       - if: matrix.os == 'windows-latest'
         name: Set extension to .exe on Windows

diff --git a/srtree.cabal b/srtree.cabal
@@ -57,8 +57,6 @@ library
   hs-source-dirs:
       src
   ghc-options: -fwarn-incomplete-patterns -threaded
-  extra-lib-dirs:
-      /usr/local/lib
   extra-libraries:
       nlopt
   build-depends:

diff --git a/stack.yaml b/stack.yaml
@@ -17,7 +17,8 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-23.1
+#resolver: lts-23.1
+resolver: nightly-2025-01-11
   #resolver: nightly-2023-01-13
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -44,6 +45,7 @@ extra-deps:
   - nlopt-haskell-0.1.3.0@sha256:12f18996ab8933a94b5e9b94b30cb3a4c3a845b32c9173a13407c8cd605c04ec,1592
   - ieee-0.7@sha256:4f444419a7861f04fb64502d14688c80e8293a86a608f6d14c3010c9bd96b6d1,1327
   - table-layout-1.0.0.1
+  - repline-0.4.2.0@sha256:3d863dedf6d840d0578b597bb3b85c95e400c895c67e77a0c286b184d8be51b2,2179
   #  - git: https://github.com/folivetti/intervals.git
   #  commit: 934c6f4b9edf9480aa07c77a9d82634de2e767eb
 

diff --git a/stack.yaml.lock b/stack.yaml.lock
@@ -1,7 +1,7 @@
 # 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
+#   https://docs.haskellstack.org/en/stable/topics/lock_files
 
 packages:
 - completed:
@@ -25,9 +25,16 @@ packages:
       size: 2547
   original:
     hackage: table-layout-1.0.0.1
+- completed:
+    hackage: repline-0.4.2.0@sha256:3d863dedf6d840d0578b597bb3b85c95e400c895c67e77a0c286b184d8be51b2,2179
+    pantry-tree:
+      sha256: 000a079f17a76e103311c262e907d3624c73efcfdeafdd2aabc2d2160e0523cf
+      size: 564
+  original:
+    hackage: repline-0.4.2.0@sha256:3d863dedf6d840d0578b597bb3b85c95e400c895c67e77a0c286b184d8be51b2,2179
 snapshots:
 - completed:
-    sha256: 18514ff1ed00330c922bd8d28d88a54670a9849f17eb07dc78391a94d576749d
-    size: 678854
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/23/1.yaml
-  original: lts-23.1
+    sha256: 776b860cca4e9106b51f401ddbc6d8d95ba417ec326d9c869013fef1086a9a17
+    size: 621385
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/1/11.yaml
+  original: nightly-2025-01-11