Merge remote-tracking branch 'upstream/main'

r-hub · Jan 9, 2025 · 454a3af · 454a3af
2 parents 95fe366 + 68aeade
commit 454a3af
Show file tree

Hide file tree

Showing 38 changed files with 381 additions and 74 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE ?= rstudio/r-system-requirements
-VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux9 opensuse155 opensuse156 fedora38 fedora39 fedora40 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge
+VARIANTS ?= focal jammy noble buster bullseye bookworm sid centos7 centos8 rockylinux8 rockylinux9 opensuse155 opensuse156 fedora39 fedora40 fedora41 alpine-3.17 alpine-3.18 alpine-3.19 alpine-3.20 alpine-edge
 
 RULES ?= rules/*.json
 

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ The rules in this catalog support the following operating systems:
 - openSUSE 15.5, 15.6
 - SUSE Linux Enterprise 15 SP5, 15 SP6
 - Debian 10, 11, 12, unstable
-- Fedora 38, 39, 40
+- Fedora 39, 40, 41
 - Windows (for R 4.0+ only)
 
 [^1]: Rocky Linux 8 is specified as `centos8` for backward compatibility.

diff --git a/docker/fedora38/Dockerfile → docker/fedora41/Dockerfile b/docker/fedora38/Dockerfile → docker/fedora41/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:41
 
 RUN dnf upgrade -y -q && \
     dnf install -y glibc-langpack-en

diff --git a/docker/rockylinux8/Dockerfile b/docker/rockylinux8/Dockerfile
@@ -0,0 +1,8 @@
+FROM rockylinux:8
+
+RUN dnf upgrade -y -q && \
+    dnf install -y glibc-langpack-en
+
+# Install jq
+RUN curl -fsSL -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \
+    chmod +x /usr/local/bin/jq
diff --git a/rules/atk.json b/rules/atk.json
@@ -75,13 +75,23 @@
         }
       ]
     },
+    {
+      "packages": ["atkmm2.36-dev"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "alpine",
+          "versions": [ "edge" ]
+        }
+      ]
+    },
     {
       "packages": ["atkmm-dev"],
       "constraints": [
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": [ "3.17", "3.18", "3.19", "3.20", "edge" ]
+          "versions": [ "3.17", "3.18", "3.19", "3.20" ]
         }
       ]
     }

diff --git a/rules/chrome.json b/rules/chrome.json
@@ -50,7 +50,24 @@
       "constraints": [
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["9"]
+        }
+      ]
+    },
+    {
+      "pre_install": [
+        { "command": "dnf install -y dnf-plugins-core" },
+        { "command": "dnf config-manager --set-enabled powertools" },
+        { "command": "dnf install -y epel-release" }
+      ],
+      "packages": ["chromium"],
+      "post_install": [],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },

diff --git a/rules/eigen.json b/rules/eigen.json
@@ -72,6 +72,11 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
+        },
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },

diff --git a/rules/gdal.json b/rules/gdal.json
@@ -108,6 +108,11 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
+        },
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },
@@ -139,7 +144,8 @@
       "constraints": [
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["9"]
         }
       ]
     },

diff --git a/rules/glpk.json b/rules/glpk.json
@@ -58,17 +58,7 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
-        }
-      ]
-    },
-    {
-      "packages": ["glpk-devel"],
-      "pre_install": [
-        { "command": "dnf install -y dnf-plugins-core" },
-        { "command": "dnf config-manager --set-enabled crb" },
-        { "command": "dnf install -y epel-release" }
-      ],
-      "constraints": [
+        },
         {
           "os": "linux",
           "distribution": "rockylinux"

diff --git a/rules/gpgme.json b/rules/gpgme.json
@@ -39,6 +39,11 @@
             "os": "linux",
             "distribution": "centos",
             "versions": ["8"]
+          },
+          {
+            "os": "linux",
+            "distribution": "rockylinux",
+            "versions": ["8"]
           }
         ]
       },
@@ -51,7 +56,8 @@
         "constraints": [
           {
             "os": "linux",
-            "distribution": "rockylinux"
+            "distribution": "rockylinux",
+            "versions": ["9"]
           }
         ]
       },

diff --git a/rules/gsl.json b/rules/gsl.json
@@ -29,19 +29,11 @@
           "os": "linux",
           "distribution": "redhat",
           "versions": ["7", "8"]
-        }
-      ]
-    },
-    {
-      "packages": ["gsl-devel"],
-      "pre_install": [
-        { "command": "dnf install -y dnf-plugins-core" },
-        { "command": "dnf config-manager --set-enabled crb" }
-      ],
-      "constraints": [
+        },
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["8","9"]
         }
       ]
     },

diff --git a/rules/leptonica.json b/rules/leptonica.json
@@ -40,6 +40,11 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
+        },
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },
@@ -52,7 +57,8 @@
       "constraints": [
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["9"]
         }
       ]
     },

diff --git a/rules/libarchive.json b/rules/libarchive.json
@@ -39,6 +39,11 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
+        },
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },
@@ -51,7 +56,8 @@
       "constraints": [
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["9"]
         }
       ]
     },
@@ -65,6 +71,19 @@
         }
       ]
     },
+    {
+      "packages": ["libarchive-devel"],
+      "pre_install": [
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" }
+      ],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "redhat",
+          "versions": ["8"]
+        }
+      ]
+    },
     {
       "packages": ["libarchive-devel"],
       "pre_install": [

diff --git a/rules/libavfilter.json b/rules/libavfilter.json
@@ -33,7 +33,8 @@
       "constraints": [
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["9"]
         }
       ]
     },

diff --git a/rules/libbz2.json b/rules/libbz2.json
@@ -0,0 +1,61 @@
+{
+    "patterns": ["\\blibbz2\\b"],
+    "dependencies": [
+      {
+        "packages": ["libbz2-dev"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "ubuntu"
+          },
+          {
+            "os": "linux",
+            "distribution": "debian"
+          }
+        ]
+      },
+      {
+        "packages": ["bzip2-devel"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "centos"
+          },
+          {
+            "os": "linux",
+            "distribution": "rockylinux"
+          },
+          {
+            "os": "linux",
+            "distribution": "redhat"
+          },
+          {
+            "os": "linux",
+            "distribution": "fedora"
+          }
+        ]
+      },
+      {
+        "packages": ["libbz2-devel"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "opensuse"
+          },
+          {
+            "os": "linux",
+            "distribution": "sle"
+          }
+        ]
+      },
+      {
+        "packages": ["bzip2-dev"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "alpine"
+          }
+        ]
+      }
+    ]
+  }
diff --git a/rules/libjq.json b/rules/libjq.json
@@ -38,7 +38,22 @@
       "constraints": [
         {
           "os": "linux",
-          "distribution": "rockylinux"
+          "distribution": "rockylinux",
+          "versions": ["9"]
+        }
+      ]
+    },
+    {
+      "packages": ["jq-devel"],
+      "pre_install": [
+        { "command": "dnf install -y dnf-plugins-core" },
+        { "command": "dnf config-manager --set-enabled powertools" }
+      ],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "rockylinux",
+          "versions": ["8"]
         }
       ]
     },
@@ -59,6 +74,19 @@
         }
       ]
     },
+    {
+      "packages": ["jq-devel"],
+      "pre_install": [
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" }
+      ],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "redhat",
+          "versions": ["8"]
+        }
+      ]
+    },
     {
       "packages": ["jq-devel"],
       "pre_install": [