Merge pull request #433 from tweag/fd/darwin-ci

Support R 4.5

Author: facundominguez

.github/workflows/workflow.yaml

@@ -42,10 +42,14 @@ jobs:
           - ubuntu-latest
         stack_yaml:
           - stack.yaml
-          - stack-lts-19.yaml
-          - stack-lts-20.yaml
           - stack-lts-21.yaml
-          - stack-nightly.yaml
+          - stack-lts-22.yaml
+        exclude:
+          # Exclude macOS with old GHCs. We use a newer GHC to avoid FFI-related errors.
+          - os: macos-latest
+            stack_yaml: stack-lts-21.yaml
+          - os: macos-latest
+            stack_yaml: stack-lts-22.yaml
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

IHaskell/ihaskell-inline-r.cabal

@@ -17,12 +17,12 @@ library
   exposed-modules:     IHaskell.Display.InlineR
   build-depends:       base >=4.7 && <5
                       ,inline-r >=0.6.0.1 && <1.11
-                      ,ihaskell >=0.10.2.2 && <0.12
+                      ,ihaskell >=0.10.2.2 && <0.13
                       ,ihaskell-blaze >=0.3.0.1 && <0.4
                       ,blaze-html >=0.9.1.2 && <0.10
                       ,bytestring >=0.10.12.0 && <0.13
                       ,base64-bytestring >=1.1.0.0 && <1.3
-                      ,template-haskell >=2.16.0.0 && <2.22
+                      ,template-haskell >=2.16.0.0 && <2.23
                       ,temporary >=1.2 && <1.4
   other-extensions:    TemplateHaskell
                        QuasiQuotes

inline-r/cbits/missing_r.c

@@ -75,10 +75,7 @@ static void test_R_interrupts_pending(){ int *a = &R_interrupts_pending; };
 int OBJECT(SEXP x);
 int NAMED(SEXP x);
 int LEVELS(SEXP x);
-int MARK(SEXP x);
 int RDEBUG(SEXP x);
-int RTRACE(SEXP x);
-int RSTEP(SEXP x);
 SEXP ATTRIB(SEXP x);
 void SET_ATTRIB(SEXP, SEXP);
 SEXP Rf_getAttrib(SEXP, SEXP);

inline-r/inline-r.cabal

@@ -104,7 +104,7 @@ library
     aeson >=0.6 && <2.3,
     bytestring >=0.10 && <0.13,
     containers >=0.5 && <0.8,
-    data-default-class >=0.1.2.0 && <0.2,
+    data-default-class >=0.1.2.0 && <0.3,
     deepseq >=1.3 && <1.6,
     exceptions >=0.6 && <1.1,
     heredoc >=0.2 && <0.3,
@@ -114,7 +114,7 @@ library
     process >=1.2 && <1.7,
     reflection >=2 && <2.2,
     setenv >=0.1.1 && <0.2,
-    template-haskell >=2.8 && <2.22,
+    template-haskell >=2.8 && <2.23,
     temporary >=1.2 && <1.4,
     text >=0.11 && <2.2,
     vector >=0.10 && <0.14,
@@ -124,7 +124,7 @@ library
   else
     build-depends:
       singletons >=3 && <3.1,
-      singletons-th >=3 && <3.4,
+      singletons-th >=3 && <3.5,
   hs-source-dirs: src
   includes: cbits/missing_r.h
   c-sources: cbits/missing_r.c
@@ -161,7 +161,7 @@ test-suite tests
     tasty >=0.11 && <1.6,
     tasty-expected-failure >=0.11 && <0.13,
     tasty-hunit >=0.4.1 && <0.11,
-    tasty-quickcheck >=0.4.1 && <0.11,
+    tasty-quickcheck >=0.4.1 && <0.12,
     temporary >=1.2 && <1.4,
     vector >=0.12.3.1 && <0.14,
   if !os(windows)
@@ -198,7 +198,7 @@ test-suite test-shootout
     process >=1.2 && <1.7,
     silently >=1.2 && <1.3,
     tasty >=0.11 && <1.6,
