upstream: sync contents with upstream repository

There are some tweaks in the conf packages, some tweaks in the dependency versions and change the uri packages location to reflect they are patched Signed-off-by: Pau Ruiz Safont <[email protected]>
xapi-project · Aug 22, 2023 · c3b1aa3 · c3b1aa3
1 parent dc25f4e
commit c3b1aa3
Show file tree

Hide file tree

Showing 42 changed files with 212 additions and 187 deletions.
diff --git a/packages/upstream/arg-complete.0.1.0/opam b/packages/upstream/arg-complete.0.1.0/opam
@@ -1,7 +1,9 @@
 opam-version: "2.0"
+name: "arg-complete"
+version: "0.1.0"
 synopsis: "Bash completion support for Stdlib.Arg"
-maintainer: ["Simmo Saan <[email protected]>"]
-authors: ["Simmo Saan <[email protected]>"]
+maintainer: "Simmo Saan <[email protected]>"
+authors: "Simmo Saan <[email protected]>"
 license: "MIT"
 homepage: "https://github.com/sim642/ocaml-arg-complete"
 doc: "https://sim642.github.io/ocaml-arg-complete"

diff --git a/packages/upstream/batteries.3.6.0/opam b/packages/upstream/batteries.3.6.0/opam
@@ -1,4 +1,6 @@
 opam-version: "2.0"
