haskell-hvr · andreasabel · Mar 2, 2025 · Mar 2, 2025
diff --git a/.github/workflows/ci-mac-win.yml b/.github/workflows/ci-mac-win.yml
@@ -21,15 +21,14 @@ jobs:
       fail-fast: false
       matrix:
         os:    [windows-latest, macos-latest]
-        ghc:   ['9.8', '9.6', '9.4']
+        ghc:   ['9.10', '9.8', '9.6', '9.4']
           # Minor versions are determined by setup-haskell.
           # Use quotes so that the version numbers are not interpreted as floats.
         include:
         - os: macos-13
-          ghc: '7.10'
+          ghc: '8.0'
         - os: windows-latest
           ghc: '8.4'
-          # 2022-05-26: GHC 7.10.3 is broken on Windows (Chocolatey)
           # 2023-02-10: GHCs 8.0 and 8.2 fail to build hsc2hs-0.68.10 on Windows
           #   see https://github.com/haskell/hsc2hs/issues/81
 

diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -6,11 +6,11 @@
 #
 #   haskell-ci regenerate
 #
-# For more information, see https://github.com/andreasabel/haskell-ci
+# For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240703
+# version: 0.19.20250216
 #
-# REGENDATA ("0.19.20240703",["github","MissingH.cabal"])
+# REGENDATA ("0.19.20250216",["github","MissingH.cabal"])
 #
 name: Haskell-CI
 on:
@@ -23,7 +23,7 @@ on:
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     timeout-minutes:
       60
     container:
@@ -32,14 +32,19 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.12.1
+            compilerKind: ghc
+            compilerVersion: 9.12.1
+            setup-method: ghcup
+            allow-failure: false
           - compiler: ghc-9.10.1
             compilerKind: ghc
             compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.8.2
+          - compiler: ghc-9.8.4
             compilerKind: ghc
-            compilerVersion: 9.8.2
+            compilerVersion: 9.8.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.6.6
@@ -94,15 +99,29 @@ jobs:
             allow-failure: false
       fail-fast: false
     steps:
-      - name: apt
+      - name: apt-get install
         run: |
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+      - name: Install GHCup
+        run: |
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
-          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+      - name: Install cabal-install
+        run: |
           "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (GHCup)
+        if: matrix.setup-method == 'ghcup'
+        run: |
+          "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -113,21 +132,12 @@ jobs:
           echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
           echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
-          HCDIR=/opt/$HCKIND/$HCVER
-          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
-          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
-          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
-          echo "HC=$HC" >> "$GITHUB_ENV"
-          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
           echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
-          echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -243,8 +253,8 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v4
         if: always()
+        uses: actions/cache/save@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,11 @@
+# 1.6.0.2
+
+_Andreas Abel, 2025-03-02_
+
+- Drop support for GHC 7.10
+- Allow `containers < 1`
+- Tested with GHC 8.0 - 9.12.1
+
 # 1.6.0.1
 
 _Andreas Abel, 2023-09-11_

diff --git a/MissingH.cabal b/MissingH.cabal
@@ -1,7 +1,6 @@
-cabal-version: 1.12
+cabal-version: 1.24
 name: MissingH
-version: 1.6.0.1
-x-revision: 3
+version: 1.6.0.2
 
 build-type: Simple
 license: BSD3
@@ -11,8 +10,9 @@ maintainer: Andreas Abel
 license-file: LICENSE
 
 tested-with:
+  GHC == 9.12.1
   GHC == 9.10.1
-  GHC == 9.8.2
+  GHC == 9.8.4
   GHC == 9.6.6
   GHC == 9.4.8
   GHC == 9.2.8
@@ -32,20 +32,22 @@ description:
 category: Unclassified
 bug-reports: https://github.com/haskell-hvr/missingh/issues
 
-extra-source-files:
+extra-doc-files:
   CHANGES.md
   LICENSE
   announcements/0.10.0.txt
   announcements/0.8.0.txt
   announcements/0.9.0.txt
+  3rd-party-licenses/BSD
+  3rd-party-licenses/LGPL-2.1
+
+extra-source-files:
   testsrc/gzfiles/empty.gz
   testsrc/gzfiles/t1.gz
   testsrc/gzfiles/t1bad.gz
   testsrc/gzfiles/t2.gz
   testsrc/gzfiles/zeros.gz
   testsrc/mime.types.test
-  3rd-party-licenses/BSD
-  3rd-party-licenses/LGPL-2.1
   examples/simplegrep.hs
   examples/test2.hs
   examples/test3.hs
@@ -126,8 +128,8 @@ library
 
   build-depends:
       array               >= 0.4.0.0 && < 0.6
-    , base                >= 4.8.0.0 && < 5
-    , containers          >= 0.4.2.1 && < 0.8
+    , base                >= 4.9     && < 5
+    , containers          >= 0.4.2.1 && < 1
     , directory           >= 1.1.0.2 && < 1.4
     , filepath            >= 1.3.0.0 && < 1.6
     , hslogger            >= 1.3.0.0 && < 1.4
@@ -145,12 +147,12 @@ library
   else
     build-depends: network >= 2.6.3.1 && <2.9
 
-  If !os(windows)
-    Build-Depends: unix   >= 2.5.1.0 && < 2.9
+  if !os(windows)
+    build-depends: unix   >= 2.5.1.0 && < 2.9
 
-  ghc-options:     -Wall
-  if impl(ghc >= 8)
-    ghc-options:   -Wcompat
+  ghc-options:
+      -Wall
+      -Wcompat
 
 ----------------------------------------------------------------------------
 
@@ -206,5 +208,6 @@ test-suite runtests
   build-depends:
       HUnit                  == 1.6.*
 
-  if impl(ghc >= 8)
-    ghc-options:   -Wcompat
+  ghc-options:
+      -Wall
+      -Wcompat