opam: sync with latest metadata

Changes some download links to stop using the git protocol, updates some dependencies on new libraries and changes the conf-python dependency to depend on python 3 Signed-off-by: Pau Ruiz Safont <pau.ruizsafont@cloud.com>
minglumlu · Jul 14, 2023 · 00c6436 · 00c6436
1 parent bdf7271
commit 00c6436
Show file tree

Hide file tree

Showing 26 changed files with 34 additions and 25 deletions.
diff --git a/forkexec.opam b/forkexec.opam
@@ -3,7 +3,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
 homepage: "https://github.com/xapi-project/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 
 build: [[ "dune" "build" "-p" name "-j" jobs ]]

diff --git a/http-lib.opam b/http-lib.opam
@@ -26,6 +26,7 @@ depends: [
   "xapi-stdext-pervasives"
   "xapi-stdext-threads"
   "xapi-stdext-unix"
+  "xapi-tracing"
   "xml-light2"
   "ounit2" {with-test & >= "2.0.0"}
 ]

diff --git a/message-switch-async.opam b/message-switch-async.opam
@@ -4,7 +4,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [
   ["./configure" "--prefix" "%{prefix}%"]

diff --git a/message-switch-cli.opam b/message-switch-cli.opam
@@ -4,7 +4,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [
   ["./configure" "--prefix" "%{prefix}%"]

diff --git a/message-switch-core.opam b/message-switch-core.opam
@@ -4,7 +4,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [
   ["./configure" "--prefix" "%{prefix}%"]

diff --git a/message-switch-lwt.opam b/message-switch-lwt.opam
@@ -4,7 +4,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [
   ["./configure" "--prefix" "%{prefix}%"]

diff --git a/message-switch-unix.opam b/message-switch-unix.opam
@@ -4,7 +4,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [
   ["./configure" "--prefix" "%{prefix}%"]

diff --git a/message-switch.opam b/message-switch.opam
@@ -4,7 +4,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [
   ["./configure" "--prefix" "%{prefix}%"]

diff --git a/rrd2csv.opam b/rrd2csv.opam
@@ -13,7 +13,7 @@ build: [
 depends: [
   "ocaml"
   "dune"
-  "base-threads"
+  "http-lib"
   "xapi-client"
   "xapi-idl"
   "xapi-rrd"

diff --git a/rrdd-plugin.opam b/rrdd-plugin.opam
@@ -3,7 +3,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api.git"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}

diff --git a/rrdd-plugins.opam b/rrdd-plugins.opam
@@ -5,7 +5,7 @@ authors: [ "xs-devel@lists.xenserver.org" ]
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 build: [[ "dune" "build" "-p" name "-j" jobs ]]
 synopsis: "Plugins registering to the RRD daemon and exposing various metrics"
 depends: [

diff --git a/xapi-forkexecd.opam b/xapi-forkexecd.opam
@@ -3,7 +3,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
 homepage: "https://github.com/xapi-project/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 
 build: [

diff --git a/xapi-idl.opam b/xapi-idl.opam
@@ -2,7 +2,7 @@ opam-version: "2.0"
 authors: "Dave Scott"
 homepage: "https://github.com/xapi-project/xcp-idl"
 bug-reports: "https://github.com/xapi-project/xcp-idl/issues"
-dev-repo: "git://github.com/xapi-project/xcp-idl"
+dev-repo: "https://github.com/xapi-project/xcp-idl.git"
 maintainer: "xen-api@lists.xen.org"
 tags: [ "org:xapi-project" ]
 build: [["dune" "build" "-p" name "-j" jobs]]
@@ -34,6 +34,7 @@ depends: [
   "xapi-stdext-date"
   "xapi-stdext-pervasives"
   "xapi-stdext-threads"
+  "xapi-tracing"
   "xapi-inventory"
   "xmlm"
 ]

diff --git a/xapi-nbd.opam b/xapi-nbd.opam
@@ -21,6 +21,7 @@ depends: [
   "uri"
   "uuid"
   "xapi-inventory"
+  "xapi-tracing"
   "xen-api-client-lwt"
 ]
 tags: [ "org:mirage" "org:xapi-project" ]

diff --git a/xapi-networkd.opam b/xapi-networkd.opam
@@ -13,6 +13,7 @@ depends: [
   "alcotest" {with-test}
   "base-threads"
   "forkexec"
+  "http-lib"
   "mtime"
   "netlink"
   "re"

diff --git a/xapi-open-uri.opam b/xapi-open-uri.opam
@@ -11,8 +11,10 @@ build: [
 available: [ os = "linux" | os = "macos" ]
 depends: [
   "ocaml"
+  "cohttp"
   "dune"
   "stunnel"
+  "uri"
   "xapi-stdext-pervasives"
 ]
 synopsis: "Library required by xapi"

diff --git a/xapi-rrdd-plugin.opam b/xapi-rrdd-plugin.opam
@@ -3,7 +3,7 @@ maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api.git"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 depends: ["ocaml" "rrdd-plugin"]
 synopsis: "A plugin library for the xapi performance monitoring daemon"
 description: """

diff --git a/xapi-rrdd.opam b/xapi-rrdd.opam
@@ -14,6 +14,7 @@ depends: [
   "dune-build-info"
   "astring"
   "gzip"
+  "http-lib"
   "inotify"
   "io-page"
   "mtime"

diff --git a/xapi-squeezed.opam b/xapi-squeezed.opam
@@ -3,7 +3,7 @@ author: "dave.scott@eu.citrix.com"
 maintainer: "xen-api@lists.xen.org"
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api.git"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "build" "-p" name "-j" jobs "@runtest"] {with-test}

diff --git a/xapi-storage-script.opam b/xapi-storage-script.opam
@@ -5,13 +5,13 @@ authors: [ "xen-api@lists.xen.org" ]
 license: "LGPL-2.1-only WITH OCaml-LGPL-linking-exception"
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 tags: [ "org:xapi-project" ]
 build: [[ "dune" "build" "-p" name "-j" jobs ]]
 depends: [
   "ocaml"
   "dune"
-  "conf-python-2-7" {with-test}
+  "conf-python-3" {with-test}
   "xapi-idl" {>= "0.10.0"}
   "xapi-storage"
   "async" {>= "v0.9.0"}

diff --git a/xapi-storage.opam b/xapi-storage.opam
@@ -4,14 +4,14 @@ maintainer: "xen-api@lists.xen.org"
 authors: "xen-api@lists.xen.org"
 homepage: "https://xapi-project.github.io/"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
-dev-repo: "git://github.com/xapi-project/xen-api.git"
+dev-repo: "https://github.com/xapi-project/xen-api.git"
 build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
   "ocaml"
   "dune"
-  "conf-python-2-7"
+  "conf-python-3"
   "ounit" {with-test}
   "alcotest" {with-test}
   "lwt" {with-test}
@@ -21,10 +21,6 @@ depends: [
   "xmlm"
   "cmdliner"
 ]
-# python 2.7 is not enough to ensure the availability of 'python' in these
-depexts: [
-  ["python"] {os-family = "debian"}
-]
 synopsis: "Code and documentation generator for the Xapi storage interface"
 url {
   src: "https://github.com/xapi-project/xen-api/archive/master.tar.gz"

diff --git a/xapi-tracing.opam b/xapi-tracing.opam
@@ -9,10 +9,13 @@ build: [[ "dune" "build" "-p" name "-j" jobs ]]
 available: [ os = "linux" ]
 depends: [
   "ocaml"
+  "cohttp-posix"
   "dune"
   "cohttp"
   "rpclib"
-  "xapi-idl"
+  "xapi-log"
+  "xapi-open-uri"
+  "xapi-stdext-threads"
   "xapi-stdext-unix"
 ]
 synopsis: "Library required by xapi"

diff --git a/xapi-xenopsd.opam b/xapi-xenopsd.opam
@@ -37,6 +37,7 @@ depends: [
   "xapi-stdext-pervasives"
   "xapi-stdext-threads"
   "xapi-stdext-unix"
+  "xapi-tracing"
   "xenstore_transport" {with-test}
   "xmlm"
   "zstd"

diff --git a/xapi.opam b/xapi.opam
@@ -51,13 +51,15 @@ depends: [
   "xapi-cli-protocol"
   "xapi-consts"
   "xapi-datamodel"
+  "xapi-expiry-alerts"
   "xapi-stdext-date"
   "xapi-stdext-pervasives"
   "xapi-stdext-std"
   "xapi-stdext-threads"
   "xapi-stdext-unix"
   "xapi-stdext-zerocheck"
   "xapi-test-utils" {with-test}
+  "xapi-tracing"
   "xapi-types"
   "xapi-xenopsd"
   "xapi-idl"

diff --git a/xen-api-client.opam b/xen-api-client.opam
@@ -14,7 +14,7 @@ build: [
 ]
 depends: [
   "ocaml"
-  "dune" {"1.4"}
+  "dune" {>= "2.0"}
   "astring"
   "cohttp" {>= "0.22.0"}
   "re"

diff --git a/xen-api-sdk.opam b/xen-api-sdk.opam
@@ -3,7 +3,7 @@ name: "xen-api-sdk"
 synopsis: "Xen API SDK generation code"
 maintainer: "xen-api@lists.xen.org"
 authors: [ "xen-api@lists.xen.org" ]
-license: "BSD 2-Clause"
+license: "BSD-2-Clause"
 homepage: "https://github.com/xapi-project/xen-api"
 bug-reports: "https://github.com/xapi-project/xen-api/issues"
 dev-repo: "git+https://github.com/xapi-project/xen-api.git"