Merge pull request #1076 from haskell/primitive-0.9

Allow primitive-0.9
haskell · Oct 16, 2023 · 8901f7a · 8901f7a
2 parents 397b989 + 388824a
commit 8901f7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.17.20231004
+# version: 0.17.20231010
 #
-# REGENDATA ("0.17.20231004",["github","cabal.project"])
+# REGENDATA ("0.17.20231010",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -32,9 +32,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.8.0.20230929
+          - compiler: ghc-9.8.1
             compilerKind: ghc
-            compilerVersion: 9.8.0.20230929
+            compilerVersion: 9.8.1
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.6.3
@@ -92,7 +92,6 @@ jobs:
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
-            "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
             "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
             "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           else
@@ -102,7 +101,6 @@ jobs:
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
-            "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
             "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           fi
         env:

diff --git a/aeson.cabal b/aeson.cabal
@@ -1,5 +1,6 @@
 name:               aeson
 version:            2.2.1.0
+x-revision:         1
 license:            BSD3
 license-file:       LICENSE
 category:           Text, Web, JSON
@@ -126,7 +127,7 @@ library
     , integer-logarithms    >=1.0.3.1  && <1.1
     , network-uri           >=2.6.4.1  && <2.7
     , OneTuple              >=0.4.1.1  && <0.5
-    , primitive             >=0.8.0.0  && <0.9
+    , primitive             >=0.8.0.0  && <0.10
     , QuickCheck            >=2.14.3   && <2.15
     , scientific            >=0.3.7.0  && <0.4
     , semialign             >=1.3      && <1.4

diff --git a/attoparsec-aeson/attoparsec-aeson.cabal b/attoparsec-aeson/attoparsec-aeson.cabal
@@ -49,7 +49,7 @@ library
     , base                >=4.10.0.0 && <5
     , bytestring          >=0.10.8.2 && <0.13
     , integer-conversion  >=0.1      && <0.2
-    , primitive           >=0.8.0.0  && <0.9
+    , primitive           >=0.8.0.0  && <0.10
     , scientific          >=0.3.7.0  && <0.4
     , text                >=1.2.3.0  && <1.3  || >=2.0 && <2.2
     , vector              >=0.12.0.1 && <0.14