From 58129131145a36962eb9e3e497f208b1df5771a2 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Mon, 29 Jan 2024 12:46:12 +0000 Subject: [PATCH 1/4] Remove conf-zstd.0.1 Simplify the maintenance of this package by only having one version to contend with. The original addition of conf-zstd.1.3.8 was somewhat flawed - opam does not support depext version contraints, so packages trying to encode these should use a different name from the conf package, to ease the maintenance of the depexts list. Of the major distributions: - Ubuntu has had 1.3.8+ since Disco (19.04) - Fedora has had 1.3.8+ since Fedora 28 (RHEL 8 as well, therefore) - Alpine has had 1.3.8+ since 3.9 Solvers will already have been picking conf-zstd.1.3.8 as the greatest version, so this commit explicitly marks conf-zstd.0.1 as unavailable, and removes the now-redundant version constraint on two old zstandard packages. --- packages/conf-zstd/conf-zstd.0.1/opam | 24 ++++++++--------------- packages/zstandard/zstandard.v0.12.0/opam | 2 +- packages/zstandard/zstandard.v0.12.1/opam | 2 +- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/packages/conf-zstd/conf-zstd.0.1/opam b/packages/conf-zstd/conf-zstd.0.1/opam index 31ca5ee14d2..c4aef29d87c 100644 --- a/packages/conf-zstd/conf-zstd.0.1/opam +++ b/packages/conf-zstd/conf-zstd.0.1/opam @@ -4,19 +4,11 @@ homepage: "http://zstd.net/" bug-reports: "https://github.com/ocaml/opam-repository/issues" authors: ["Facebook"] license: "BSD-3-Clause" -build: [["pkg-config" "libzstd"]] -depends: ["conf-pkg-config" {build}] -depexts: [ - ["libzstd-dev"] {os-family = "debian"} - ["libzstd-devel"] {os-distribution = "centos"} - ["libzstd-devel"] {os-distribution = "rhel"} - ["libzstd-devel"] {os-distribution = "fedora"} - ["zstd-dev"] {os-distribution = "alpine"} - ["zstd"] {os-distribution = "homebrew" & os = "macos"} - ["zstd"] {os = "win32" & os-distribution = "cygwinports"} -] -synopsis: "Virtual package relying on zstd" -description:" -This package can only install if the zstd library is installed on the system. -" -flags: conf +synopsis: "Virtual package relying on zstd (legacy)" +description: "This package version has been deprecated - use conf-zstd.1.3.8." +flags: [ conf deprecated ] +# This package has been disabled in order to simplify the maintenance of +# conf-zstd. conf-zstd.1.3.8 was added to "encode" a build requirement of at +# least version 1.3.8, but this should have been done using an entirely new +# package. +available: false diff --git a/packages/zstandard/zstandard.v0.12.0/opam b/packages/zstandard/zstandard.v0.12.0/opam index 7a1bf334bc8..eebfe8fa13e 100644 --- a/packages/zstandard/zstandard.v0.12.0/opam +++ b/packages/zstandard/zstandard.v0.12.0/opam @@ -13,7 +13,7 @@ depends: [ "ocaml" {>= "4.07.0"} "core_kernel" {>= "v0.12" & < "v0.13"} "ppx_jane" {>= "v0.12" & < "v0.13"} - "conf-zstd" {= "1.3.8"} + "conf-zstd" "ctypes" "dune" {>= "1.5.1" & < "2.0.0"} ] diff --git a/packages/zstandard/zstandard.v0.12.1/opam b/packages/zstandard/zstandard.v0.12.1/opam index 5150e9f8895..c48f6cf5dfc 100644 --- a/packages/zstandard/zstandard.v0.12.1/opam +++ b/packages/zstandard/zstandard.v0.12.1/opam @@ -13,7 +13,7 @@ depends: [ "ocaml" {>= "4.07.0"} "core_kernel" {>= "v0.12" & < "v0.13"} "ppx_jane" {>= "v0.12" & < "v0.13"} - "conf-zstd" {= "1.3.8"} + "conf-zstd" "ctypes" "dune" {>= "1.5.1"} ] From d1d9a97d78e9796add4f5adb233a136b7dfcf3c4 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Mon, 11 Mar 2024 13:18:46 +0100 Subject: [PATCH 2/4] Fix lowerbound on Dune for ppxlib.0.5.0 ppxlib appears to be affected by a variation on ocaml/dune#1549, fixed by ocaml/dune#1551 Dune 1.6.0. --- packages/ppxlib/ppxlib.0.5.0/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ppxlib/ppxlib.0.5.0/opam b/packages/ppxlib/ppxlib.0.5.0/opam index 442e8748b8a..e160d0f7cef 100644 --- a/packages/ppxlib/ppxlib.0.5.0/opam +++ b/packages/ppxlib/ppxlib.0.5.0/opam @@ -16,7 +16,7 @@ run-test: [ depends: [ "ocaml" {>= "4.04.1" & < "4.08.0"} "base" {>= "v0.11.0"} - "dune" + "dune" {>= "1.6.0"} "ocaml-compiler-libs" {>= "v0.11.0"} "ocaml-migrate-parsetree" {>= "1.0.9" & < "2.0.0"} "ppx_derivers" {>= "1.0"} From 740529b7616be1c75a5195dc662a92742c006d11 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Tue, 12 Mar 2024 09:36:23 +0000 Subject: [PATCH 3/4] Deprecate, rather than make unavailable --- packages/conf-zstd/conf-zstd.0.1/opam | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/conf-zstd/conf-zstd.0.1/opam b/packages/conf-zstd/conf-zstd.0.1/opam index c4aef29d87c..efd2262ed46 100644 --- a/packages/conf-zstd/conf-zstd.0.1/opam +++ b/packages/conf-zstd/conf-zstd.0.1/opam @@ -4,11 +4,18 @@ homepage: "http://zstd.net/" bug-reports: "https://github.com/ocaml/opam-repository/issues" authors: ["Facebook"] license: "BSD-3-Clause" +build: [["pkg-config" "libzstd"]] +depends: ["conf-pkg-config" {build}] +depexts: [ + ["libzstd-dev"] {os-family = "debian"} + ["libzstd-devel"] {os-distribution = "centos"} + ["libzstd-devel"] {os-distribution = "rhel"} + ["libzstd-devel"] {os-distribution = "fedora"} + ["zstd-dev"] {os-distribution = "alpine"} + ["zstd"] {os-distribution = "homebrew" & os = "macos"} + ["zstd"] {os = "win32" & os-distribution = "cygwinports"} +] synopsis: "Virtual package relying on zstd (legacy)" description: "This package version has been deprecated - use conf-zstd.1.3.8." flags: [ conf deprecated ] -# This package has been disabled in order to simplify the maintenance of -# conf-zstd. conf-zstd.1.3.8 was added to "encode" a build requirement of at -# least version 1.3.8, but this should have been done using an entirely new -# package. -available: false +available: os != "win32" | os-distribution = "cygwinports" From a96bc00d5e4400eb5c9b2233648145027ec2c7e8 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Tue, 12 Mar 2024 09:54:17 +0000 Subject: [PATCH 4/4] Add the depext for opensuse It's either that or adding x-ci-accept-failures! --- packages/conf-zstd/conf-zstd.0.1/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/conf-zstd/conf-zstd.0.1/opam b/packages/conf-zstd/conf-zstd.0.1/opam index efd2262ed46..e144ce168e5 100644 --- a/packages/conf-zstd/conf-zstd.0.1/opam +++ b/packages/conf-zstd/conf-zstd.0.1/opam @@ -11,6 +11,7 @@ depexts: [ ["libzstd-devel"] {os-distribution = "centos"} ["libzstd-devel"] {os-distribution = "rhel"} ["libzstd-devel"] {os-distribution = "fedora"} + ["libzstd-devel"] {os-family = "suse" | os-family = "opensuse"} ["zstd-dev"] {os-distribution = "alpine"} ["zstd"] {os-distribution = "homebrew" & os = "macos"} ["zstd"] {os = "win32" & os-distribution = "cygwinports"}