Merge remote-tracking branch 'upstream/main'

r-hub · Sep 10, 2024 · cab2105 · cab2105
2 parents e522fa0 + 1f43c93
commit cab2105
Show file tree

Hide file tree

Showing 20 changed files with 204 additions and 28 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 fedora38 fedora39 fedora40 alpine-3.16 alpine-3.17 alpine-3.18 alpine-3.19 alpine-edge
+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
 
 RULES ?= rules/*.json
 

diff --git a/README.md b/README.md
@@ -91,8 +91,8 @@ The rules in this catalog support the following operating systems:
 - CentOS 7
 - Rocky Linux 8*, 9
 - Red Hat Enterprise Linux 7, 8, 9
-- openSUSE 15.5
-- SUSE Linux Enterprise 15 SP5
+- openSUSE 15.5, 15.6
+- SUSE Linux Enterprise 15 SP5, 15 SP6
 - Debian 10, 11, 12, unstable
 - Fedora 38, 39, 40
 - Windows (for R 4.0+ only)

diff --git a/docker/alpine-3.16/Dockerfile → docker/alpine-3.20/Dockerfile b/docker/alpine-3.16/Dockerfile → docker/alpine-3.20/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.20
 
 RUN apk update && \
     apk add curl bash

diff --git a/docker/opensuse156/Dockerfile b/docker/opensuse156/Dockerfile
@@ -0,0 +1,11 @@
+FROM opensuse/leap:15.6
+
+# Use mirrorcache as openSUSE 15.6 mirrors seem particularly unreliable
+RUN sed -i 's|http://download.opensuse.org|https://mirrorcache.opensuse.org|g' /etc/zypp/repos.d/*.repo
+
+RUN zypper --quiet --non-interactive update && \
+    zypper --non-interactive install curl
+
+# Install jq
+RUN curl -fsSL -o /usr/local/bin/jq https://github.com/stedolan/jq/releases/download/jq-1.7/jq-linux64 && \
+    chmod +x /usr/local/bin/jq
diff --git a/rules/atk.json b/rules/atk.json
@@ -35,16 +35,33 @@
         }
       ]
     },
+    {
+      "packages": ["libatk-1_0-0"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "opensuse",
+          "versions": ["15.6"]
+        },
+        {
+          "os": "linux",
+          "distribution": "sle",
+          "versions": ["15.6"]
+        }
+      ]
+    },
     {
       "packages": ["atk-devel"],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "opensuse"
+          "distribution": "opensuse",
+          "versions": ["15.3", "15.4", "15.5"]
         },
         {
           "os": "linux",
-          "distribution": "sle"
+          "distribution": "sle",
+          "versions": ["15.3", "15.4", "15.5"]
         }
       ]
     },
@@ -64,7 +81,7 @@
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": [ "3.17", "3.18", "3.19", "edge" ]
+          "versions": [ "3.17", "3.18", "3.19", "3.20", "edge" ]
         }
       ]
     }

diff --git a/rules/blender.json b/rules/blender.json
@@ -43,7 +43,7 @@
           {
             "os": "linux",
             "distribution": "alpine",
-            "versions": [ "3.16", "3.17", "3.18", "3.19", "edge" ]
+            "versions": [ "3.16", "3.17", "3.18", "3.19", "3.20", "edge" ]
           }
         ]
       }

diff --git a/rules/eigen.json b/rules/eigen.json
@@ -35,15 +35,25 @@
       "packages": ["eigen3-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "yum install -y epel-release"
         }
       ],
       "constraints": [
         {
           "os": "linux",
           "distribution": "centos",
           "versions": ["7"]
-        },
+        }
+      ]
+    },
+    {
+      "packages": ["eigen3-devel"],
+      "pre_install": [
+        {
+          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+        }
+      ],
+      "constraints": [
         {
           "os": "linux",
           "distribution": "redhat",

diff --git a/rules/java.json b/rules/java.json
@@ -90,12 +90,12 @@
         {
           "os": "linux",
           "distribution": "opensuse",
-          "versions": ["15.4", "15.5"]
+          "versions": ["15.4", "15.5", "15.6"]
         },
         {
           "os": "linux",
           "distribution": "sle",
-          "versions": ["15.4", "15.5"]
+          "versions": ["15.4", "15.5", "15.6"]
         }
       ]
     },

diff --git a/rules/libgit2.json b/rules/libgit2.json
@@ -149,7 +149,7 @@
         {
           "os": "linux",
           "distribution": "sle",
-          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
+          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5", "15.6"]
         }
       ]
     },

diff --git a/rules/libicu.json b/rules/libicu.json
@@ -75,6 +75,21 @@
         }
       ]
     },
+    {
+      "packages": ["libicu73_2-devel"],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "opensuse",
+          "versions": ["15.6"]
+        },
+        {
+          "os": "linux",
+          "distribution": "sle",
+          "versions": ["15.6"]
+        }
+      ]
+    },
     {
       "packages": [
         "mingw-w64-x86_64-icu",

diff --git a/rules/libmysqlclient.json b/rules/libmysqlclient.json
@@ -100,12 +100,12 @@
         {
           "os": "linux",
           "distribution": "opensuse",
-          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
+          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5", "15.6"]
         },
         {
           "os": "linux",
           "distribution": "sle",
-          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
+          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5", "15.6"]
         }
       ]
     },

diff --git a/rules/libzstd.json b/rules/libzstd.json
@@ -0,0 +1,83 @@
+{
+    "patterns": ["\\blibzstd\\b"],
+    "dependencies": [
+      {
+        "packages": ["libzstd-dev"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "ubuntu"
+          },
+          {
+            "os": "linux",
+            "distribution": "debian"
+          }
+        ]
+      },
+      {
+        "pre_install": [
+          {
+            "command": "rpm -q epel-release || yum install -y epel-release"
+          }
+        ],
+        "packages": [ "libzstd-devel" ],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "centos",
+            "versions": [ "7"]
+          }
+        ]
+      },
+      {
+        "packages": ["libzstd-devel"],
+        "pre_install": [
+          {
+            "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          }
+        ],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "redhat",
+            "versions": ["7"]
+          }
+        ]
+      },
+      {
+        "packages": ["libzstd-devel"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "rockylinux"
+          },
+          {
+            "os": "linux",
+            "distribution": "redhat",
+	    "versions": [ "8", "9" ]
+          },
+          {
+            "os": "linux",
+            "distribution": "fedora"
+          },
+          {
+            "os": "linux",
+            "distribution": "opensuse"
+          },
+          {
+            "os": "linux",
+            "distribution": "sle"
+          }
+        ]
+      },
+      {
+        "packages": ["zstd-dev"],
+        "constraints": [
+          {
+            "os": "linux",
+            "distribution": "alpine"
+          }
+        ]
+      }
+    ]
+}
diff --git a/rules/openbabel.json b/rules/openbabel.json
@@ -35,15 +35,25 @@
       "packages": ["openbabel-devel"],
       "pre_install": [
         {
-          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+          "command": "yum install -y epel-release"
         }
       ],
       "constraints": [
         {
           "os": "linux",
           "distribution": "centos",
           "versions": ["7"]
-        },
+        }
+      ]
+    },
+    {
+      "packages": ["openbabel-devel"],
+      "pre_install": [
+        {
+          "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+        }
+      ],
+      "constraints": [
         {
           "os": "linux",
           "distribution": "redhat",

diff --git a/rules/opencl.json b/rules/opencl.json
@@ -111,7 +111,7 @@
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": [ "3.16", "3.17", "3.18", "3.19", "edge" ]
+          "versions": [ "3.16", "3.17", "3.18", "3.19", "3.20", "edge" ]
         }
       ]
     }

diff --git a/rules/proj.json b/rules/proj.json
@@ -131,7 +131,7 @@
         {
           "os": "linux",
           "distribution": "opensuse",
-          "versions": ["15.2", "15.3", "15.4", "15.5"]
+          "versions": ["15.2", "15.3", "15.4", "15.5", "15.6"]
         }
       ]
     },

diff --git a/rules/protobuf-grpc.json b/rules/protobuf-grpc.json
@@ -70,7 +70,7 @@
         {
           "os": "linux",
           "distribution": "alpine",
-          "versions": ["3.17", "3.18", "3.19", "edge"]
+          "versions": ["3.17", "3.18", "3.19", "3.20", "edge"]
         }
       ]
     },

diff --git a/rules/sdl2.json b/rules/sdl2.json
@@ -86,14 +86,37 @@
         }
       ]
     },
+    {
+      "packages": [
+        "SDL2-devel"
+      ],
+      "constraints": [
+        {
+          "os": "linux",
+          "distribution": "opensuse",
+          "versions": ["15.6"]
+        },
+        {
+          "os": "linux",
+          "distribution": "sle",
+          "versions": ["15.6"]
+        }
+      ]
+    },
     {
       "packages": [
         "libSDL2-devel"
       ],
       "constraints": [
         {
           "os": "linux",
-          "distribution": "opensuse"
+          "distribution": "opensuse",
+          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
+        },
+        {
+          "os": "linux",
+          "distribution": "sle",
+          "versions": ["15.0", "15.2", "15.3", "15.4", "15.5"]
         }
       ]
     },

diff --git a/schema.json b/schema.json
@@ -180,7 +180,8 @@
           "15.2",
           "15.3",
           "15.4",
-          "15.5"
+          "15.5",
+          "15.6"
         ]
       },
       "sle": {
@@ -190,7 +191,8 @@
           "15.2",
           "15.3",
           "15.4",
-          "15.5"
+          "15.5",
+          "15.6"
         ]
       },
       "fedora": {
@@ -209,6 +211,7 @@
           "3.17",
           "3.18",
           "3.19",
+          "3.20",
           "edge"
         ]
       },
-Original file line number
+Diff line change
@@ Expand Up / @@ -180,7 +180,8 @@ @@
               "15.2",
               "15.3",
               "15.4",
-              "15.5"
+              "15.5",
+              "15.6"
             ]
           },
           "sle": {
@@ Expand All / @@ -190,7 +191,8 @@ @@
               "15.2",
               "15.3",
               "15.4",
-              "15.5"
+              "15.5",
+              "15.6"
             ]
           },
           "fedora": {
@@ Expand All / @@ -209,6 +211,7 @@ @@
               "3.17",
               "3.18",
               "3.19",
+              "3.20",
               "edge"
             ]
           },
@@ Expand Down @@