Bump Nix/CI, drop support for GHC 8.10, and add support for GHC 9.4 and 9.6

.github/workflows/workflow.yaml

@@ -1,7 +1,9 @@
 name: Continuous integration
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   build:
@@ -12,18 +14,19 @@ jobs:
         run: |
           choco install -y haskell-stack
           choco install -y r --version 4.0.0
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - name: Get Stack snapshot install directory
         id: stack-snapshot
+        # NOTE: `stack path` must run at least once prior to caching to ensure the directory
+        # exists and is populated.
         run: |
           stack path --snapshot-install-root
-          echo "::set-output name=dir::$(stack path --snapshot-install-root)"
-      - uses: actions/cache@v1
+          "dir=$(stack path --snapshot-install-root)" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.stack-snapshot.outputs.dir }}
-          key: ${{ steps.stack-snapshot.outputs.dir }}-${{ hashFiles('**/*.cabal') }}
-          restore-keys: |
-            ${{ runner.os }}-stack-
+          key: ${{ runner.os }}-stack-${{ hashFiles('**/*.cabal') }}
+          restore-keys: ${{ runner.os }}-stack-
       - name: Build
         run: |
           stack build inline-r H `
@@ -32,32 +35,39 @@ jobs:
   test:
     name: Build & Test - ${{ matrix.os }} - ${{ matrix.stack_yaml }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        stack_yaml: [stack.yaml, stack-lts-18.yaml, stack-lts-19.yaml]
+        os:
+          - macos-latest
+          - ubuntu-latest
+        stack_yaml:
+          - stack.yaml
+          - stack-lts-19.yaml
+          - stack-lts-20.yaml
+          - stack-lts-21.yaml
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: cachix/install-nix-action@v15
-        with:
-          nix_path: nixpkgs=./nixpkgs.nix
+      - uses: actions/checkout@v4
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Install Stack
         run: |
-          nix-env -f. -iA nixpkgs.stack
+          nix-env --file ./nixpkgs.nix --install --attr stack
       - name: Get Stack snapshot install directory
         id: stack-snapshot
+        # NOTE: `stack path` must run at least once prior to caching to ensure the directory
+        # exists and is populated.
+        # NOTE: The renaming of the stack.yaml file is a workaround for
+        # https://github.com/commercialhaskell/stack/issues/5028.
         run: |
-          # XXX Workaround
-          # https://github.com/commercialhaskell/stack/issues/5028.
           [ ${{ matrix.stack_yaml }} = stack.yaml ] || mv ${{ matrix.stack_yaml }} stack.yaml
           stack --nix path --snapshot-install-root
-          echo "::set-output name=dir::$(stack --nix path --snapshot-install-root)"
-      - uses: actions/cache@v2
+          echo "dir=$(stack --nix path --snapshot-install-root)" > "${GITHUB_OUTPUT}"
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.stack-snapshot.outputs.dir }}
-          key: ${{ steps.stack-snapshot.outputs.dir }}-${{ hashFiles('**/*.cabal') }}
-          restore-keys: |
-            ${{ steps.stack-snapshot.outputs.dir }}
+          key: ${{ runner.os }}-stack-${{ hashFiles('**/*.cabal') }}
+          restore-keys: ${{ runner.os }}-stack-
       - name: Build
         run: |
           stack --nix build
@@ -69,6 +79,6 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         run: |
           stack --nix install
-          export PATH=~/.local/bin:$PATH
+          export PATH="$HOME/.local/bin:$PATH"
           stack --nix exec -- ihaskell install
           stack --nix exec -- jupyter nbconvert --to notebook --execute --inplace ./IHaskell/examples/tutorial-ihaskell-inline-r.ipynb

inline-r/src/Language/R/HExp.hs

@@ -336,12 +336,12 @@ peekHExp s = do
                   <*> (coerceAnySome <$> R.cdr su)
       R.Special   -> coerce $ return Special
       R.Builtin   -> coerce $ return Builtin
-      R.Char      -> unsafeCoerce $ Char    (Vector.unsafeFromSEXP su)
-      R.Logical   -> unsafeCoerce $ Logical (Vector.unsafeFromSEXP su)
-      R.Int       -> unsafeCoerce $ Int     (Vector.unsafeFromSEXP su)
-      R.Real      -> unsafeCoerce $ Real    (Vector.unsafeFromSEXP su)
-      R.Complex   -> unsafeCoerce $ Complex (Vector.unsafeFromSEXP su)
-      R.String    -> unsafeCoerce $ String  (Vector.unsafeFromSEXP su)
+      R.Char      -> coerce $ return $ Char    (Vector.unsafeFromSEXP su)
+      R.Logical   -> coerce $ return $ Logical (Vector.unsafeFromSEXP su)
+      R.Int       -> coerce $ return $ Int     (Vector.unsafeFromSEXP su)
+      R.Real      -> coerce $ return $ Real    (Vector.unsafeFromSEXP su)
+      R.Complex   -> coerce $ return $ Complex (Vector.unsafeFromSEXP su)
+      R.String    -> coerce $ return $ String  (Vector.unsafeFromSEXP su)
       R.DotDotDot -> unimplemented $ "peekHExp: " ++ show (R.typeOf s)
       R.Vector    -> coerce $
         Vector    <$> (fromIntegral <$> R.trueLength (coerceAny su))
@@ -363,7 +363,7 @@ peekHExp s = do
                        peekElemOff (castPtr $ R.unsafeSEXPToVectorPtr s) 2)
                   <*> (coerceAny <$> R.sexp <$>
                        peekElemOff (castPtr $ R.unsafeSEXPToVectorPtr s) 3)
-      R.Raw       -> unsafeCoerce $ Raw (Vector.unsafeFromSEXP su)
+      R.Raw       -> coerce $ return $ Raw (Vector.unsafeFromSEXP su)
       R.S4        -> coerce $
         S4        <$> (coerceAnySome <$> R.tag su)
       _           -> unimplemented $ "peekHExp: " ++ show (R.typeOf s)

inline-r/tests/Test/Event.hs

@@ -82,7 +82,11 @@ tests = testGroup "events"
       withSystemTempFile "inline-r-" $ \path h -> do
         hPutStrLn h "hello"
         hClose h
+#if MIN_VERSION_unix(2,8,0)
+        fd <- openFd path ReadOnly defaultFileFlags{ nonBlock = True }
+#else
         fd <- openFd path ReadOnly Nothing defaultFileFlags{ nonBlock = True }
+#endif
         action fd
         closeFd fd
 #endif

nixpkgs.nix

@@ -1,9 +1,11 @@
 let
-  # NixOS/Nixpkgs master 2022-11-27
-  rev = "a115bb9bd56831941be3776c8a94005867f316a7";
-  sha256 = "1501jzl4661qwr45b9ip7c7bpmbl94816draybhh60s9wgxn068d";
+  # NixOS/Nixpkgs master on 2024-02-01
+  rev = "a6fefb39e18b6ff828c04d59ea26d4988135bb88";
+  sha256 = "sha256-lsnvxt/1KCUgrV8KURXdZXRo+mLUZdc7o5H0MvYFOHQ=";
 in
-import (fetchTarball {
-  inherit sha256;
-  url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
-})
+import (
+  fetchTarball {
+    inherit sha256;
+    url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+  }
+)

shell-lts-19.nix

@@ -0,0 +1 @@
+builtins.import ./shell.nix { ghcAttr = "ghc90"; }

shell-lts-20.nix

@@ -0,0 +1 @@
+builtins.import ./shell.nix { ghcAttr = "ghc92"; }

shell-lts-21.nix

@@ -0,0 +1 @@
+builtins.import ./shell.nix { ghcAttr = "ghc94"; }

shell.nix

@@ -1,43 +1,137 @@
-{ pkgs ? import ./nixpkgs.nix { }, ghc ? pkgs.haskell.compiler.ghc8107 }:
+{
+  pkgs ? import ./nixpkgs.nix { },
+  ghcAttr ? "ghc96",
+  RVersion ? "4.2.3",
+}:
+let
+  inherit (pkgs)
+    cabal-install
+    fetchpatch
+    fetchurl
+    haskell
+    python3
+    rPackages
+    rWrapper
+    stdenv
+    zeromq
+    zlib
+    ;
 
-with pkgs;
+  inherit (pkgs.lib) lists strings versions;
 
-let
-  # Uncomment the line below to build HaskellR against a version of R with
+  # Set enableStrictBarrier to true to build HaskellR against a version of R with
   # the --enable-strict-barrier configure flag enabled for better memory
   # diagnostics.
+  R = (pkgs.R.override { enableStrictBarrier = false; }).overrideAttrs (
+    # Pin R to a specific version to avoid breaking changes in the R API.
+    finalAttrs: prevAttrs: {
+      version = RVersion;
+      src = fetchurl {
+        url = "https://cran.r-project.org/src/base/R-${versions.major finalAttrs.version}/R-${finalAttrs.version}.tar.gz";
+        hash = builtins.getAttr RVersion {
+          "4.0.0" = "sha256-Br6wKRtWmXhITrDctdIzlmXsdFc3vftOhz56WnVJKUA=";
+          "4.0.1" = "sha256-lf4kpNjY+PiIRgyPX+QxHOxlbnoXItIzIYvAOGG8bzI=";
+          "4.0.2" = "sha256-07zqs2TaCHZiXkCXgItCUSOV/fQSkvSRWrH9JXwbvnU=";
+          "4.0.3" = "sha256-CZg6injV+2vEXSexxV+bpSZfePpUpVwTrmkfh8W7ng0=";
+          "4.0.4" = "sha256-Uj8n1pdEoIyPC9Xh5sPYmk2yntmDOIunCWOjzTpKgC4=";
+          "4.0.5" = "sha256-Cj7geap3LhMf5UNTEatif8vMtaUMq8VCkub2IEbx/+8=";
+          "4.1.0" = "sha256-6OaJWdcoLKFHNg/JZEram9FhureBurFNM7iZmpUYJ4E=";
+          "4.1.1" = "sha256-UV4DJldSJX0LcDbzgPguQrRu2Ec/VPJce2ftJbu902Q=";
+          "4.1.2" = "sha256-IDYiXp9yB9TOCX5Ulyrs2qi0DX2ZEc0mSR+sWg+rOK8=";
+          "4.1.3" = "sha256-Ff9bMzxhCUBgsqUunB2OxVzELdAp45yiKr2qkJUm/tY=";
+          "4.2.0" = "sha256-OOq3cZt60JU4jwaqCQxaKyAnkZRd5g0+K7DqsfUJdIg=";
+          "4.2.1" = "sha256-TVLbSG0nhI5UYT1O6XetlS7AjOF4B+G1JbEM1ENsZD8=";
+          "4.2.2" = "sha256-D/YrQuxRr6VxPK7nxP3noMRZQLo5vvjFyUh/7wyVPfU=";
+          "4.2.3" = "sha256-VeSpptQ74xTiwD0CZqb6VESv3OULMDv8O4Kzl5UW4HQ=";
+          "4.3.0" = "sha256-RdzEi2zyfTYQIPd/3ho5IJ6Ze4FAKzZjyhwBAFampgk=";
+          "4.3.1" = "sha256-jdC/JPECPG9hjDsxc4PSkbSklPQNc7mDrCL/6pnkupk=";
+          "4.3.2" = "sha256-s/V2CsLu6AJqPw7vyyW0dyPZeAOO7o6ER2IJTIYMRSo=";
+        };
+      };
 
-  # R = pkgs.R.override { enableStrictBarrier = true; };
-
-  # XXX Workaround https://ghc.haskell.org/trac/ghc/ticket/11042.
-  libHack =
-    if stdenv.isDarwin
-    then { DYLD_LIBRARY_PATH = [ "${R}/lib/R/lib" ]; }
-    else { LD_LIBRARY_PATH = [ "${R}/lib/R" ]; }
-  ;
+      patches =
+        prevAttrs.patches or [ ]
+        # R: 4.0.4 -> 4.1.0
+        # See https://github.com/NixOS/nixpkgs/commit/9a88197fe7825f486052e3a9eca4a68192335978
+        ++
+          lists.optionals
+            (
+              RVersion == "4.1.0"
+              && strings.hasInfix "--without-recommended-packages" (prevAttrs.preConfigure or "")
+            )
+            [
+              (fetchpatch {
+                name = "fix-tests-without-recommended-packages.patch";
+                url = "https://github.com/wch/r-source/commit/7715c67cabe13bb15350cba1a78591bbb76c7bac.patch";
+                # this part of the patch reverts something that was committed after R 4.1.0, so ignore it.
+                excludes = [ "tests/Pkgs/xDir/pkg/DESCRIPTION" ];
+                hash = "sha256-iguLndCIuKuCxVCi/4NSu+9RzBx5JyeHx3K6IhpYshQ=";
+              })
+              (fetchpatch {
+                name = "use-codetools-conditionally.patch";
+                url = "https://github.com/wch/r-source/commit/7543c28b931db386bb254e58995973493f88e30d.patch";
+                hash = "sha256-+yHXB5AItFyQjSxfogxk72DrSDGiBh7OiLYFxou6Xlk=";
+              })
+            ]
+        # R: 4.1.3 -> 4.2.0
+        # See: https://github.com/NixOS/nixpkgs/commit/5eb9f35c44d30153ff1df2105ed73e148a79a3ee
+        ++ lists.optionals (RVersion == "4.2.0" || RVersion == "4.2.1") [
+          (fetchpatch {
+            name = "test-reg-packages.patch";
+            url = "https://raw.githubusercontent.com/NixOS/nixpkgs/5eb9f35c44d30153ff1df2105ed73e148a79a3ee/pkgs/applications/science/math/R/test-reg-packages.patch";
+            hash = "sha256-FUzrenAFvD8GL1/RMG8DRRx+ITcEkDkRGKTVyAhyKqA=";
+          })
+        ];
 
-  python3Env = python3.withPackages (ps: with ps; [
-    ipython
-    jupyter_client
-    notebook
-  ]);
+      postPatch =
+        prevAttrs.postPatch or ""
+        # Nixpkgs ships with curl >= 8.x, which is not compatible with R pre-4.3. However, in the release notes for R
+        # 4.3 (https://stat.ethz.ch/pipermail/r-announce/2023/000691.html), it is mentioned that despite the major
+        # version change for curl, the API is still compatible with the previous version. Therefore, we can patch the
+        # check for curl 7.x. This fixes the following error:
+        #   error: libcurl >= 7.28.0 library and headers are required with support for https
+        # We must patch the ./configure script and the ./m4/R.m4 file to make this work.
+        + strings.optionalString (strings.versionOlder RVersion "4.3.0") ''
+          substituteInPlace \
+            ./configure \
+            ./m4/R.m4 \
+            --replace-fail \
+              "#if LIBCURL_VERSION_MAJOR > 7" \
+              "#if LIBCURL_VERSION_MAJOR < 7" \
+            --replace-fail \
+              "#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28" \
+              "#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28 || LIBCURL_VERSION_MAJOR == 8"
+        '';
+    }
+  );
 
   rEnv = rWrapper.override {
-    packages = with rPackages; [
-      # ggplot2 is required for ./IHaskell/examples/tutorial-ihaskell-inline-r.ipynb
-      ggplot2
-    ];
+    inherit R;
+    # ggplot2 is required for ./IHaskell/examples/tutorial-ihaskell-inline-r.ipynb
+    packages = with rPackages; [ ggplot2 ];
   };
-in
 
-haskell.lib.buildStackProject ({
+  python3Env = python3.withPackages (
+    ps: with ps; [
+      ipython
+      jupyter_client
+      notebook
+    ]
+  );
+in
+haskell.lib.buildStackProject {
   name = "HaskellR";
-  inherit ghc;
+  ghc = pkgs.haskell.compiler.${ghcAttr};
   buildInputs = [
-    zeromq
-    zlib
+    cabal-install
     python3Env
     rEnv
+    zeromq
+    zlib
   ];
   LANG = "en_US.UTF-8";
-} // libHack)
+  # NOTE: Workaround https://ghc.haskell.org/trac/ghc/ticket/11042.
+  ${(strings.optionalString stdenv.isDarwin "DY") + "LD_LIBRARY_PATH"} = [
+    ("${R}/lib/R" + (strings.optionalString stdenv.isDarwin "/lib"))
+  ];
+}

stack-lts-19.yaml

@@ -10,5 +10,5 @@ extra-deps:
 - ihaskell-blaze-0.3.0.1
 
 nix:
-  shell-file: ./shell.nix
+  shell-file: ./shell-lts-19.nix
   path: ["nixpkgs=./nixpkgs.nix"]

stack-lts-18.yaml → stack-lts-20.yaml

@@ -1,4 +1,4 @@
-resolver: lts-18.28
+resolver: lts-20.26
 
 packages:
 - examples
@@ -10,5 +10,5 @@ extra-deps:
 - ihaskell-blaze-0.3.0.1
 
 nix:
-  shell-file: ./shell.nix
+  shell-file: ./shell-lts-20.nix
   path: ["nixpkgs=./nixpkgs.nix"]

stack-lts-18.yaml.lock → stack-lts-20.yaml.lock

@@ -5,15 +5,15 @@
 
 packages:
 - completed:
+    hackage: ihaskell-blaze-0.3.0.1@sha256:57f0e79758d084da3a662d0909ba2b01e469200029fed495fc208ba5f59024fd,2161
     pantry-tree:
       sha256: 69fee7554a6410e45011c89d9e9547d18e2798e4f01ebd0426573b05e0e21696
       size: 223
-    hackage: ihaskell-blaze-0.3.0.1@sha256:57f0e79758d084da3a662d0909ba2b01e469200029fed495fc208ba5f59024fd,2161
   original:
     hackage: ihaskell-blaze-0.3.0.1
 snapshots:
 - completed:
-    sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68
-    size: 590100
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml
-  original: lts-18.28
+    sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
+    size: 650475
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
+  original: lts-20.26

stack-lts-21.yaml

@@ -0,0 +1,17 @@
+resolver: lts-21.25
+
+packages:
+- examples
+- H
+- IHaskell
+- inline-r
+
+extra-deps:
+- ghc-parser-0.2.6.0
+- ihaskell-0.11.0.0
+- ihaskell-blaze-0.3.0.1
+- ipython-kernel-0.11.0.0
+
+nix:
+  shell-file: ./shell-lts-21.nix
+  path: ["nixpkgs=./nixpkgs.nix"]