-    template-haskell >=2.8 && <2.22,
+    template-haskell >=2.8 && <2.23,
   if os(windows)
     buildable: False
 

inline-r/src/Foreign/R/Internal.hs

@@ -2,7 +2,7 @@
 -- Copyright: (C) 2013 Amgen, Inc.
 --
 -- Low-level bindings to core R datatypes and functions which depend on
--- computing offsets of C struct field. We use hsc2hs for this purpose.
+-- computing offsets of C struct field.
 
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
@@ -187,10 +187,7 @@ data SEXPInfo = SEXPInfo
       , infoObj   :: Bool        -- ^ Is this an object with a class attribute.
       , infoNamed :: Int         -- ^ Control copying information.
       , infoGp    :: Int         -- ^ General purpose data.
-      , infoMark  :: Bool        -- ^ Mark object as 'in use' in GC.
       , infoDebug :: Bool        -- ^ Debug marker.
-      , infoTrace :: Bool        -- ^ Trace marker.
-      , infoSpare :: Bool        -- ^ Alignment (not in use).
       } deriving ( Show )
 
 -- | Extract the header from the given 'SEXP'.
@@ -201,22 +198,16 @@ peekInfo ts =
       <*> ((/=0)              <$> cOBJECT s)
       <*> (fromIntegral       <$> cNAMED s)
       <*> (fromIntegral       <$> cLEVELS s)
-      <*> ((/=0)              <$> cMARK s)
       <*> ((/=0)              <$> cRDEBUG s)
-      <*> ((/=0)              <$> cRTRACE s)
-      <*> ((/=0)              <$> cRSTEP s)
   where
     s = unsexp ts
 
 -- These accessors are necessary because hsc2hs cannot determine the offset of
--- C struct bit-fields. https://ghc.haskell.org/trac/ghc/ticket/12149
+-- C struct bit-fields. https://gitlab.haskell.org/ghc/ghc/-/issues/12149
 foreign import ccall unsafe "OBJECT" cOBJECT :: SEXP0 -> IO CInt
 foreign import ccall unsafe "NAMED" cNAMED :: SEXP0 -> IO CInt
 foreign import ccall unsafe "LEVELS" cLEVELS :: SEXP0 -> IO CInt
-foreign import ccall unsafe "MARK" cMARK :: SEXP0 -> IO CInt
 foreign import ccall unsafe "RDEBUG" cRDEBUG :: SEXP0 -> IO CInt
-foreign import ccall unsafe "RTRACE" cRTRACE :: SEXP0 -> IO CInt
-foreign import ccall unsafe "RSTEP" cRSTEP :: SEXP0 -> IO CInt
 
 -------------------------------------------------------------------------------
 -- Attribute header                                                          --

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

@@ -47,10 +47,7 @@ instance ToJSON SEXPInfo where
       , "obj"   .= R.infoObj x
       , "named" .= R.infoNamed x
       , "gp"    .= R.infoGp x
-      , "mark"  .= R.infoMark x
       , "debug" .= R.infoDebug x
-      , "trace" .= R.infoTrace x
-      , "spare" .= R.infoSpare x
       ]
 
 instance ToJSON a => ToJSON (Complex a) where

nixpkgs.nix

@@ -1,7 +1,7 @@
 let
-  # NixOS/Nixpkgs master on 2024-02-01
-  rev = "a6fefb39e18b6ff828c04d59ea26d4988135bb88";
-  sha256 = "sha256-lsnvxt/1KCUgrV8KURXdZXRo+mLUZdc7o5H0MvYFOHQ=";
+  # NixOS/Nixpkgs master on 2025-06-07
+  rev = "3e3afe5174c561dee0df6f2c2b2236990146329f";
+  sha256 = "0dcslr2lwfaclfl4pmbwb3yw27bnvwlqiif394d3d66vyd163dvy";
 in
 import (
   fetchTarball {

shell-lts-19.nix

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