Merge pull request #25441 from dra27/simplify-zstd

Disable conf-zstd.0.1
ocaml · Mar 13, 2024 · 4eb1787 · 4eb1787
2 parents 64f8483 + a96bc00
commit 4eb1787
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/conf-zstd/conf-zstd.0.1/opam b/packages/conf-zstd/conf-zstd.0.1/opam
@@ -11,12 +11,12 @@ 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"}
 ]
-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 ]
+available: os != "win32" | os-distribution = "cygwinports"
diff --git 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"}

diff --git 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
@@ -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"}
 ]