+name: "batteries"
+version: "3.6.0"
 synopsis: "A community-maintained standard library extension"
 maintainer: [
   "Cedric Cellier <[email protected]>"
@@ -13,7 +15,7 @@ doc: "http://ocaml-batteries-team.github.io/batteries-included/hdoc2/"
 bug-reports:
   "https://github.com/ocaml-batteries-team/batteries-included/issues"
 depends: [
-  "ocaml" {>= "4.02.3"}
+  "ocaml" {>= "4.02.3" & < "5.1"}
   "camlp-streams"
   "ocamlfind" {build & >= "1.5.3"}
   "ocamlbuild" {build}
@@ -23,14 +25,13 @@ depends: [
   "num"
 ]
 conflicts: ["base-effects" "ocaml-option-no-flat-float-array"]
-build: [
-  [make "all"]
-]
+build: [make "all"]
 run-test: [make "test"]
 install: [make "install"]
 dev-repo: "git+https://github.com/ocaml-batteries-team/batteries-included.git"
 url {
-  src: "https://github.com/ocaml-batteries-team/batteries-included/archive/refs/tags/v3.6.0.tar.gz"
+  src:
+    "https://github.com/ocaml-batteries-team/batteries-included/archive/refs/tags/v3.6.0.tar.gz"
   checksum: [
     "md5=1bcb27dfbd130eb057561196ef851649"
     "sha512=2a56611b09a5f1cba6457539f8b6bc87a5f2a5454b36cdb39f6e0d6a5dac6db179aab1ba87c74dd49cc41df31a9a96feb349028ea41df7371ecb47f4d9dfafc4"

diff --git a/packages/upstream/ca-certs.0.2.3/opam b/packages/upstream/ca-certs.0.2.3/opam
@@ -1,15 +1,16 @@
 opam-version: "2.0"
+name: "ca-certs"
+version: "0.2.3"
 synopsis: "Detect root CA certificates from the operating system"
-description: """
+description: """\
 TLS requires a set of root anchors (Certificate Authorities) to
 authenticate servers. This library exposes this list so that it can be
-registered with ocaml-tls.
-"""
-maintainer: ["Etienne Millon <[email protected]>"]
-authors: [
+registered with ocaml-tls."""
+maintainer: "Etienne Millon <[email protected]>"
+authors:
   "Etienne Millon <[email protected]>, Hannes Mehnert <[email protected]>"
-]
 license: "ISC"
+tags: "org:mirage"
 homepage: "https://github.com/mirage/ca-certs"
 doc: "https://mirage.github.io/ca-certs/doc"
 bug-reports: "https://github.com/mirage/ca-certs/issues"
@@ -29,7 +30,6 @@ depends: [
 conflicts: [
   "result" {< "1.5"}
 ]
-dev-repo: "git+https://github.com/mirage/ca-certs.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -40,14 +40,12 @@ build: [
     "-j"
     jobs
     "@install"
-    "@runtest" {with-test & os != "macos"} # the opam sandbox on macos leads to test failures (ocaml/opam#4389)
+    "@runtest" {with-test & os != "macos"}
     "@doc" {with-doc}
   ]
 ]
-tags: ["org:mirage"]
-depexts: [
-  ["ca_root_nss"] {os = "freebsd"}
-]
+depexts: ["ca_root_nss"] {os = "freebsd"}
+dev-repo: "git+https://github.com/mirage/ca-certs.git"
 url {
   src:
     "https://github.com/mirage/ca-certs/releases/download/v0.2.3/ca-certs-0.2.3.tbz"

diff --git a/packages/upstream/conf-autoconf.0.1/opam b/packages/upstream/conf-autoconf.0.1/opam
@@ -1,13 +1,20 @@
 opam-version: "2.0"
+name: "conf-autoconf"
+version: "0.1"
+synopsis: "Virtual package relying on autoconf installation"
+description: """\
+This package can only install if the autoconf command
+is available on the system."""
 maintainer: "[email protected]"
-homepage: "http://www.gnu.org/software/autoconf"
 authors: "https://www.gnu.org/software/autoconf/autoconf.html#maintainer"
-bug-reports: "https://github.com/ocaml/opam-repository/issues"
 license: "GPL-3.0-only"
-build: [
-  ["which" "autoconf"]
+homepage: "http://www.gnu.org/software/autoconf"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+depends: [
+  "conf-which" {build}
 ]
-depends: ["conf-which" {build}]
+flags: conf
+build: ["which" "autoconf"]
 depexts: [
   ["autoconf"] {os-family = "debian"}
   ["autoconf"] {os-distribution = "centos"}
@@ -23,10 +30,5 @@ depexts: [
   ["autoconf"] {os-distribution = "ol"}
   ["autoconf"] {os-distribution = "rhel"}
   ["system:autoconf"] {os = "win32" & os-distribution = "cygwinports"}
-  ["autoconf"] {os-family = "suse"}
+  ["autoconf"] {os-family = "suse" | os-family = "opensuse"}
 ]
-synopsis: "Virtual package relying on autoconf installation"
-description: """
-This package can only install if the autoconf command
-is available on the system."""
-flags: conf
diff --git a/packages/upstream/conf-gcc.1.0/opam b/packages/upstream/conf-gcc.1.0/opam
@@ -1,22 +1,24 @@
 opam-version: "2.0"
+name: "conf-gcc"
+version: "1.0"
+synopsis: "Virtual package relying on the gcc compiler (for C)"
+description:
+  "This package can only install if the gcc compiler is installed on the system."
 maintainer: "[email protected]"
 authors: ["Francois Berenger" "Francois Bobot"]
+license: "GPL-2.0-or-later"
 homepage: "https://github.com/ocaml/opam-repository"
 bug-reports: "https://github.com/ocaml/opam-repository/issues"
-license: "GPL-2.0-or-later"
-build: [["gcc" "--version"]]
+flags: conf
+build: ["gcc" "--version"]
 depexts: [
   ["gcc"] {os-distribution = "centos"}
   ["gcc"] {os-distribution = "fedora"}
-  ["gcc"] {os-distribution = "opensuse"}
+  ["gcc"] {os-family = "suse" | os-distribution = "opensuse"}
   ["gcc"] {os-distribution = "debian"}
   ["gcc"] {os-distribution = "ubuntu"}
   ["gcc"] {os-distribution = "nixos"}
   ["gcc"] {os-distribution = "archlinux"}
   ["gcc"] {os = "macos" & os-distribution = "homebrew"}
   ["gcc-core"] {os = "win32" & os-distribution = "cygwinports"}
 ]
-synopsis: "Virtual package relying on the gcc compiler (for C)"
-description:
-  "This package can only install if the gcc compiler is installed on the system."
-flags: conf
diff --git a/packages/upstream/conf-gmp.4/opam b/packages/upstream/conf-gmp.4/opam
@@ -35,7 +35,7 @@ depexts: [
   ["gmp"] {os = "openbsd"}
   ["gmp"] {os = "freebsd"}
   ["gmp-dev"] {os-distribution = "alpine"}
-  ["gmp-devel"] {os-family = "suse"}
+  ["gmp-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["gmp"] {os = "win32" & os-distribution = "cygwinports"}
   ["gmp"] {os-distribution = "nixos"}
 ]

diff --git a/packages/upstream/conf-libcurl.2/opam b/packages/upstream/conf-libcurl.2/opam
@@ -19,7 +19,7 @@ depexts: [
   ["curl"] {os-distribution = "arch"}
   ["curl"] {os = "win32" & os-distribution = "cygwinports"}
   ["curl-dev"] {os-distribution = "alpine"}
-  ["libcurl-devel"] {os-family = "suse"}
+  ["libcurl-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["libcurl-devel"] {os-distribution = "fedora"}
   ["libcurl-devel"] {os-distribution = "ol"}
   ["curl"] {os-distribution = "homebrew" & os = "macos"}

diff --git a/packages/upstream/conf-libev.4-12/opam b/packages/upstream/conf-libev.4-12/opam
@@ -26,7 +26,7 @@ depexts: [
   ["libev-devel"] {os-distribution = "rhel"}
   ["libev-devel"] {os-distribution = "centos"}
   ["libev-devel"] {os-distribution = "ol" & os-version >= "8"}
-  ["libev-devel"] {os-family = "suse"}
+  ["libev-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["libev"] {os = "freebsd"}
   ["libev"] {os = "openbsd"}
   ["libev"] {os-distribution = "nixos"}

diff --git a/packages/upstream/conf-libffi.2.0.0/opam b/packages/upstream/conf-libffi.2.0.0/opam
@@ -23,7 +23,7 @@ depexts: [
   ["libffi-devel"] {os-distribution = "fedora"}
   ["libffi-devel"] {os-distribution = "mageia"}
   ["libffi-devel"] {os-distribution = "ol"}
-  ["libffi-devel"] {os-family = "suse"}
+  ["libffi-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["libffi"] {os = "freebsd"}
   ["libffi"] {os = "win32" & os-distribution = "cygwinports"}
   ["libffi"] {os-distribution = "nixos"}

diff --git a/packages/upstream/conf-libnl3.1/opam b/packages/upstream/conf-libnl3.1/opam
@@ -22,7 +22,7 @@ depexts: [
   ["libnl3" "libnl3-devel"]
     {os-distribution = "centos" | os-distribution = "fedora"}
   ["libnl3" "libnl3-devel"] {os-distribution = "ol" & os-version >= "8"}
-  ["libnl3-devel"] {os-family = "suse"}
+  ["libnl3-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["libnl"] {os-family = "arch"}
   ["libnl3-dev"] {os-family = "alpine"}
 ]

diff --git a/packages/upstream/conf-libssl.4/opam b/packages/upstream/conf-libssl.4/opam
@@ -21,13 +21,14 @@ build: [
 ]
 install:
   ["sh" "-ex" "./homebrew.sh" "install" lib] {os-distribution = "homebrew"}
+build-env: HOMEBREW_NO_AUTO_UPDATE = "1"
 depexts: [
   ["libssl-dev"] {os-family = "debian"}
   ["libssl-dev"] {os-family = "ubuntu"}
   ["openssl-devel"] {os-distribution = "centos"}
   ["openssl-devel"] {os-distribution = "ol"}
   ["openssl-devel"] {os-distribution = "fedora"}
-  ["libopenssl-devel"] {os-family = "suse"}
+  ["libopenssl-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["openssl-dev"] {os-family = "alpine"}
   ["openssl"] {os-family = "arch"}
   ["openssl"] {os-distribution = "homebrew"}

diff --git a/packages/upstream/conf-linux-libc-dev.0/opam b/packages/upstream/conf-linux-libc-dev.0/opam
@@ -19,7 +19,7 @@ build: [
 depexts: [
   ["linux-libc-dev"] {os-family = "debian"}
   ["linux-libc-dev"] {os-family = "ubuntu"}
-  ["linux-glibc-devel"] {os-family = "suse"}
+  ["linux-glibc-devel"] {os-family = "suse" | os-family = "opensuse"}
   ["kernel-headers"]
     {os-distribution = "fedora" | os-distribution = "rhel" |
      os-distribution = "centos" |

diff --git a/packages/upstream/conf-python-3.9.0.0/opam b/packages/upstream/conf-python-3.9.0.0/opam
@@ -22,7 +22,7 @@ depexts: [
   ["python3"] {os-distribution = "fedora"}
   ["python3"] {os-distribution = "ol"}
   ["python"] {os-distribution = "arch"}
-  ["python3"] {os-family = "suse"}
+  ["python3"] {os-family = "suse" | os-family = "opensuse"}
   ["dev-lang/python:3.6"] {os-distribution = "gentoo"}
   ["python3"] {os = "openbsd"}
   ["lang/python39"] {os = "netbsd"}

diff --git a/...ges/upstream/conf-which/conf-which.1/opam → packages/upstream/conf-which.1/opam b/...ges/upstream/conf-which/conf-which.1/opam → packages/upstream/conf-which.1/opam
@@ -1,21 +1,23 @@
 opam-version: "2.0"
+name: "conf-which"
+version: "1"
+synopsis: "Virtual package relying on which"
+description:
+  "This package can only install if the which program is installed on the system."
 maintainer: "[email protected]"
-homepage: "http://www.gnu.org/software/which/"
 authors: "Carlo Wood"
-bug-reports: "https://github.com/ocaml/opam-repository/issues"
 license: "GPL-2.0-or-later"
-build: [["which" "which"]]
+homepage: "http://www.gnu.org/software/which/"
+bug-reports: "https://github.com/ocaml/opam-repository/issues"
+flags: conf
+build: ["which" "which"]
 depexts: [
   ["which"] {os-distribution = "centos"}
   ["which"] {os-distribution = "fedora"}
   ["which"] {os-distribution = "ol"}
-  ["which"] {os-family = "suse"}
+  ["which"] {os-family = "suse" | os-family = "opensuse"}
   ["debianutils"] {os-family = "debian"}
   ["debianutils"] {os-family = "ubuntu"}
   ["which"] {os-distribution = "nixos"}
   ["which"] {os-family = "arch"}
 ]
-synopsis: "Virtual package relying on which"
-description:
-  "This package can only install if the which program is installed on the system."
-flags: conf
diff --git a/packages/upstream/core.v0.15.1/opam b/packages/upstream/core.v0.15.1/opam
@@ -15,7 +15,7 @@ homepage: "https://github.com/janestreet/core"
 doc: "https://ocaml.janestreet.com/ocaml-core/latest/doc/core/index.html"
 bug-reports: "https://github.com/janestreet/core/issues"
 depends: [
-  "ocaml" {>= "4.11.0"}
+  "ocaml" {>= "4.11.0" & < "5.1~"}
   "base" {>= "v0.15.1" & < "v0.16"}
   "base_bigstring" {>= "v0.15" & < "v0.16"}
   "base_quickcheck" {>= "v0.15" & < "v0.16"}

diff --git a/packages/upstream/cpu.2.0.0/opam b/packages/upstream/cpu.2.0.0/opam
@@ -1,29 +1,30 @@
 opam-version: "2.0"
-authors: "Roberto Di Cosmo <[email protected]>"
+name: "cpu"
+version: "2.0.0"
+synopsis: "Pin current process to given core number"
+description: """\
+The module installed is called Cpu; in order to not conflic
+with the Setcore module that is installed by parmap.
+
+This library can also get the number of CPU cores online."""
 maintainer: "[email protected]"
 license: "LGPL-2.0-or-later WITH OCaml-LGPL-linking-exception"
+authors: "Roberto Di Cosmo <[email protected]>"
 homepage: "https://github.com/UnixJunkie/cpu"
-dev-repo: "git+https://github.com/UnixJunkie/cpu.git"
 bug-reports: "https://github.com/UnixJunkie/cpu/issues"
+depends: [
+  "conf-autoconf" {build}
+  "ocaml"
+  "dune" {>= "1.11.0"}
+]
 build: [
   ["autoconf"]
   ["autoheader"]
   ["./configure"]
   ["dune" "build" "-p" name "-j" jobs]
 ]
-depends: [
-  "conf-autoconf" {build}
-  "ocaml"
-  "dune" {>= "1.11.0"}
-]
-synopsis: "Pin current process to given core number"
-description: "
-The module installed is called Cpu; in order to not conflic
-with the Setcore module that is installed by parmap.
-
-This library can also get the number of CPU cores online.
-"
+dev-repo: "git+https://github.com/UnixJunkie/cpu.git"
 url {
- src: "https://github.com/UnixJunkie/cpu/archive/v2.0.0.tar.gz"
- checksum: "md5=644ca40ddbe7c34f8431ec3868958aec"
+  src: "https://github.com/UnixJunkie/cpu/archive/v2.0.0.tar.gz"
+  checksum: "md5=644ca40ddbe7c34f8431ec3868958aec"
 }
diff --git a/packages/upstream/dune-private-libs.3.6.2/opam b/packages/upstream/dune-private-libs.3.6.2/opam
@@ -1,16 +1,17 @@
 opam-version: "2.0"
+name: "dune-private-libs"
+version: "3.6.2"
 synopsis: "Private libraries of Dune"
-description: """
+description: """\
 !!!!!!!!!!!!!!!!!!!!!!
 !!!!! DO NOT USE !!!!!
 !!!!!!!!!!!!!!!!!!!!!!
 
 This package contains code that is shared between various dune-xxx
 packages. However, it is not meant for public consumption and provides
-no stability guarantee.
-"""
-maintainer: ["Jane Street Group, LLC <[email protected]>"]
-authors: ["Jane Street Group, LLC <[email protected]>"]
+no stability guarantee."""
+maintainer: "Jane Street Group, LLC <[email protected]>"
+authors: "Jane Street Group, LLC <[email protected]>"
 license: "MIT"
 homepage: "https://github.com/ocaml/dune"
 doc: "https://dune.readthedocs.io/"
@@ -24,22 +25,13 @@ depends: [
   "ocaml" {>= "4.08"}
   "odoc" {with-doc}
 ]
-dev-repo: "git+https://github.com/ocaml/dune.git"
 build: [
   ["dune" "subst"] {dev}
   ["rm" "-rf" "vendor/csexp"]
   ["rm" "-rf" "vendor/pp"]
-  [
-    "dune"
-    "build"
-    "-p"
-    name
-    "-j"
-    jobs
-    "@install"
-    "@doc" {with-doc}
-  ]
+  ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}]
 ]
+dev-repo: "git+https://github.com/ocaml/dune.git"
 url {
   src: "https://github.com/ocaml/dune/releases/download/3.6.2/dune-3.6.2.tbz"
   checksum: [