Support GHC 9.8, drop GHC 9.2

GaloisInc · Feb 28, 2024 · 61306f7 · 61306f7
1 parent e21bc36
commit 61306f7
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ubuntu-22.04]
         # See doc/developing.md
-        ghc: ["9.2.8", "9.4.5", "9.6.2"]
+        ghc: ["9.4.5", "9.6.2", "9.8.1"]
     name: build - ${{ matrix.ghc }} - ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/nix-ci.yml b/.github/workflows/nix-ci.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc-version: [ "ghc96", "ghc94", "ghc92", "ghc810", "ghc88" ]
+        ghc-version: [ "ghc98", "ghc96", "ghc94" ]
     steps:
       - uses: cachix/install-nix-action@v20
         with:

diff --git a/README.md b/README.md
@@ -59,9 +59,9 @@ llvm-pretty-bc-parser endeavors to support three versions of GHC at a time. See
 the developers' documentation for more details and a rationale:
 [doc/developing.md](./doc/developing.md). Currently supported:
 
-- GHC 9.2.8
 - GHC 9.4.5
 - GHC 9.6.2
+- GHC 9.8.1
 
 [fuzz-workflow]: https://github.com/GaloisInc/llvm-pretty-bc-parser/blob/master/.github/workflows/llvm-quick-fuzz.yml
 [llvm13]: https://github.com/GaloisInc/llvm-pretty-bc-parser/issues?q=is%3Aopen+is%3Aissue+label%3Allvm%2F13.0

diff --git a/doc/developing.md b/doc/developing.md
@@ -96,4 +96,5 @@ When updating the supported GHC versions, remember to update:
 
 - [The README](../README.md)
 - [The Cabal file](../llvm-pretty-bc-parser.cabal)'s `Tested-with` field
+- [The Nix flake](../flake.nix)
 - [CI workflows](../.github/workflows)
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,8 @@
   nixConfig.bash-prompt-suffix = "llvm-pretty-bc-parser.env} ";
 
   inputs = {
-    nixpkgs = { url = "github:nixos/nixpkgs/23.05"; };
+    nixpkgs-ghc8 = { url = "github:nixos/nixpkgs/23.05"; };
+    nixpkgs = { url = "github:nixos/nixpkgs/nixpkgs-unstable"; };
     levers = {
       url = "github:kquick/nix-levers";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -20,7 +21,7 @@
       flake = false;
     };
     fgl-src = {
-      url = "github:haskell/fgl/5.8.1.1";
+      url = "https://hackage.haskell.org/package/fgl-5.8.2.0/fgl-5.8.2.0.tar.gz";
       flake = false;
     };
     fgl-visualize-src = {
@@ -48,7 +49,7 @@
     };
   };
 
-  outputs = { self, levers, nixpkgs
+  outputs = { self, levers, nixpkgs, nixpkgs-ghc8
             , llvm-pretty-src
             , fgl-src
             , fgl-visualize-src
@@ -96,10 +97,18 @@
 
       packages = levers.eachSystem (system:
         let
-          mkHaskell = levers.mkHaskellPkg {
+          mkHaskellGhc9 = levers.mkHaskellPkg {
             inherit nixpkgs system;
             };
-          pkgs = import nixpkgs { inherit system; };
+          mkHaskellGhc8 = levers.mkHaskellPkg {
+            inherit system;
+            nixpkgs = nixpkgs-ghc8;
+            };
+          mkHaskell = name: src: ovrDrvOrArgs:
+            let blds8 = mkHaskellGhc8 name src ovrDrvOrArgs;
+                blds9 = mkHaskellGhc9 name src ovrDrvOrArgs;
+            in (blds8 // blds9);
+          pkgs = import nixpkgs-ghc8 { inherit system; };
           wrap = levers.pkg_wrapper system pkgs;
           haskellAdj = drv:
             with (pkgs.haskell).lib;

diff --git a/llvm-pretty-bc-parser.cabal b/llvm-pretty-bc-parser.cabal
@@ -10,7 +10,7 @@ Maintainer:          Ryan Scott <[email protected]>
 Category:            Text
 Build-type:          Simple
 Synopsis:            LLVM bitcode parsing library
-Tested-with:         GHC==8.8, GHC==8.10, GHC==9.2, GHC==9.4, GHC==9.6
+Tested-with:         GHC==9.4, GHC==9.6, GHC==9.8
 
 Description:
   A parser for the LLVM bitcode file format, yielding a Module from the