landlock, psx: support GHC 9.6.4 / base ^>=4.18

NicolasT · Mar 31, 2024 · 612b16a · 612b16a
1 parent 9fc21aa
commit 612b16a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -29,6 +29,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.6.4
+            compilerKind: ghc
+            compilerVersion: 9.6.4
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.6.1
             compilerKind: ghc
             compilerVersion: 9.6.1

diff --git a/landlock/CHANGELOG.md b/landlock/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Revision history for landlock
 
-## 0.2.1.2 -- YYYY-mm-dd
+## 0.2.2.0 -- YYYY-MM-DD
 
 * Update Cabal file formatting
+* Support GHC 9.6.4 / `base ^>=4.18`
 
 ## 0.2.1.1 -- 2023-02-28
 

diff --git a/landlock/landlock.cabal b/landlock/landlock.cabal
@@ -38,7 +38,7 @@ extra-source-files:
   cbits/linux/landlock.h
 
 tested-with:
-  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1 || ==9.6.4
 
 source-repository head
   type:     git
@@ -77,7 +77,7 @@ library
   import:           common-settings
   exposed-modules:  System.Landlock
   build-depends:
-    , base               >=4.14.2.0 && <4.18
+    , base               >=4.14.2.0 && <4.19
     , exceptions         ^>=0.10.4
     , landlock-internal
     , unix               ^>=2.7.2.2 || ^>=2.8
@@ -100,7 +100,7 @@ library landlock-internal
   include-dirs:       cbits
   c-sources:          cbits/hs-landlock.c
   build-depends:
-    , base        >=4.14.2.0 && <4.18
+    , base        >=4.14.2.0 && <4.19
     , exceptions  ^>=0.10.4
     , psx         ^>=0.1
     , unix        ^>=2.7.2.2 || ^>=2.8
@@ -129,7 +129,7 @@ executable landlocked
   autogen-modules: Paths_landlock
   hs-source-dirs:  bin
   build-depends:
-    , base                  >=4.14.2.0  && <4.18
+    , base                  >=4.14.2.0  && <4.19
     , exceptions            ^>=0.10.4
     , landlock
     , optparse-applicative  ^>=0.16.1.0 || ^>=0.17
@@ -143,7 +143,7 @@ test-suite landlock-test
   other-modules:    ThreadedScenario
   build-depends:
     , async                    ^>=2.2.3
-    , base                     >=4.14.2.0  && <4.18
+    , base                     >=4.14.2.0  && <4.19
     , filepath                 ^>=1.4.2.1
     , landlock
     , landlock-internal
@@ -169,7 +169,7 @@ test-suite landlock-test-threaded
   other-modules:    ThreadedScenario
   build-depends:
     , async        ^>=2.2.3
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , landlock
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3
@@ -184,7 +184,7 @@ test-suite landlock-readme
   other-modules:      ReadmeUtils
   hs-source-dirs:     . test
   build-depends:
-    , base       >=4.14.2.0 && <4.18
+    , base       >=4.14.2.0 && <4.19
     , directory  ^>=1.3.6.0
     , filepath   ^>=1.4.2.1
     , landlock
@@ -204,7 +204,7 @@ test-suite landlocked-test
   hs-source-dirs:     test
   main-is:            landlocked-test.hs
   build-depends:
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , filepath     ^>=1.4.2.1
     , process      ^>=1.6.9.0
     , tasty        ^>=1.4.1

diff --git a/psx/CHANGELOG.md b/psx/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Revision history for psx
 
-## 0.1.1.2 -- YYYY-mm-dd
+## 0.1.2.0 -- YYYY-MM-DD
 
 * Update Cabal file formatting
+* Support GHC 9.6.4 /  `base ^>=4.18`
 
 ## 0.1.1.1 -- 2023-02-28
 

diff --git a/psx/psx.cabal b/psx/psx.cabal
@@ -37,7 +37,7 @@ extra-source-files:
   test/detect-psx.h
 
 tested-with:
-  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1
+  GHC ==8.10.7 || ==9.0.2 || ==9.2.4 || ==9.4.2 || ==9.6.1 || ==9.6.4
 
 source-repository head
   type:     git
@@ -86,7 +86,7 @@ library
   -- restrict compatibility with said GHC version(s).
   exposed-modules:  System.PSX
   hs-source-dirs:   src
-  build-depends:    base >=4.14.2.0 && <4.18
+  build-depends:    base >=4.14.2.0 && <4.19
   include-dirs:     cbits
   install-includes: hs-psx.h
   c-sources:        cbits/hs-psx.c
@@ -110,7 +110,7 @@ test-suite psx-test-threaded
   include-dirs:     test
   build-depends:
     , async        ^>=2.2.3
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , psx
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3
@@ -128,7 +128,7 @@ test-suite psx-test
   include-dirs:     test
   build-depends:
     , async        ^>=2.2.3
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , psx
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3
@@ -143,7 +143,7 @@ test-suite psx-test-no-psx
   c-sources:        test/detect-psx.c
   include-dirs:     test cbits
   build-depends:
-    , base         >=4.14.2.0  && <4.18
+    , base         >=4.14.2.0  && <4.19
     , tasty        ^>=1.4.1
     , tasty-hunit  ^>=0.10.0.3