From 0807835e65027bcdb4dd9ff53dade85d3f81a351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Thu, 9 Jan 2025 10:16:04 +0100 Subject: [PATCH] Update embedded system requirements --- inst/sysreqs/HEAD | 2 +- inst/sysreqs/rules/atk.json | 12 ++++- inst/sysreqs/rules/chrome.json | 19 ++++++- inst/sysreqs/rules/eigen.json | 5 ++ inst/sysreqs/rules/gdal.json | 8 ++- inst/sysreqs/rules/glpk.json | 12 +---- inst/sysreqs/rules/gpgme.json | 8 ++- inst/sysreqs/rules/gsl.json | 14 ++---- inst/sysreqs/rules/leptonica.json | 8 ++- inst/sysreqs/rules/libarchive.json | 21 +++++++- inst/sysreqs/rules/libavfilter.json | 3 +- inst/sysreqs/rules/libbz2.json | 61 +++++++++++++++++++++++ inst/sysreqs/rules/libjq.json | 30 ++++++++++- inst/sysreqs/rules/liblzma.json | 61 +++++++++++++++++++++++ inst/sysreqs/rules/libmagic.json | 8 ++- inst/sysreqs/rules/libmecab.json | 21 +++----- inst/sysreqs/rules/libmysqlclient.json | 8 ++- inst/sysreqs/rules/libprotobuf.json | 8 ++- inst/sysreqs/rules/libsndfile.json | 8 ++- inst/sysreqs/rules/odbc.json | 8 ++- inst/sysreqs/rules/opencl.json | 8 ++- inst/sysreqs/rules/opencv.json | 8 ++- inst/sysreqs/rules/openmpt.json | 61 +++++++++++++++++++++++ inst/sysreqs/rules/poppler-glib.json | 8 ++- inst/sysreqs/rules/poppler.json | 8 ++- inst/sysreqs/rules/protobuf-compiler.json | 8 ++- inst/sysreqs/rules/python.json | 3 +- inst/sysreqs/rules/python3.json | 8 ++- inst/sysreqs/rules/redland.json | 21 +++++++- inst/sysreqs/rules/sdl2.json | 5 +- inst/sysreqs/rules/suitesparse.json | 8 ++- inst/sysreqs/rules/tesseract.json | 12 +++-- inst/sysreqs/rules/v8.json | 3 +- 33 files changed, 421 insertions(+), 65 deletions(-) create mode 100644 inst/sysreqs/rules/libbz2.json create mode 100644 inst/sysreqs/rules/liblzma.json create mode 100644 inst/sysreqs/rules/openmpt.json diff --git a/inst/sysreqs/HEAD b/inst/sysreqs/HEAD index 4ab9008f..6e2bab73 100644 --- a/inst/sysreqs/HEAD +++ b/inst/sysreqs/HEAD @@ -1 +1 @@ -a98516da7c5725d52d40f4c40f0ae46e7f94c238 +454a3af2bcd2e1c3710aad4b50daeffb854d618b diff --git a/inst/sysreqs/rules/atk.json b/inst/sysreqs/rules/atk.json index 73082cb8..5c9eb6aa 100644 --- a/inst/sysreqs/rules/atk.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/chrome.json b/inst/sysreqs/rules/chrome.json index 731d2087..7494a4c1 100644 --- a/inst/sysreqs/rules/chrome.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/eigen.json b/inst/sysreqs/rules/eigen.json index 419f9475..100eb34b 100644 --- a/inst/sysreqs/rules/eigen.json +++ b/inst/sysreqs/rules/eigen.json @@ -72,6 +72,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, diff --git a/inst/sysreqs/rules/gdal.json b/inst/sysreqs/rules/gdal.json index 64a550b0..23a1320a 100644 --- a/inst/sysreqs/rules/gdal.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/glpk.json b/inst/sysreqs/rules/glpk.json index 1f5165ad..1d4e4f7f 100644 --- a/inst/sysreqs/rules/glpk.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/gpgme.json b/inst/sysreqs/rules/gpgme.json index d504566a..2ed11f06 100644 --- a/inst/sysreqs/rules/gpgme.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/gsl.json b/inst/sysreqs/rules/gsl.json index 8e589436..648029ad 100644 --- a/inst/sysreqs/rules/gsl.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/leptonica.json b/inst/sysreqs/rules/leptonica.json index 12606b47..9f4c0ecd 100644 --- a/inst/sysreqs/rules/leptonica.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/libarchive.json b/inst/sysreqs/rules/libarchive.json index d7f0156d..53b30147 100644 --- a/inst/sysreqs/rules/libarchive.json +++ b/inst/sysreqs/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/inst/sysreqs/rules/libavfilter.json b/inst/sysreqs/rules/libavfilter.json index 22e24cba..b2c75de6 100644 --- a/inst/sysreqs/rules/libavfilter.json +++ b/inst/sysreqs/rules/libavfilter.json @@ -33,7 +33,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libbz2.json b/inst/sysreqs/rules/libbz2.json new file mode 100644 index 00000000..cd74d8c5 --- /dev/null +++ b/inst/sysreqs/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/inst/sysreqs/rules/libjq.json b/inst/sysreqs/rules/libjq.json index bf56f0c6..522d5fc4 100644 --- a/inst/sysreqs/rules/libjq.json +++ b/inst/sysreqs/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": [ diff --git a/inst/sysreqs/rules/liblzma.json b/inst/sysreqs/rules/liblzma.json new file mode 100644 index 00000000..d44f025c --- /dev/null +++ b/inst/sysreqs/rules/liblzma.json @@ -0,0 +1,61 @@ +{ + "patterns": ["\\bliblzma\\b"], + "dependencies": [ + { + "packages": ["liblzma-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + } + ] + }, + { + "packages": ["xz-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "centos" + }, + { + "os": "linux", + "distribution": "rockylinux" + }, + { + "os": "linux", + "distribution": "redhat" + }, + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "packages": ["xz-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "sle" + } + ] + }, + { + "packages": ["xz-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine" + } + ] + } + ] + } diff --git a/inst/sysreqs/rules/libmagic.json b/inst/sysreqs/rules/libmagic.json index ef7643df..d6339068 100644 --- a/inst/sysreqs/rules/libmagic.json +++ b/inst/sysreqs/rules/libmagic.json @@ -49,6 +49,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -61,7 +66,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libmecab.json b/inst/sysreqs/rules/libmecab.json index 0035d31c..b349cdf9 100644 --- a/inst/sysreqs/rules/libmecab.json +++ b/inst/sysreqs/rules/libmecab.json @@ -37,7 +37,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, @@ -47,6 +48,11 @@ { "os": "linux", "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -85,19 +91,6 @@ "versions": ["9"] } ] - }, - { - "packages": ["mecab-devel"], - "pre_install": [ - { "command": "dnf install -y dnf-plugins-core" }, - { "command": "dnf config-manager --set-enabled crb" } - ], - "constraints": [ - { - "os": "linux", - "distribution": "rockylinux" - } - ] } ] } diff --git a/inst/sysreqs/rules/libmysqlclient.json b/inst/sysreqs/rules/libmysqlclient.json index 873d8021..b0437a41 100644 --- a/inst/sysreqs/rules/libmysqlclient.json +++ b/inst/sysreqs/rules/libmysqlclient.json @@ -50,6 +50,11 @@ { "os": "linux", "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -62,7 +67,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libprotobuf.json b/inst/sysreqs/rules/libprotobuf.json index b347393c..12b11411 100644 --- a/inst/sysreqs/rules/libprotobuf.json +++ b/inst/sysreqs/rules/libprotobuf.json @@ -50,6 +50,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -71,7 +76,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/libsndfile.json b/inst/sysreqs/rules/libsndfile.json index d37797ed..41132f4a 100644 --- a/inst/sysreqs/rules/libsndfile.json +++ b/inst/sysreqs/rules/libsndfile.json @@ -44,6 +44,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -56,7 +61,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/odbc.json b/inst/sysreqs/rules/odbc.json index 2e466a7b..c086ce0f 100644 --- a/inst/sysreqs/rules/odbc.json +++ b/inst/sysreqs/rules/odbc.json @@ -29,6 +29,11 @@ { "os": "linux", "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -41,7 +46,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/opencl.json b/inst/sysreqs/rules/opencl.json index f4ee223b..426483e2 100644 --- a/inst/sysreqs/rules/opencl.json +++ b/inst/sysreqs/rules/opencl.json @@ -40,6 +40,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -48,7 +53,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] }, { "os": "linux", diff --git a/inst/sysreqs/rules/opencv.json b/inst/sysreqs/rules/opencv.json index a9475dda..5031ddb5 100644 --- a/inst/sysreqs/rules/opencv.json +++ b/inst/sysreqs/rules/opencv.json @@ -70,6 +70,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -97,7 +102,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/openmpt.json b/inst/sysreqs/rules/openmpt.json new file mode 100644 index 00000000..e1f41e26 --- /dev/null +++ b/inst/sysreqs/rules/openmpt.json @@ -0,0 +1,61 @@ +{ + "patterns": ["\\bopenmpt\\b"], + "dependencies": [ + { + "packages": ["libopenmpt-dev", "portaudio19-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + } + ] + }, + { + "packages": ["libopenmpt-devel", "portaudio-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "packages": ["libopenmpt-devel", "portaudio-devel"], + "pre_install": [ + { "command": "yum install -y epel-release" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "centos" + }, + { + "os": "linux", + "distribution": "rockylinux" + }, + { + "os": "linux", + "distribution": "redhat" + } + ] + }, + { + "packages": ["libopenmpt-dev", "portaudio-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine", + "versions": [ "3.18", "3.19", "3.20", "edge" ] + } + ] + } + ] +} diff --git a/inst/sysreqs/rules/poppler-glib.json b/inst/sysreqs/rules/poppler-glib.json index e797ff00..5d3619f2 100644 --- a/inst/sysreqs/rules/poppler-glib.json +++ b/inst/sysreqs/rules/poppler-glib.json @@ -44,6 +44,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -56,7 +61,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/poppler.json b/inst/sysreqs/rules/poppler.json index 347a300f..e2b0bf28 100644 --- a/inst/sysreqs/rules/poppler.json +++ b/inst/sysreqs/rules/poppler.json @@ -44,6 +44,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -56,7 +61,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/protobuf-compiler.json b/inst/sysreqs/rules/protobuf-compiler.json index 8a57578d..86985cb9 100644 --- a/inst/sysreqs/rules/protobuf-compiler.json +++ b/inst/sysreqs/rules/protobuf-compiler.json @@ -50,6 +50,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -71,7 +76,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/python.json b/inst/sysreqs/rules/python.json index 49b054b8..e7297430 100644 --- a/inst/sysreqs/rules/python.json +++ b/inst/sysreqs/rules/python.json @@ -49,7 +49,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] }, { "os": "linux", diff --git a/inst/sysreqs/rules/python3.json b/inst/sysreqs/rules/python3.json index 1e2d6a01..f6c84216 100644 --- a/inst/sysreqs/rules/python3.json +++ b/inst/sysreqs/rules/python3.json @@ -41,6 +41,11 @@ "os": "linux", "distribution": "redhat", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -79,7 +84,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] }, { "os": "linux", diff --git a/inst/sysreqs/rules/redland.json b/inst/sysreqs/rules/redland.json index 0237a8d5..8bb37311 100644 --- a/inst/sysreqs/rules/redland.json +++ b/inst/sysreqs/rules/redland.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"] } ] }, @@ -64,6 +70,19 @@ } ] }, + { + "packages": ["redland-devel"], + "pre_install": [ + { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "versions": ["8"] + } + ] + }, { "packages": ["redland-devel"], "pre_install": [ diff --git a/inst/sysreqs/rules/sdl2.json b/inst/sysreqs/rules/sdl2.json index 9fb5e807..037ec73b 100644 --- a/inst/sysreqs/rules/sdl2.json +++ b/inst/sysreqs/rules/sdl2.json @@ -25,7 +25,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] }, { "os": "linux", @@ -132,4 +133,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/inst/sysreqs/rules/suitesparse.json b/inst/sysreqs/rules/suitesparse.json index 99189bc7..45c62cee 100644 --- a/inst/sysreqs/rules/suitesparse.json +++ b/inst/sysreqs/rules/suitesparse.json @@ -52,6 +52,11 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } ] }, @@ -64,7 +69,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/tesseract.json b/inst/sysreqs/rules/tesseract.json index a363ae99..20f724bf 100644 --- a/inst/sysreqs/rules/tesseract.json +++ b/inst/sysreqs/rules/tesseract.json @@ -49,9 +49,14 @@ "os": "linux", "distribution": "centos", "versions": ["8"] + }, + { + "os": "linux", + "distribution": "rockylinux", + "versions": ["8"] } - ] - }, + ] + }, { "packages": ["tesseract-devel"], "pre_install": [ @@ -61,7 +66,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] } ] }, diff --git a/inst/sysreqs/rules/v8.json b/inst/sysreqs/rules/v8.json index 14c4986f..95434e31 100644 --- a/inst/sysreqs/rules/v8.json +++ b/inst/sysreqs/rules/v8.json @@ -84,7 +84,8 @@ "constraints": [ { "os": "linux", - "distribution": "rockylinux" + "distribution": "rockylinux", + "versions": ["9"] }, { "os": "linux",