Add Debian 13 (trixie) support

Makefile

@@ -1,5 +1,5 @@
 IMAGE ?= rstudio/r-system-requirements
-VARIANTS ?= focal jammy noble bookworm sid centos7 centos8 rockylinux8 rockylinux9 rockylinux10 opensuse156 fedora41 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge
+VARIANTS ?= focal jammy noble bookworm trixie sid centos7 centos8 rockylinux8 rockylinux9 rockylinux10 opensuse156 fedora41 alpine-3.19 alpine-3.20 alpine-3.21 alpine-edge
 
 RULES ?= rules/*.json
 

README.md

@@ -52,7 +52,7 @@ The rules in this catalog support the following operating systems:
 - Red Hat Enterprise Linux 7, 8, 9
 - openSUSE 15.6
 - SUSE Linux Enterprise 15 SP6
-- Debian 12, unstable
+- Debian 12, 13, unstable
 - Fedora 41
 - Windows (for R 4.0-4.1 only)
 

docker/trixie/Dockerfile

@@ -0,0 +1,8 @@
+FROM debian:13
+
+RUN apt-get update -qq && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y curl
+
+# Install jq
+RUN curl -fsSL -o /usr/local/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.8.1/jq-linux-amd64 && \
+    chmod +x /usr/local/bin/jq

rules/gdal.json

@@ -138,35 +138,20 @@
       "packages": ["gdal-devel", "gdal"],
       "pre_install": [
         { "command": "dnf install -y dnf-plugins-core" },
-        { "command": "dnf config-manager --set-enabled crb" },
-        { "command": "dnf install -y epel-release" }
+        { "command": "dnf config-manager --set-enabled crb" }
       ],
       "constraints": [
         {
           "os": "linux",
           "distribution": "rockylinux",
-          "versions": ["9"]
-        }
-      ]
-    },
-    {
-      "packages": ["gdal-devel", "gdal"],
-      "pre_install": [
-        { "command": "dnf install -y epel-release" }
-      ],
-      "constraints": [
-        {
-          "os": "linux",
-          "distribution": "rockylinux",
-          "versions": ["10"]
+          "versions": ["9", "10"]
         }
       ]
     },
     {
       "packages": ["gdal-devel", "gdal"],
       "pre_install": [
-        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" },
-        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" }
       ],
       "constraints": [
         {
@@ -179,7 +164,7 @@
     {
       "packages": ["gdal-devel", "gdal"],
       "pre_install": [
-        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-10-$(arch)-rpms" }
       ],
       "constraints": [
         {

rules/geos.json

@@ -77,7 +77,7 @@
     {
       "packages": ["geos-devel"],
       "pre_install": [
-        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" }
       ],
       "constraints": [
         {
@@ -90,7 +90,7 @@
     {
       "packages": ["geos-devel"],
       "pre_install": [
-        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-10-$(arch)-rpms" }
       ],
       "constraints": [
         {
@@ -127,10 +127,21 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
-        },
+        }
+      ]
+    },
+    {
+      "packages": ["geos-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"
+          "distribution": "rockylinux",
+          "versions": ["9", "10"]
         }
       ]
     },

rules/proj.json

@@ -50,10 +50,20 @@
           "os": "linux",
           "distribution": "centos",
           "versions": ["8"]
-        },
+        }
+      ]
+    },
+    {
+      "packages": ["proj-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": ["9", "10"]
         }
       ]
     },
@@ -105,7 +115,7 @@
     {
       "packages": ["proj-devel"],
       "pre_install": [
-        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" }
       ],
       "constraints": [
         {
@@ -118,7 +128,7 @@
     {
       "packages": ["proj-devel"],
       "pre_install": [
-        { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-10.noarch.rpm" }
+        { "command": "subscription-manager repos --enable codeready-builder-for-rhel-10-$(arch)-rpms" }
       ],
       "constraints": [
         {

schema.json

@@ -138,7 +138,7 @@
         "enum": [ "6", "7", "8" ]
       },
       "debian": {
-        "enum": [ "10", "11", "12", "unstable" ]
+        "enum": [ "10", "11", "12", "13", "unstable" ]
       },
       "fedora": {
         "enum": [ "36", "37", "38", "39", "40", "41" ]

systems.json

@@ -2,7 +2,7 @@
     {
         "os": "linux",
         "distribution": "debian",
-        "versions": [ "10", "11", "12", "unstable" ]
+        "versions": [ "10", "11", "12", "13", "unstable" ]
     },
     {
         "os": "linux",