From b940875b19b193cd271c465d03f747151a856cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= Date: Tue, 22 Oct 2024 18:19:26 +0200 Subject: [PATCH] Update embedded pkgdepends To fix untar() on the GHA freebsd VM. --- src/library/pkgdepends/DESCRIPTION | 5 +- src/library/pkgdepends/R/install-tar.R | 2 + src/library/pkgdepends/inst/sysreqs/HEAD | 2 +- .../inst/sysreqs/rules/QuantLib.json | 4 +- .../pkgdepends/inst/sysreqs/rules/chrome.json | 125 ++++++++++++------ .../pkgdepends/inst/sysreqs/rules/cmake.json | 2 +- .../pkgdepends/inst/sysreqs/rules/eigen.json | 2 +- .../inst/sysreqs/rules/exiftool.json | 4 +- .../pkgdepends/inst/sysreqs/rules/gdal.json | 4 +- .../pkgdepends/inst/sysreqs/rules/geos.json | 4 +- .../pkgdepends/inst/sysreqs/rules/ggobi.json | 2 +- .../pkgdepends/inst/sysreqs/rules/glpk.json | 2 +- .../inst/sysreqs/rules/haveged.json | 4 +- .../pkgdepends/inst/sysreqs/rules/hdf5.json | 4 +- .../inst/sysreqs/rules/hiredis.json | 2 +- .../inst/sysreqs/rules/imagemagick.json | 16 +-- .../inst/sysreqs/rules/leptonica.json | 4 +- .../inst/sysreqs/rules/libarchive.json | 2 +- .../inst/sysreqs/rules/libavfilter.json | 2 +- .../pkgdepends/inst/sysreqs/rules/libbsd.json | 4 +- .../inst/sysreqs/rules/libgit2.json | 2 +- .../pkgdepends/inst/sysreqs/rules/libjq.json | 2 +- .../inst/sysreqs/rules/libmecab.json | 103 +++++++++++++++ .../inst/sysreqs/rules/libsodium.json | 4 +- .../inst/sysreqs/rules/libwebp.json | 2 +- .../inst/sysreqs/rules/libzstd.json | 2 +- .../inst/sysreqs/rules/mongodb.json | 2 +- .../inst/sysreqs/rules/netcdf4.json | 4 +- .../inst/sysreqs/rules/openbabel.json | 2 +- .../pkgdepends/inst/sysreqs/rules/opencl.json | 4 +- .../pkgdepends/inst/sysreqs/rules/opencv.json | 2 +- .../inst/sysreqs/rules/pandoc-citeproc.json | 2 +- .../pkgdepends/inst/sysreqs/rules/pandoc.json | 4 +- .../inst/sysreqs/rules/pari-gp.json | 2 +- .../inst/sysreqs/rules/poppler-glib.json | 116 ++++++++++++++++ .../inst/sysreqs/rules/poppler.json | 10 +- .../pkgdepends/inst/sysreqs/rules/proj.json | 4 +- .../inst/sysreqs/rules/protobuf-compiler.json | 2 +- .../inst/sysreqs/rules/python3.json | 4 +- .../pkgdepends/inst/sysreqs/rules/qgis.json | 4 +- .../pkgdepends/inst/sysreqs/rules/rust.json | 2 +- .../inst/sysreqs/rules/tesseract.json | 2 +- .../inst/sysreqs/rules/udunits2.json | 4 +- .../pkgdepends/inst/sysreqs/rules/v8.json | 4 +- .../pkgdepends/inst/sysreqs/rules/x11.json | 51 +++++++ .../pkgdepends/inst/sysreqs/rules/zeromq.json | 4 +- 46 files changed, 429 insertions(+), 111 deletions(-) create mode 100644 src/library/pkgdepends/inst/sysreqs/rules/libmecab.json create mode 100644 src/library/pkgdepends/inst/sysreqs/rules/poppler-glib.json create mode 100644 src/library/pkgdepends/inst/sysreqs/rules/x11.json diff --git a/src/library/pkgdepends/DESCRIPTION b/src/library/pkgdepends/DESCRIPTION index 76d88cee6..0c68869f0 100644 --- a/src/library/pkgdepends/DESCRIPTION +++ b/src/library/pkgdepends/DESCRIPTION @@ -1,6 +1,6 @@ Package: pkgdepends Title: Package Dependency Resolution and Downloads -Version: 0.7.2.9000 +Version: 0.8.0.9000 Authors@R: c( person("Gábor", "Csárdi", , "csardi.gabor@gmail.com", role = c("aut", "cre")), person("Posit Software, PBC", role = c("cph", "fnd")) @@ -26,7 +26,6 @@ Suggests: asciicast (>= 2.2.0.9000), codetools, covr, debugme, fansi, fs, gh, gitcreds, glue, htmlwidgets, mockery, pak, pingr (>= 2.0.0), rmarkdown, rstudioapi, spelling, svglite, testthat (>= 3.2.0), tibble, webfakes (>= 1.1.5.9000), withr (>= 2.1.1), -Remotes: r-lib/pkgcache Config/Needs/builder: gh, pkgsearch, withr (>= 2.1.1) Config/Needs/coverage: r-lib/asciicast, covr Config/Needs/website: r-lib/asciicast, pkgdown (>= 2.0.2), @@ -35,7 +34,7 @@ Config/testthat/edition: 3 Encoding: UTF-8 RoxygenNote: 7.3.1.9000 NeedsCompilation: no -Packaged: 2024-09-12 08:23:16 UTC; gaborcsardi +Packaged: 2024-10-22 16:19:06 UTC; gaborcsardi Author: Gábor Csárdi [aut, cre], Posit Software, PBC [cph, fnd] Maintainer: Gábor Csárdi diff --git a/src/library/pkgdepends/R/install-tar.R b/src/library/pkgdepends/R/install-tar.R index 231bb0074..ec78301c5 100644 --- a/src/library/pkgdepends/R/install-tar.R +++ b/src/library/pkgdepends/R/install-tar.R @@ -205,6 +205,8 @@ eup_get_args <- function(options) { c( "-x", "-f", path_norm(options$tarfile), "-C", path_norm(options$exdir), + # do not restore ownership, this is problematic on some mounts, e.f. sshfs + "-o", get_untar_decompress_arg(options$tarfile), if (! options$restore_times) "-m", options$files diff --git a/src/library/pkgdepends/inst/sysreqs/HEAD b/src/library/pkgdepends/inst/sysreqs/HEAD index c014879e0..4ab9008f0 100644 --- a/src/library/pkgdepends/inst/sysreqs/HEAD +++ b/src/library/pkgdepends/inst/sysreqs/HEAD @@ -1 +1 @@ -cab2105ca4d2bdd111b37ef51f36f96aba16691f +a98516da7c5725d52d40f4c40f0ae46e7f94c238 diff --git a/src/library/pkgdepends/inst/sysreqs/rules/QuantLib.json b/src/library/pkgdepends/inst/sysreqs/rules/QuantLib.json index 001e436aa..56122dffa 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/QuantLib.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/QuantLib.json @@ -24,7 +24,7 @@ ], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -41,7 +41,7 @@ ], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/chrome.json b/src/library/pkgdepends/inst/sysreqs/rules/chrome.json index d32334e05..731d2087a 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/chrome.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/chrome.json @@ -1,90 +1,133 @@ { - "patterns": [ - "\\bchrome\\b" - ], + "patterns": ["\\bchrome\\b", "\\bchromium\\b"], "dependencies": [ { "pre_install": [ - { "command": "[ $(which google-chrome) ] || apt-get install -y gnupg curl" }, - { "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" }, - { "command": "[ $(which google-chrome) ] || DEBIAN_FRONTEND='noninteractive' apt-get install -y /tmp/google-chrome.deb" } - ], - "packages": [], - "post_install": [ - { "command": "rm -f /tmp/google-chrome.deb" } + { "command": "apt-get install -y software-properties-common" }, + { "command": "add-apt-repository -y ppa:xtradeb/apps" }, + { "command": "apt-get update" } ], + "packages": ["chromium"], + "post_install": [], "constraints": [ { "os": "linux", - "distribution": "ubuntu" - }, - { - "os": "linux", - "distribution": "debian" + "distribution": "ubuntu", + "versions": ["22.04", "24.04"] } ] }, { "pre_install": [ - { "command": "yum install -y which" }, - { "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.rpm https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm" }, - { "command": "[ $(which google-chrome) ] || yum install -y /tmp/google-chrome.rpm" } + { + "command": "[ $(which google-chrome) ] || apt-get install -y gnupg curl" + }, + { + "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb" + }, + { + "command": "[ $(which google-chrome) ] || DEBIAN_FRONTEND='noninteractive' apt-get install -y /tmp/google-chrome.deb" + } ], "packages": [], - "post_install": [ - { "command": "rm -f /tmp/google-chrome.rpm" } - ], + "post_install": [{ "command": "rm -f /tmp/google-chrome.deb" }], "constraints": [ { "os": "linux", - "distribution": "centos", - "versions": ["8"] - }, + "distribution": "ubuntu", + "versions": ["20.04"] + } + ] + }, + { + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled crb" }, + { "command": "dnf install -y epel-release" } + ], + "packages": ["chromium"], + "post_install": [], + "constraints": [ { "os": "linux", "distribution": "rockylinux" + } + ] + }, + { + "pre_install": [ + { + "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" }, + { + "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" + } + ], + "packages": ["chromium"], + "post_install": [], + "constraints": [ { "os": "linux", "distribution": "redhat", "versions": ["8"] + } + ] + }, + { + "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" + } + ], + "packages": ["chromium"], + "post_install": [], + "constraints": [ { "os": "linux", - "distribution": "fedora", - "versions": [ "36", "37" ] + "distribution": "redhat", + "versions": ["9"] } ] }, { - "pre_install": [ - { "command": "yum install -y which" }, - { "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.rpm https://dl.google.com/linux/chrome/rpm/stable/x86_64/google-chrome-stable-125.0.6422.141-1.x86_64.rpm" }, - { "command": "[ $(which google-chrome) ] || yum install -y /tmp/google-chrome.rpm" } - ], - "packages": [], - "post_install": [ - { "command": "rm -f /tmp/google-chrome.rpm" } - ], + "pre_install": [], + "packages": ["chromium"], + "post_install": [], "constraints": [ { "os": "linux", - "distribution": "centos", - "versions": ["7"] + "distribution": "debian" }, { "os": "linux", - "distribution": "redhat", - "versions": ["7"] + "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "alpine" } ] }, { - "packages": ["chromium"], + "pre_install": [ + { "command": "yum install -y which" }, + { + "command": "[ $(which google-chrome) ] || curl -fsSL -o /tmp/google-chrome.rpm https://dl.google.com/linux/chrome/rpm/stable/x86_64/google-chrome-stable-125.0.6422.141-1.x86_64.rpm" + }, + { + "command": "[ $(which google-chrome) ] || yum install -y /tmp/google-chrome.rpm" + } + ], + "packages": [], + "post_install": [{ "command": "rm -f /tmp/google-chrome.rpm" }], "constraints": [ { "os": "linux", - "distribution": "alpine" + "distribution": "centos", + "versions": ["7", "8"] } ] } diff --git a/src/library/pkgdepends/inst/sysreqs/rules/cmake.json b/src/library/pkgdepends/inst/sysreqs/rules/cmake.json index 8a12fe4f8..2d20a6778 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/cmake.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/cmake.json @@ -56,7 +56,7 @@ "packages": ["cmake", "cmake3"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/eigen.json b/src/library/pkgdepends/inst/sysreqs/rules/eigen.json index 3772c58ec..419f94755 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/eigen.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/eigen.json @@ -50,7 +50,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" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/exiftool.json b/src/library/pkgdepends/inst/sysreqs/rules/exiftool.json index eda1648e2..29a16073f 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/exiftool.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/exiftool.json @@ -45,7 +45,7 @@ "packages": ["perl-Image-ExifTool"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -60,7 +60,7 @@ "packages": ["perl-Image-ExifTool"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/gdal.json b/src/library/pkgdepends/inst/sysreqs/rules/gdal.json index 538478621..64a550b01 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/gdal.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/gdal.json @@ -45,7 +45,7 @@ ], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -63,7 +63,7 @@ ], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/geos.json b/src/library/pkgdepends/inst/sysreqs/rules/geos.json index 49e41ec4e..338ba18ee 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/geos.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/geos.json @@ -33,7 +33,7 @@ "packages": ["geos-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -48,7 +48,7 @@ "packages": ["geos-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/ggobi.json b/src/library/pkgdepends/inst/sysreqs/rules/ggobi.json index c2627f059..87a43d7b4 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/ggobi.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/ggobi.json @@ -33,7 +33,7 @@ "packages": ["ggobi-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/glpk.json b/src/library/pkgdepends/inst/sysreqs/rules/glpk.json index 565b8ebd0..1f5165ada 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/glpk.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/glpk.json @@ -79,7 +79,7 @@ "packages": ["glpk-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/haveged.json b/src/library/pkgdepends/inst/sysreqs/rules/haveged.json index 29c283dee..7392efabc 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/haveged.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/haveged.json @@ -61,7 +61,7 @@ "packages": ["haveged-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -76,7 +76,7 @@ "packages": ["haveged-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/hdf5.json b/src/library/pkgdepends/inst/sysreqs/rules/hdf5.json index 2e2549b54..4b3026d0b 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/hdf5.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/hdf5.json @@ -61,7 +61,7 @@ "packages": ["hdf5-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -76,7 +76,7 @@ "packages": ["hdf5-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/hiredis.json b/src/library/pkgdepends/inst/sysreqs/rules/hiredis.json index 8a5d387ac..8096cf9b5 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/hiredis.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/hiredis.json @@ -61,7 +61,7 @@ "packages": ["hiredis-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/imagemagick.json b/src/library/pkgdepends/inst/sysreqs/rules/imagemagick.json index f0431f9c7..ef8dca36e 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/imagemagick.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/imagemagick.json @@ -2,7 +2,7 @@ "patterns": ["\\bimagemagick\\b", "\\bimage magick\\b"], "dependencies": [ { - "packages": ["imagemagick", "libmagick++-dev", "gsfonts"], + "packages": ["libmagick++-dev", "gsfonts"], "constraints": [ { "os": "linux", @@ -15,7 +15,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++-devel"], + "packages": ["ImageMagick-devel", "ImageMagick-c++-devel"], "constraints": [ { "os": "linux", @@ -29,7 +29,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++-devel"], + "packages": ["ImageMagick-devel", "ImageMagick-c++-devel"], "pre_install": [ { "command": "dnf install -y dnf-plugins-core" }, { "command": "dnf config-manager --set-enabled powertools" }, @@ -44,7 +44,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++-devel"], + "packages": ["ImageMagick-devel", "ImageMagick-c++-devel"], "pre_install": [ { "command": "dnf install -y epel-release" } ], @@ -56,7 +56,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++"], + "packages": ["ImageMagick-c++-devel", "ImageMagick-devel"], "constraints": [ { "os": "linux", @@ -66,7 +66,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++"], + "packages": ["ImageMagick-c++-devel", "ImageMagick-devel"], "pre_install": [ { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" @@ -81,7 +81,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-c++"], + "packages": ["ImageMagick-c++-devel", "ImageMagick-devel"], "pre_install": [ { "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm" } ], @@ -94,7 +94,7 @@ ] }, { - "packages": ["ImageMagick", "ImageMagick-devel", "libMagick++-devel"], + "packages": ["ImageMagick-devel", "libMagick++-devel"], "constraints": [ { "os": "linux", diff --git a/src/library/pkgdepends/inst/sysreqs/rules/leptonica.json b/src/library/pkgdepends/inst/sysreqs/rules/leptonica.json index 99f4109ee..12606b472 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/leptonica.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/leptonica.json @@ -60,7 +60,7 @@ "packages": ["leptonica-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -75,7 +75,7 @@ "packages": ["leptonica-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libarchive.json b/src/library/pkgdepends/inst/sysreqs/rules/libarchive.json index ce874bb91..d7f0156dc 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libarchive.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libarchive.json @@ -82,7 +82,7 @@ "packages": ["libarchive3-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libavfilter.json b/src/library/pkgdepends/inst/sysreqs/rules/libavfilter.json index c4e18aa99..22e24cbae 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libavfilter.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libavfilter.json @@ -68,7 +68,7 @@ { "packages": ["ffmpeg-devel"], "pre_install": [ - { "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" }, + { "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" }, { "command": "yum install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libbsd.json b/src/library/pkgdepends/inst/sysreqs/rules/libbsd.json index 2f3f9cd11..7c65d6ae7 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libbsd.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libbsd.json @@ -61,7 +61,7 @@ "packages": ["libbsd-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -76,7 +76,7 @@ "packages": ["libbsd-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libgit2.json b/src/library/pkgdepends/inst/sysreqs/rules/libgit2.json index 6fb265a14..9d7336869 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libgit2.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libgit2.json @@ -58,7 +58,7 @@ "packages": ["libgit2-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libjq.json b/src/library/pkgdepends/inst/sysreqs/rules/libjq.json index 18d66a530..bf56f0c64 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libjq.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libjq.json @@ -45,7 +45,7 @@ { "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "packages": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libmecab.json b/src/library/pkgdepends/inst/sysreqs/rules/libmecab.json new file mode 100644 index 000000000..0035d31c2 --- /dev/null +++ b/src/library/pkgdepends/inst/sysreqs/rules/libmecab.json @@ -0,0 +1,103 @@ +{ + "patterns": ["\\blibmecab\\b", "\\bmecab\\b"], + "dependencies": [ + { + "packages": ["libmecab-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + } + ] + }, + { + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "packages": ["mecab-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "centos", + "versions": ["8"] + } + ] + }, + { + "packages": ["mecab-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled crb" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux" + } + ] + }, + { + "packages": ["mecab-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "pre_install": [ + { + "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" + }, + { + "command": "dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" + } + ], + "packages": ["mecab-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "versions": ["8"] + } + ] + }, + { + "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" + } + ], + "packages": ["mecab-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "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/src/library/pkgdepends/inst/sysreqs/rules/libsodium.json b/src/library/pkgdepends/inst/sysreqs/rules/libsodium.json index ff435d246..22e211fd1 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libsodium.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libsodium.json @@ -61,7 +61,7 @@ "packages": ["libsodium-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -76,7 +76,7 @@ "packages": ["libsodium-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libwebp.json b/src/library/pkgdepends/inst/sysreqs/rules/libwebp.json index b7f38736c..b3a8b00bc 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libwebp.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libwebp.json @@ -56,7 +56,7 @@ "packages": ["libwebp-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/libzstd.json b/src/library/pkgdepends/inst/sysreqs/rules/libzstd.json index 544939efe..5dc646127 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/libzstd.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/libzstd.json @@ -33,7 +33,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" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/mongodb.json b/src/library/pkgdepends/inst/sysreqs/rules/mongodb.json index a821da668..003d0beb3 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/mongodb.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/mongodb.json @@ -30,7 +30,7 @@ "packages": ["mongodb"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/netcdf4.json b/src/library/pkgdepends/inst/sysreqs/rules/netcdf4.json index ae15ef9b0..f4859adbe 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/netcdf4.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/netcdf4.json @@ -61,7 +61,7 @@ "packages": ["netcdf-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -76,7 +76,7 @@ "packages": ["netcdf-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/openbabel.json b/src/library/pkgdepends/inst/sysreqs/rules/openbabel.json index 1dc08fcd8..51b76f379 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/openbabel.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/openbabel.json @@ -50,7 +50,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" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/opencl.json b/src/library/pkgdepends/inst/sysreqs/rules/opencl.json index b1d23ad33..f4ee223b7 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/opencl.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/opencl.json @@ -60,7 +60,7 @@ "packages": ["ocl-icd", "opencl-headers"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -75,7 +75,7 @@ "packages": ["ocl-icd", "opencl-headers"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/opencv.json b/src/library/pkgdepends/inst/sysreqs/rules/opencv.json index 4db7c90de..a9475ddac 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/opencv.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/opencv.json @@ -48,7 +48,7 @@ "packages": ["opencv-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/pandoc-citeproc.json b/src/library/pkgdepends/inst/sysreqs/rules/pandoc-citeproc.json index 56f0d35c2..1306299a7 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/pandoc-citeproc.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/pandoc-citeproc.json @@ -35,7 +35,7 @@ "packages": ["pandoc-citeproc"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/pandoc.json b/src/library/pkgdepends/inst/sysreqs/rules/pandoc.json index 3c2455e11..81f6e8360 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/pandoc.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/pandoc.json @@ -56,7 +56,7 @@ "packages": ["pandoc"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -71,7 +71,7 @@ "packages": ["pandoc"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/pari-gp.json b/src/library/pkgdepends/inst/sysreqs/rules/pari-gp.json index 41af7fbbe..7ead36e95 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/pari-gp.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/pari-gp.json @@ -42,7 +42,7 @@ "packages": ["pari-gp"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/poppler-glib.json b/src/library/pkgdepends/inst/sysreqs/rules/poppler-glib.json new file mode 100644 index 000000000..e797ff00e --- /dev/null +++ b/src/library/pkgdepends/inst/sysreqs/rules/poppler-glib.json @@ -0,0 +1,116 @@ +{ + "patterns": ["\\bPoppler glib\\b"], + "dependencies": [ + { + "packages": ["libpoppler-glib-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + } + ] + }, + { + "packages": ["poppler-glib-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "centos", + "versions": ["7"] + }, + { + "os": "linux", + "distribution": "redhat", + "versions": ["7"] + }, + { + "os": "linux", + "distribution": "fedora" + } + ] + }, + { + "packages": ["poppler-glib-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled powertools" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "centos", + "versions": ["8"] + } + ] + }, + { + "packages": ["poppler-glib-devel"], + "pre_install": [ + { "command": "dnf install -y dnf-plugins-core" }, + { "command": "dnf config-manager --set-enabled crb" } + ], + "constraints": [ + { + "os": "linux", + "distribution": "rockylinux" + } + ] + }, + { + "packages": ["poppler-glib-devel"], + "pre_install": [ + { + "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" + } + ], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "versions": ["8"] + } + ] + }, + { + "packages": ["poppler-glib-devel"], + "pre_install": [ + { + "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" + } + ], + "constraints": [ + { + "os": "linux", + "distribution": "redhat", + "versions": ["9"] + } + ] + }, + { + "packages": ["libpoppler-glib-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "sle" + } + ] + }, + { + "packages": ["poppler-glib"], + "constraints": [ + { + "os": "linux", + "distribution": "alpine" + } + ] + } + ] +} diff --git a/src/library/pkgdepends/inst/sysreqs/rules/poppler.json b/src/library/pkgdepends/inst/sysreqs/rules/poppler.json index f6092331f..347a300f4 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/poppler.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/poppler.json @@ -1,5 +1,5 @@ { - "patterns": ["\\bpoppler\\b"], + "patterns": ["\\bPoppler C\\+\\+"], "dependencies": [ { "packages": ["libpoppler-cpp-dev"], @@ -63,7 +63,9 @@ { "packages": ["poppler-cpp-devel"], "pre_install": [ - { "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" } + { + "command": "subscription-manager repos --enable codeready-builder-for-rhel-8-$(arch)-rpms" + } ], "constraints": [ { @@ -76,7 +78,9 @@ { "packages": ["poppler-cpp-devel"], "pre_install": [ - { "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" } + { + "command": "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms" + } ], "constraints": [ { diff --git a/src/library/pkgdepends/inst/sysreqs/rules/proj.json b/src/library/pkgdepends/inst/sysreqs/rules/proj.json index 655fb93b5..35e9338d8 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/proj.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/proj.json @@ -61,7 +61,7 @@ "packages": ["proj-devel", "proj-epsg"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -76,7 +76,7 @@ "packages": ["proj-devel", "proj-epsg"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/protobuf-compiler.json b/src/library/pkgdepends/inst/sysreqs/rules/protobuf-compiler.json index fb3b3950c..8a57578d2 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/protobuf-compiler.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/protobuf-compiler.json @@ -79,7 +79,7 @@ "packages": ["protobuf-compiler"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/python3.json b/src/library/pkgdepends/inst/sysreqs/rules/python3.json index d95bd03c2..1e2d6a01c 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/python3.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/python3.json @@ -48,7 +48,7 @@ "packages": ["python34"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -63,7 +63,7 @@ "packages": ["python34"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/qgis.json b/src/library/pkgdepends/inst/sysreqs/rules/qgis.json index eee6ebfe2..6b48b7b7c 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/qgis.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/qgis.json @@ -42,7 +42,7 @@ "packages": ["qgis-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -57,7 +57,7 @@ "packages": ["qgis-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/rust.json b/src/library/pkgdepends/inst/sysreqs/rules/rust.json index d1cac3136..7d2a844da 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/rust.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/rust.json @@ -48,7 +48,7 @@ "packages": ["rust", "cargo"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/tesseract.json b/src/library/pkgdepends/inst/sysreqs/rules/tesseract.json index 96af678ca..a363ae99e 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/tesseract.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/tesseract.json @@ -69,7 +69,7 @@ "packages": ["tesseract-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/udunits2.json b/src/library/pkgdepends/inst/sysreqs/rules/udunits2.json index c82c8fcd9..73ee883f2 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/udunits2.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/udunits2.json @@ -27,7 +27,7 @@ "packages": ["udunits2-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -42,7 +42,7 @@ "packages": ["udunits2-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/v8.json b/src/library/pkgdepends/inst/sysreqs/rules/v8.json index 0a2eca063..14c4986fa 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/v8.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/v8.json @@ -53,7 +53,7 @@ "packages": ["v8-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -68,7 +68,7 @@ "packages": ["v8-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [ diff --git a/src/library/pkgdepends/inst/sysreqs/rules/x11.json b/src/library/pkgdepends/inst/sysreqs/rules/x11.json new file mode 100644 index 000000000..3c42cd0a5 --- /dev/null +++ b/src/library/pkgdepends/inst/sysreqs/rules/x11.json @@ -0,0 +1,51 @@ +{ + "patterns": ["\\bX11\\b"], + "dependencies": [ + { + "packages": ["libx11-dev"], + "constraints": [ + { + "os": "linux", + "distribution": "ubuntu" + }, + { + "os": "linux", + "distribution": "debian" + }, + { + "os": "linux", + "distribution": "alpine" + } + ] + }, + { + "packages": ["libX11-devel"], + "constraints": [ + { + "os": "linux", + "distribution": "centos" + }, + { + "os": "linux", + "distribution": "rockylinux" + }, + { + "os": "linux", + "distribution": "redhat" + }, + { + "os": "linux", + "distribution": "fedora" + }, + { + "os": "linux", + "distribution": "opensuse" + }, + { + "os": "linux", + "distribution": "sle" + } + ] + } + ] +} diff --git a/src/library/pkgdepends/inst/sysreqs/rules/zeromq.json b/src/library/pkgdepends/inst/sysreqs/rules/zeromq.json index 16ebe5161..5d0af7b52 100644 --- a/src/library/pkgdepends/inst/sysreqs/rules/zeromq.json +++ b/src/library/pkgdepends/inst/sysreqs/rules/zeromq.json @@ -69,7 +69,7 @@ "packages": ["zeromq-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/epel-release-6-8.noarch.rpm" } ], "constraints": [ @@ -84,7 +84,7 @@ "packages": ["zeromq-devel"], "pre_install": [ { - "command": "rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" + "command": "rpm -q epel-release || yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm" } ], "constraints": [