From cc601a62c2de31cfc79bd6e700b5b23641585396 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 8 Nov 2024 13:56:50 +0000 Subject: [PATCH 1/8] vhd-format: update metadata The versions in the metadata didn't reflect the actual requirements Signed-off-by: Pau Ruiz Safont --- packages/vhd-format-lwt/vhd-format-lwt.master/opam | 12 ++++++------ packages/vhd-format/vhd-format.master/opam | 9 ++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/packages/vhd-format-lwt/vhd-format-lwt.master/opam b/packages/vhd-format-lwt/vhd-format-lwt.master/opam index 6dec1fd9..5287c18a 100644 --- a/packages/vhd-format-lwt/vhd-format-lwt.master/opam +++ b/packages/vhd-format-lwt/vhd-format-lwt.master/opam @@ -17,16 +17,16 @@ homepage: "https://github.com/mirage/ocaml-vhd" bug-reports: "https://github.com/mirage/ocaml-vhd/issues" depends: [ "dune" {>= "3.15"} - "ocaml" {>= "4.02.3" & < "5.0.0"} + "ocaml" {>= "4.10"} "alcotest" {with-test} - "alcotest-lwt" {with-test} - "bigarray-compat" - "cstruct" {< "6.1.0"} + "alcotest-lwt" {with-test & >= "1.0.0"} + "bigarray-compat" {>= "1.1.0"} + "cstruct" {>= "6.0.0"} "cstruct-lwt" "fmt" {with-test} "lwt" {>= "3.2.0"} - "mirage-block" {>= "2.0.1"} - "rresult" + "mirage-block" {>= "3.0.0"} + "rresult" {>= "0.7.0"} "vhd-format" {= version} "io-page" {with-test & >= "2.4.0"} "odoc" {with-doc} diff --git a/packages/vhd-format/vhd-format.master/opam b/packages/vhd-format/vhd-format.master/opam index 59c7d812..7b95114e 100644 --- a/packages/vhd-format/vhd-format.master/opam +++ b/packages/vhd-format/vhd-format.master/opam @@ -17,15 +17,14 @@ homepage: "https://github.com/mirage/ocaml-vhd" doc: "https://mirage.github.io/ocaml-vhd/" bug-reports: "https://github.com/mirage/ocaml-vhd/issues" depends: [ - "ocaml" {>= "4.03.0"} - "bigarray-compat" - "cstruct" {>= "1.9" & < "6.1.0"} "dune" {>= "3.15"} + "ocaml" {>= "4.10.0"} + "bigarray-compat" {>= "1.1.0"} + "cstruct" {>= "6.0.0"} "io-page" "rresult" {>= "0.3.0"} - "uuidm" {>= "0.9.6"} + "uuidm" {>= "0.9.9"} "stdlib-shims" - "dune" {>= "1.0"} "ppx_cstruct" {build & >= "3.0.0"} ] available: os = "linux" | os = "macos" From 55615f328b7865134b97d8791825767c1350b599 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 8 Nov 2024 14:12:11 +0000 Subject: [PATCH 2/8] packages: update cstruct to 6.2.0 Signed-off-by: Pau Ruiz Safont --- .../opam | 12 ++++++------ .../opam | 10 +++++----- .../{cstruct.6.0.1 => cstruct.6.2.0}/opam | 16 ++++++++-------- .../opam | 13 ++++++------- 4 files changed, 25 insertions(+), 26 deletions(-) rename packages/cstruct-lwt/{cstruct-lwt.6.0.1 => cstruct-lwt.6.2.0}/opam (76%) rename packages/cstruct-unix/{cstruct-unix.6.0.1 => cstruct-unix.6.2.0}/opam (77%) rename packages/cstruct/{cstruct.6.0.1 => cstruct.6.2.0}/opam (73%) rename packages/ppx_cstruct/{ppx_cstruct.6.0.1 => ppx_cstruct.6.2.0}/opam (79%) diff --git a/packages/cstruct-lwt/cstruct-lwt.6.0.1/opam b/packages/cstruct-lwt/cstruct-lwt.6.2.0/opam similarity index 76% rename from packages/cstruct-lwt/cstruct-lwt.6.0.1/opam rename to packages/cstruct-lwt/cstruct-lwt.6.2.0/opam index 9fc93165..6946f17d 100644 --- a/packages/cstruct-lwt/cstruct-lwt.6.0.1/opam +++ b/packages/cstruct-lwt/cstruct-lwt.6.2.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "cstruct-lwt" -version: "6.0.1" +version: "6.2.0" synopsis: "Access C-like structures directly from OCaml" description: """\ Cstruct is a library and syntax extension to make it easier to access C-like @@ -25,7 +25,7 @@ homepage: "https://github.com/mirage/ocaml-cstruct" doc: "https://mirage.github.io/ocaml-cstruct/" bug-reports: "https://github.com/mirage/ocaml-cstruct/issues" depends: [ - "ocaml" {>= "4.03.0"} + "ocaml" {>= "4.08.0"} "base-unix" "dune" {>= "2.0.0"} "lwt" @@ -38,10 +38,10 @@ build: [ dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git" url { src: - "https://github.com/mirage/ocaml-cstruct/releases/download/v6.0.1/cstruct-v6.0.1.tbz" + "https://github.com/mirage/ocaml-cstruct/releases/download/v6.2.0/cstruct-6.2.0.tbz" checksum: [ - "sha256=4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed" - "sha512=3eeeb6ae0fd3b625cf1d308498f0a1e6951d16566561f3362fdf74e7158d92d8f6c6d9fa968ff15f8c19a1886dce99d0ef17b44dbb37b97cc68c9b088fdc2248" + "sha256=9a78073392580e8349148fa3ab4b1b2e989dc9d30d07401b04c96b7c60f03e62" + "sha512=8d33fe6b3707a3994d0225cd33cadde0bb2ca834ef01096e3df33a08e4a8c6d02ebccddf558a73988b8a5595b65fdc10de61efbf872c6c9e55c719c7e19c463d" ] } -x-commit-hash: "28dade8963a9edfddeb8dba782a8eae0341e80d4" +x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607" diff --git a/packages/cstruct-unix/cstruct-unix.6.0.1/opam b/packages/cstruct-unix/cstruct-unix.6.2.0/opam similarity index 77% rename from packages/cstruct-unix/cstruct-unix.6.0.1/opam rename to packages/cstruct-unix/cstruct-unix.6.2.0/opam index e4d3c6ad..9a6e2120 100644 --- a/packages/cstruct-unix/cstruct-unix.6.0.1/opam +++ b/packages/cstruct-unix/cstruct-unix.6.2.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "cstruct-unix" -version: "6.0.1" +version: "6.2.0" synopsis: "Access C-like structures directly from OCaml" description: """\ Cstruct is a library and syntax extension to make it easier to access C-like @@ -37,10 +37,10 @@ build: [ dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git" url { src: - "https://github.com/mirage/ocaml-cstruct/releases/download/v6.0.1/cstruct-v6.0.1.tbz" + "https://github.com/mirage/ocaml-cstruct/releases/download/v6.2.0/cstruct-6.2.0.tbz" checksum: [ - "sha256=4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed" - "sha512=3eeeb6ae0fd3b625cf1d308498f0a1e6951d16566561f3362fdf74e7158d92d8f6c6d9fa968ff15f8c19a1886dce99d0ef17b44dbb37b97cc68c9b088fdc2248" + "sha256=9a78073392580e8349148fa3ab4b1b2e989dc9d30d07401b04c96b7c60f03e62" + "sha512=8d33fe6b3707a3994d0225cd33cadde0bb2ca834ef01096e3df33a08e4a8c6d02ebccddf558a73988b8a5595b65fdc10de61efbf872c6c9e55c719c7e19c463d" ] } -x-commit-hash: "28dade8963a9edfddeb8dba782a8eae0341e80d4" +x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607" diff --git a/packages/cstruct/cstruct.6.0.1/opam b/packages/cstruct/cstruct.6.2.0/opam similarity index 73% rename from packages/cstruct/cstruct.6.0.1/opam rename to packages/cstruct/cstruct.6.2.0/opam index 9b8ee5f4..99de36e3 100644 --- a/packages/cstruct/cstruct.6.0.1/opam +++ b/packages/cstruct/cstruct.6.2.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "cstruct" -version: "6.0.1" +version: "6.2.0" synopsis: "Access C-like structures directly from OCaml" description: """\ Cstruct is a library and syntax extension to make it easier to access C-like @@ -26,11 +26,11 @@ homepage: "https://github.com/mirage/ocaml-cstruct" doc: "https://mirage.github.io/ocaml-cstruct/" bug-reports: "https://github.com/mirage/ocaml-cstruct/issues" depends: [ - "ocaml" {>= "4.03.0"} + "ocaml" {>= "4.08.0"} "dune" {>= "2.0.0"} - "bigarray-compat" "alcotest" {with-test} - ("crowbar" {with-test} | "ocaml" {with-test & < "4.08"}) + "fmt" {>= "0.8.9"} + "crowbar" {with-test} ] conflicts: [ "js_of_ocaml" {< "3.5.0"} @@ -43,10 +43,10 @@ build: [ dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git" url { src: - "https://github.com/mirage/ocaml-cstruct/releases/download/v6.0.1/cstruct-v6.0.1.tbz" + "https://github.com/mirage/ocaml-cstruct/releases/download/v6.2.0/cstruct-6.2.0.tbz" checksum: [ - "sha256=4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed" - "sha512=3eeeb6ae0fd3b625cf1d308498f0a1e6951d16566561f3362fdf74e7158d92d8f6c6d9fa968ff15f8c19a1886dce99d0ef17b44dbb37b97cc68c9b088fdc2248" + "sha256=9a78073392580e8349148fa3ab4b1b2e989dc9d30d07401b04c96b7c60f03e62" + "sha512=8d33fe6b3707a3994d0225cd33cadde0bb2ca834ef01096e3df33a08e4a8c6d02ebccddf558a73988b8a5595b65fdc10de61efbf872c6c9e55c719c7e19c463d" ] } -x-commit-hash: "28dade8963a9edfddeb8dba782a8eae0341e80d4" +x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607" diff --git a/packages/ppx_cstruct/ppx_cstruct.6.0.1/opam b/packages/ppx_cstruct/ppx_cstruct.6.2.0/opam similarity index 79% rename from packages/ppx_cstruct/ppx_cstruct.6.0.1/opam rename to packages/ppx_cstruct/ppx_cstruct.6.2.0/opam index d745e512..e9173a20 100644 --- a/packages/ppx_cstruct/ppx_cstruct.6.0.1/opam +++ b/packages/ppx_cstruct/ppx_cstruct.6.2.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ppx_cstruct" -version: "6.0.1" +version: "6.2.0" synopsis: "Access C-like structures directly from OCaml" description: """\ Cstruct is a library and syntax extension to make it easier to access C-like @@ -25,7 +25,7 @@ homepage: "https://github.com/mirage/ocaml-cstruct" doc: "https://mirage.github.io/ocaml-cstruct/" bug-reports: "https://github.com/mirage/ocaml-cstruct/issues" depends: [ - "ocaml" {>= "4.07.0"} + "ocaml" {>= "4.08.0"} "dune" {>= "2.0.0"} "cstruct" {= version} "ounit" {with-test} @@ -35,7 +35,6 @@ depends: [ "cstruct-sexp" {with-test} "cppo" {with-test} "cstruct-unix" {with-test & = version} - "stdlib-shims" "ocaml-migrate-parsetree" {>= "2.1.0" & with-test} "lwt_ppx" {>= "2.0.2" & with-test} ] @@ -47,10 +46,10 @@ build: [ dev-repo: "git+https://github.com/mirage/ocaml-cstruct.git" url { src: - "https://github.com/mirage/ocaml-cstruct/releases/download/v6.0.1/cstruct-v6.0.1.tbz" + "https://github.com/mirage/ocaml-cstruct/releases/download/v6.2.0/cstruct-6.2.0.tbz" checksum: [ - "sha256=4a67bb8f042753453c59eabf0e47865631253ba694091ce6062aac05d47a9bed" - "sha512=3eeeb6ae0fd3b625cf1d308498f0a1e6951d16566561f3362fdf74e7158d92d8f6c6d9fa968ff15f8c19a1886dce99d0ef17b44dbb37b97cc68c9b088fdc2248" + "sha256=9a78073392580e8349148fa3ab4b1b2e989dc9d30d07401b04c96b7c60f03e62" + "sha512=8d33fe6b3707a3994d0225cd33cadde0bb2ca834ef01096e3df33a08e4a8c6d02ebccddf558a73988b8a5595b65fdc10de61efbf872c6c9e55c719c7e19c463d" ] } -x-commit-hash: "28dade8963a9edfddeb8dba782a8eae0341e80d4" +x-commit-hash: "8c7c94a038aae72dc89c994551c9d2c690895607" From 78ae6bc147e0853fbb39529e2302a613be11eef1 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 8 Nov 2024 14:17:18 +0000 Subject: [PATCH 3/8] packages update lwt to 5.8.0 minor enhancements: Lwt.fail no uses raise for better backtrace generation, removal of warnings in C code. Signed-off-by: Pau Ruiz Safont --- packages/lwt/{lwt.5.7.0 => lwt.5.8.0}/opam | 28 +++++++++++++++------- 1 file changed, 20 insertions(+), 8 deletions(-) rename packages/lwt/{lwt.5.7.0 => lwt.5.8.0}/opam (71%) diff --git a/packages/lwt/lwt.5.7.0/opam b/packages/lwt/lwt.5.8.0/opam similarity index 71% rename from packages/lwt/lwt.5.7.0/opam rename to packages/lwt/lwt.5.8.0/opam index 8aebd0f2..f27a10b9 100644 --- a/packages/lwt/lwt.5.7.0/opam +++ b/packages/lwt/lwt.5.8.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "lwt" -version: "5.7.0" +version: "5.8.0" synopsis: "Promises and event-driven I/O" description: """\ A promise is a value that may become determined in the future. @@ -20,15 +20,17 @@ homepage: "https://github.com/ocsigen/lwt" doc: "https://ocsigen.org/lwt" bug-reports: "https://github.com/ocsigen/lwt/issues" depends: [ + "dune" {>= "1.12"} + "ocaml" {>= "4.08"} "cppo" {build & >= "1.1.0"} - "dune" {>= "1.8.0"} + "ocamlfind" {dev & >= "1.7.3-1"} + "odoc" {with-doc & >= "2.3.0"} "dune-configurator" - "ocaml" {>= "4.08"} "ocplib-endian" - "ocamlfind" {dev & >= "1.7.3-1"} ] depopts: ["base-threads" "base-unix" "conf-libev"] build: [ + ["dune" "subst"] {dev} [ "dune" "exec" @@ -40,13 +42,23 @@ build: [ "--use-libev" "%{conf-libev:installed}%" ] - ["dune" "build" "-p" name "-j" jobs] + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] ] dev-repo: "git+https://github.com/ocsigen/lwt.git" url { - src: "https://github.com/ocsigen/lwt/archive/refs/tags/5.7.0.tar.gz" + src: "https://github.com/ocsigen/lwt/archive/refs/tags/5.8.0.tar.gz" checksum: [ - "md5=737039d29d45b2d2b35db6931c8d75c6" - "sha512=42e629920783428673b99c9d7a639237c9e6b35079b5d907bc67e7ea506acf9edadc48cec580bdcfd2410ed9412bf5e6bcc8b09de2fa7d35ce1490973d05ddd1" + "md5=2682558f405ab7c8638eeb16d0f9f46f" + "sha512=7f6548a1b1dbfdbc98d9352151ca7be97fa2ab63dbcc429208ce8d08308eee13f7fce31e0cca53f8880233959a60212d622270dd51bf164c3ee272f179769bd9" ] } From 1ae8926a114bee2c8ccc4024ecb3a1d93449db22 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 8 Nov 2024 14:19:29 +0000 Subject: [PATCH 4/8] packages: update ppx_deriving to 6.0.3 minor: compatibility with ocaml 5.3 Signed-off-by: Pau Ruiz Safont --- .../{ppx_deriving.6.0.2 => ppx_deriving.6.0.3}/opam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename packages/ppx_deriving/{ppx_deriving.6.0.2 => ppx_deriving.6.0.3}/opam (76%) diff --git a/packages/ppx_deriving/ppx_deriving.6.0.2/opam b/packages/ppx_deriving/ppx_deriving.6.0.3/opam similarity index 76% rename from packages/ppx_deriving/ppx_deriving.6.0.2/opam rename to packages/ppx_deriving/ppx_deriving.6.0.3/opam index c471e614..2f1ffc75 100644 --- a/packages/ppx_deriving/ppx_deriving.6.0.2/opam +++ b/packages/ppx_deriving/ppx_deriving.6.0.3/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ppx_deriving" -version: "6.0.2" +version: "6.0.3" synopsis: "Type-driven code generation for OCaml" description: """\ ppx_deriving provides common infrastructure for generating @@ -31,10 +31,10 @@ build: [ dev-repo: "git+https://github.com/ocaml-ppx/ppx_deriving.git" url { src: - "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v6.0.2/ppx_deriving-6.0.2.tbz" + "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v6.0.3/ppx_deriving-6.0.3.tbz" checksum: [ - "sha256=7abacfc5934a1442047e110dc9128c0b0c6cd1fef19ee3429ac8b26ed3632b94" - "sha512=515e53d62aea4100bbbd8dc2421fc80ebe0976699dbd0e1786b672567fe9067ca8925731f2a72bca093bf759ee0d65a1a0caafeedbda28771bf0026425a8040b" + "sha256=374aa97b32c5e01c09a97810a48bfa218c213b5b649e4452101455ac19c94a6d" + "sha512=971443a5df0acbdad577360deed8c9af137695bec6d826ef517a382941371f3546aef53456dda7c89d0ed30fefadf45d5dae2a8b1940a75aee7f7382c68cedb0" ] } -x-commit-hash: "32f7c31ecfcbca6d53f3655a00e8852f4751123e" +x-commit-hash: "275140702ca6f97e0407f80e86de9d3940ee3ac8" From 6d5da3e22f0a6586cc5eebd9e4fbee3cef4c0954 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 8 Nov 2024 14:34:42 +0000 Subject: [PATCH 5/8] packages: update dune to 3.16.1 minor: fix for compiling cpp code under ocaml 5.3 Signed-off-by: Pau Ruiz Safont --- .../opam | 10 +++++----- .../opam | 10 +++++----- .../opam | 10 +++++----- .../opam | 12 ++++++------ .../{dune-rpc.3.16.0 => dune-rpc.3.16.1}/opam | 12 ++++++------ .../{dune-site.3.16.0 => dune-site.3.16.1}/opam | 10 +++++----- packages/dune/{dune.3.16.0 => dune.3.16.1}/opam | 10 +++++----- packages/dyn/{dyn.3.16.0 => dyn.3.16.1}/opam | 12 ++++++------ .../{ocamlc-loc.3.16.0 => ocamlc-loc.3.16.1}/opam | 10 +++++----- .../{ordering.3.16.0 => ordering.3.16.1}/opam | 10 +++++----- .../stdune/{stdune.3.16.0 => stdune.3.16.1}/opam | 12 ++++++------ packages/xdg/{xdg.3.16.0 => xdg.3.16.1}/opam | 10 +++++----- 12 files changed, 64 insertions(+), 64 deletions(-) rename packages/chrome-trace/{chrome-trace.3.16.0 => chrome-trace.3.16.1}/opam (67%) rename packages/dune-build-info/{dune-build-info.3.16.0 => dune-build-info.3.16.1}/opam (74%) rename packages/dune-configurator/{dune-configurator.3.16.0 => dune-configurator.3.16.1}/opam (74%) rename packages/dune-private-libs/{dune-private-libs.3.16.0 => dune-private-libs.3.16.1}/opam (71%) rename packages/dune-rpc/{dune-rpc.3.16.0 => dune-rpc.3.16.1}/opam (65%) rename packages/dune-site/{dune-site.3.16.0 => dune-site.3.16.1}/opam (65%) rename packages/dune/{dune.3.16.0 => dune.3.16.1}/opam (82%) rename packages/dyn/{dyn.3.16.0 => dyn.3.16.1}/opam (63%) rename packages/ocamlc-loc/{ocamlc-loc.3.16.0 => ocamlc-loc.3.16.1}/opam (69%) rename packages/ordering/{ordering.3.16.0 => ordering.3.16.1}/opam (64%) rename packages/stdune/{stdune.3.16.0 => stdune.3.16.1}/opam (67%) rename packages/xdg/{xdg.3.16.0 => xdg.3.16.1}/opam (67%) diff --git a/packages/chrome-trace/chrome-trace.3.16.0/opam b/packages/chrome-trace/chrome-trace.3.16.1/opam similarity index 67% rename from packages/chrome-trace/chrome-trace.3.16.0/opam rename to packages/chrome-trace/chrome-trace.3.16.1/opam index 42ab99c4..a5598d18 100644 --- a/packages/chrome-trace/chrome-trace.3.16.0/opam +++ b/packages/chrome-trace/chrome-trace.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "chrome-trace" -version: "3.16.0" +version: "3.16.1" synopsis: "Chrome trace event generation library" description: "This library offers no backwards compatibility guarantees. Use at your own risk." @@ -24,10 +24,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dune-build-info/dune-build-info.3.16.0/opam b/packages/dune-build-info/dune-build-info.3.16.1/opam similarity index 74% rename from packages/dune-build-info/dune-build-info.3.16.0/opam rename to packages/dune-build-info/dune-build-info.3.16.1/opam index 68636ed5..52a0e0f9 100644 --- a/packages/dune-build-info/dune-build-info.3.16.0/opam +++ b/packages/dune-build-info/dune-build-info.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dune-build-info" -version: "3.16.0" +version: "3.16.1" synopsis: "Embed build information inside executable" description: """\ The build-info library allows to access information about how the @@ -29,10 +29,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dune-configurator/dune-configurator.3.16.0/opam b/packages/dune-configurator/dune-configurator.3.16.1/opam similarity index 74% rename from packages/dune-configurator/dune-configurator.3.16.0/opam rename to packages/dune-configurator/dune-configurator.3.16.1/opam index b18ba32e..43565a21 100644 --- a/packages/dune-configurator/dune-configurator.3.16.0/opam +++ b/packages/dune-configurator/dune-configurator.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dune-configurator" -version: "3.16.0" +version: "3.16.1" synopsis: "Helper library for gathering system configuration" description: """\ dune-configurator is a small library that helps writing OCaml scripts that @@ -33,10 +33,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dune-private-libs/dune-private-libs.3.16.0/opam b/packages/dune-private-libs/dune-private-libs.3.16.1/opam similarity index 71% rename from packages/dune-private-libs/dune-private-libs.3.16.0/opam rename to packages/dune-private-libs/dune-private-libs.3.16.1/opam index 18d16fcd..719b96c4 100644 --- a/packages/dune-private-libs/dune-private-libs.3.16.0/opam +++ b/packages/dune-private-libs/dune-private-libs.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dune-private-libs" -version: "3.16.0" +version: "3.16.1" synopsis: "Private libraries of Dune" description: """\ !!!!!!!!!!!!!!!!!!!!!! @@ -19,7 +19,7 @@ bug-reports: "https://github.com/ocaml/dune/issues" depends: [ "dune" {>= "3.12"} "csexp" {>= "1.5.0"} - "pp" {>= "1.1.0" & < "2.0.0"} + "pp" {>= "1.1.0"} "dyn" {= version} "stdune" {= version} "ocaml" {>= "4.08"} @@ -34,10 +34,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dune-rpc/dune-rpc.3.16.0/opam b/packages/dune-rpc/dune-rpc.3.16.1/opam similarity index 65% rename from packages/dune-rpc/dune-rpc.3.16.0/opam rename to packages/dune-rpc/dune-rpc.3.16.1/opam index af0aecf1..29479ac3 100644 --- a/packages/dune-rpc/dune-rpc.3.16.0/opam +++ b/packages/dune-rpc/dune-rpc.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dune-rpc" -version: "3.16.0" +version: "3.16.1" synopsis: "Communicate with dune using rpc" description: "Library to connect and control a running dune instance" maintainer: "Jane Street Group, LLC " @@ -16,7 +16,7 @@ depends: [ "dyn" "xdg" "stdune" {= version} - "pp" {>= "1.1.0" & < "2.0.0"} + "pp" {>= "1.1.0"} "odoc" {with-doc} ] build: [ @@ -28,10 +28,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dune-site/dune-site.3.16.0/opam b/packages/dune-site/dune-site.3.16.1/opam similarity index 65% rename from packages/dune-site/dune-site.3.16.0/opam rename to packages/dune-site/dune-site.3.16.1/opam index f38af39d..8b355c7e 100644 --- a/packages/dune-site/dune-site.3.16.0/opam +++ b/packages/dune-site/dune-site.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dune-site" -version: "3.16.0" +version: "3.16.1" synopsis: "Embed locations information inside executable and libraries" maintainer: "Jane Street Group, LLC " authors: "Jane Street Group, LLC " @@ -22,10 +22,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dune/dune.3.16.0/opam b/packages/dune/dune.3.16.1/opam similarity index 82% rename from packages/dune/dune.3.16.0/opam rename to packages/dune/dune.3.16.1/opam index 87c3dd63..557878b7 100644 --- a/packages/dune/dune.3.16.0/opam +++ b/packages/dune/dune.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dune" -version: "3.16.0" +version: "3.16.1" synopsis: "Fast, portable, and opinionated build system" description: """\ Dune is a build system that was designed to simplify the release of @@ -56,10 +56,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/dyn/dyn.3.16.0/opam b/packages/dyn/dyn.3.16.1/opam similarity index 63% rename from packages/dyn/dyn.3.16.0/opam rename to packages/dyn/dyn.3.16.1/opam index 1b2d2416..c73fe00b 100644 --- a/packages/dyn/dyn.3.16.0/opam +++ b/packages/dyn/dyn.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "dyn" -version: "3.16.0" +version: "3.16.1" synopsis: "Dynamic type" description: "Dynamic type" maintainer: "Jane Street Group, LLC " @@ -13,7 +13,7 @@ depends: [ "dune" {>= "3.12"} "ocaml" {>= "4.08.0"} "ordering" {= version} - "pp" {>= "1.1.0" & < "2.0.0"} + "pp" {>= "1.1.0"} "odoc" {with-doc} ] build: [ @@ -25,10 +25,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/ocamlc-loc/ocamlc-loc.3.16.0/opam b/packages/ocamlc-loc/ocamlc-loc.3.16.1/opam similarity index 69% rename from packages/ocamlc-loc/ocamlc-loc.3.16.0/opam rename to packages/ocamlc-loc/ocamlc-loc.3.16.1/opam index 85d1863b..9bf15c6a 100644 --- a/packages/ocamlc-loc/ocamlc-loc.3.16.0/opam +++ b/packages/ocamlc-loc/ocamlc-loc.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ocamlc-loc" -version: "3.16.0" +version: "3.16.1" synopsis: "Parse ocaml compiler output into structured form" description: "This library offers no backwards compatibility guarantees. Use at your own risk." @@ -28,10 +28,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/ordering/ordering.3.16.0/opam b/packages/ordering/ordering.3.16.1/opam similarity index 64% rename from packages/ordering/ordering.3.16.0/opam rename to packages/ordering/ordering.3.16.1/opam index 711f160c..10e551bc 100644 --- a/packages/ordering/ordering.3.16.0/opam +++ b/packages/ordering/ordering.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ordering" -version: "3.16.0" +version: "3.16.1" synopsis: "Element ordering" description: "Element ordering" maintainer: "Jane Street Group, LLC " @@ -23,10 +23,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/stdune/stdune.3.16.0/opam b/packages/stdune/stdune.3.16.1/opam similarity index 67% rename from packages/stdune/stdune.3.16.0/opam rename to packages/stdune/stdune.3.16.1/opam index 419f1e19..46d8808d 100644 --- a/packages/stdune/stdune.3.16.0/opam +++ b/packages/stdune/stdune.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "stdune" -version: "3.16.0" +version: "3.16.1" synopsis: "Dune's unstable standard library" description: "This library offers no backwards compatibility guarantees. Use at your own risk." @@ -16,7 +16,7 @@ depends: [ "base-unix" "dyn" {= version} "ordering" {= version} - "pp" {>= "1.2.0" & < "2.0.0"} + "pp" {>= "1.2.0" & < "2.0"} "csexp" {>= "1.5.0"} "odoc" {with-doc} ] @@ -29,10 +29,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" diff --git a/packages/xdg/xdg.3.16.0/opam b/packages/xdg/xdg.3.16.1/opam similarity index 67% rename from packages/xdg/xdg.3.16.0/opam rename to packages/xdg/xdg.3.16.1/opam index 13614088..fa7b4a87 100644 --- a/packages/xdg/xdg.3.16.0/opam +++ b/packages/xdg/xdg.3.16.1/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "xdg" -version: "3.16.0" +version: "3.16.1" synopsis: "XDG Base Directory Specification" description: "https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html" @@ -24,10 +24,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/dune.git" url { src: - "https://github.com/ocaml/dune/releases/download/3.16.0/dune-3.16.0.tbz" + "https://github.com/ocaml/dune/releases/download/3.16.1/dune-3.16.1.tbz" checksum: [ - "sha256=5481dde7918ca3121e02c34d74339f734b32d5883efb8c1b8056471e74f9bda6" - "sha512=529f937c61bc9ea7b135c2425f2d730478b48e6ab6b6455c354138d27b76bd43afce40d4784a6f183d6308d3cf0f5d5cea5bea070f83442949762ed818fb44bc" + "sha256=b781ae20f87613c2a11bd0717809e00470c82d615e15264f9a64e033051ac3de" + "sha512=fddf940d5634400fa14f6728235e0dba055b90a47f868d9fee80c9523b93fb2b9920a00e70dfdc5e1dd26a21d695ce854267b6a2ec305ce89ce9447733f7242c" ] } -x-commit-hash: "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed" +x-commit-hash: "3c2b57bc29e3ba758bfe025d93e22737e3b359f2" From f7253bfe183de07336e829badaba60ff3c711a4b Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Fri, 8 Nov 2024 14:49:20 +0000 Subject: [PATCH 6/8] packages: update ocaml-version to 3.7.0 minor: add ocaml 5.3 prerelease versions Signed-off-by: Pau Ruiz Safont --- .../{ocaml-version.3.6.8 => ocaml-version.3.7.0}/opam | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename packages/ocaml-version/{ocaml-version.3.6.8 => ocaml-version.3.7.0}/opam (87%) diff --git a/packages/ocaml-version/ocaml-version.3.6.8/opam b/packages/ocaml-version/ocaml-version.3.7.0/opam similarity index 87% rename from packages/ocaml-version/ocaml-version.3.6.8/opam rename to packages/ocaml-version/ocaml-version.3.7.0/opam index 06b78337..3fc598ca 100644 --- a/packages/ocaml-version/ocaml-version.3.6.8/opam +++ b/packages/ocaml-version/ocaml-version.3.7.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ocaml-version" -version: "3.6.8" +version: "3.7.0" synopsis: "Manipulate, parse and generate OCaml compiler version strings" description: """\ This library provides facilities to parse version numbers of the OCaml compiler, and enumerates the various official OCaml releases and configuration variants. @@ -47,9 +47,9 @@ build: [ dev-repo: "git+https://github.com/ocurrent/ocaml-version.git" url { src: - "https://github.com/ocurrent/ocaml-version/releases/download/v3.6.8/ocaml-version-3.6.8.tbz" + "https://github.com/ocurrent/ocaml-version/releases/download/v3.7.0/ocaml-version-3.7.0.tbz" checksum: [ - "md5=d55ee16a488b872df207669bf0881f49" - "sha512=e8e1d0637dc12e9397339fc85e86fa8af7b31848bb19f76bd3116f07d68e9aa68322688633bfc5b1e3781012a9a2594200f09d8ad05f87497ce77d5ba0ed6fde" + "md5=73e5e6e3ccac96a82712c47e8003e327" + "sha512=b88ebf4229f17522d1d5d791ce41b43b3458694da16dc226c4642824cd3a48518f6838ab22c3130a4d8fc0b1e44fd0a8785000dec7376d0f8c27f0114b7a329e" ] } From fa734464b896a6021069d959c586b8d70ddcc370 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Mon, 11 Nov 2024 15:02:43 +0000 Subject: [PATCH 7/8] packages: update upstream metadata Signed-off-by: Pau Ruiz Safont --- packages/cdrom/cdrom.0.9.4/opam | 5 ++++- packages/conf-libcurl/conf-libcurl.2/opam | 14 +++++++++++++- packages/conf-libev/conf-libev.4-12/opam | 1 + packages/conf-python-3/conf-python-3.9.0.0/opam | 1 + packages/crc/crc.2.2.0/opam | 3 ++- packages/fd-send-recv/fd-send-recv.2.0.1/opam | 5 ++++- packages/netlink/netlink.0.3.4/opam | 5 ++++- .../ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam | 2 +- packages/odoc/odoc.2.4.3/opam | 2 +- packages/xapi-backtrace/xapi-backtrace.0.7/opam | 5 ++++- packages/yojson/yojson.2.2.2/opam | 1 + 11 files changed, 36 insertions(+), 8 deletions(-) diff --git a/packages/cdrom/cdrom.0.9.4/opam b/packages/cdrom/cdrom.0.9.4/opam index a08d24f0..4bc70cc4 100644 --- a/packages/cdrom/cdrom.0.9.4/opam +++ b/packages/cdrom/cdrom.0.9.4/opam @@ -16,5 +16,8 @@ build: ["dune" "build" "-p" name "-j" jobs] dev-repo: "git+https://github.com/xapi-project/cdrom.git" url { src: "https://github.com/xapi-project/cdrom/archive/v0.9.4.tar.gz" - checksum: "md5=a8dd8e015afc44e8b7d65a9ef62d8fcd" + checksum: [ + "sha256=2ea7c9f2d937fccbc07d67c4c77b37e89a1effc0407dcd824b32253cc68040ee" + "md5=a8dd8e015afc44e8b7d65a9ef62d8fcd" + ] } diff --git a/packages/conf-libcurl/conf-libcurl.2/opam b/packages/conf-libcurl/conf-libcurl.2/opam index 34fca714..62d2138d 100644 --- a/packages/conf-libcurl/conf-libcurl.2/opam +++ b/packages/conf-libcurl/conf-libcurl.2/opam @@ -9,8 +9,20 @@ authors: "Daniel Stenberg" license: "curl" homepage: "http://curl.haxx.se/" bug-reports: "https://github.com/ocaml/opam-repository/issues" +depends: [ + ("host-arch-x86_32" {os = "win32" & os-distribution != "cygwinports"} & + "conf-mingw-w64-curl-i686" + {os = "win32" & os-distribution != "cygwinports"} | + "host-arch-x86_64" {os = "win32" & os-distribution != "cygwinports"} & + "conf-mingw-w64-curl-x86_64" + {os = "win32" & os-distribution != "cygwinports"}) +] flags: conf -build: ["curl-config" "--libs"] +build: [ + ["sh" "-exc" "curl-config --libs"] + {os = "win32" & os-distribution != "cygwinports"} + ["curl-config" "--libs"] {os != "win32" | os-distribution = "cygwinports"} +] depexts: [ ["libcurl4-gnutls-dev"] {os-family = "debian"} ["libcurl4-gnutls-dev"] {os-family = "ubuntu"} diff --git a/packages/conf-libev/conf-libev.4-12/opam b/packages/conf-libev/conf-libev.4-12/opam index f7c030f4..bf792ded 100644 --- a/packages/conf-libev/conf-libev.4-12/opam +++ b/packages/conf-libev/conf-libev.4-12/opam @@ -14,6 +14,7 @@ bug-reports: "https://github.com/ocaml/opam-repository/issues" depends: [ "ocaml" {>= "3.11.0"} ] +available: os != "win32" flags: conf build: ["sh" "./build.sh"] depexts: [ diff --git a/packages/conf-python-3/conf-python-3.9.0.0/opam b/packages/conf-python-3/conf-python-3.9.0.0/opam index c22fe802..830aeefe 100644 --- a/packages/conf-python-3/conf-python-3.9.0.0/opam +++ b/packages/conf-python-3/conf-python-3.9.0.0/opam @@ -30,6 +30,7 @@ depexts: [ ["python39"] {os-distribution = "macports" & os = "macos"} ["python@3.9"] {os-distribution = "homebrew" & os = "macos"} ["system:python3"] {os-distribution = "cygwinports"} + ["python3"] {os-distribution = "cygwin"} ] extra-source "test.py" { src: diff --git a/packages/crc/crc.2.2.0/opam b/packages/crc/crc.2.2.0/opam index 7bfad613..2282e5b2 100644 --- a/packages/crc/crc.2.2.0/opam +++ b/packages/crc/crc.2.2.0/opam @@ -2,9 +2,9 @@ opam-version: "2.0" name: "crc" version: "2.2.0" synopsis: "CRC implementation supporting strings and cstructs" -license: "ISC" maintainer: "xapi-project maintainers" authors: ["David Scott" "John Else"] +license: "ISC" homepage: "https://github.com/xapi-project/ocaml-crc" bug-reports: "https://github.com/xapi-project/ocaml-crc/issues" depends: [ @@ -23,6 +23,7 @@ url { src: "https://github.com/xapi-project/ocaml-crc/releases/download/2.2.0/crc-2.2.0.tbz" checksum: [ + "sha256=e013b0c8a5593c121efee9a363d9a2ac3e9cbae7867fbfa40fe44a802c8ce04e" "sha512=a317f107a2c7c9a84ddac5513190531b9f9039d20d186e5002ec2d9634535d52054ea17584443ffb64e9840f2cef83321050f9877f451e8768a24c8621644939" ] } diff --git a/packages/fd-send-recv/fd-send-recv.2.0.1/opam b/packages/fd-send-recv/fd-send-recv.2.0.1/opam index 630951c8..f3868c47 100644 --- a/packages/fd-send-recv/fd-send-recv.2.0.1/opam +++ b/packages/fd-send-recv/fd-send-recv.2.0.1/opam @@ -25,5 +25,8 @@ dev-repo: "git+https://github.com/xapi-project/ocaml-fd-send-recv.git" url { src: "https://github.com/xapi-project/ocaml-fd-send-recv/archive/v2.0.1.tar.gz" - checksum: "md5=b46b56f70b3f4e0ab453ba3b25b43784" + checksum: [ + "sha256=659430d7d4a2ebe70197ba7f7d7dc16738b5791d77b85823a98d64e7b0ca0eb1" + "md5=b46b56f70b3f4e0ab453ba3b25b43784" + ] } diff --git a/packages/netlink/netlink.0.3.4/opam b/packages/netlink/netlink.0.3.4/opam index 66e9abb6..783735cd 100644 --- a/packages/netlink/netlink.0.3.4/opam +++ b/packages/netlink/netlink.0.3.4/opam @@ -22,5 +22,8 @@ build: ["dune" "build" "-p" name "-j" jobs] dev-repo: "git+https://github.com/xapi-project/ocaml-netlink.git" url { src: "https://github.com/xapi-project/ocaml-netlink/archive/v0.3.4.tar.gz" - checksum: "md5=9dd8017c1682410781e2798c5348048c" + checksum: [ + "sha256=a29e88889f66213af7467520a315536b6746db13769b661d481dc70820efa3fb" + "md5=9dd8017c1682410781e2798c5348048c" + ] } diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam index 83d4063b..1a731744 100644 --- a/packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam @@ -44,7 +44,7 @@ depends: [ "ocamlformat-rpc-lib" {>= "0.21.0"} "odoc" {with-doc} "ocaml" {>= "4.14" & < "5.2"} - "merlin-lib" {>= "4.9" & < "5.0"} + "merlin-lib" {>= "4.9" & < "4.17"} ] build: [ ["dune" "subst"] {dev} diff --git a/packages/odoc/odoc.2.4.3/opam b/packages/odoc/odoc.2.4.3/opam index 9c5ebed2..08eb1565 100644 --- a/packages/odoc/odoc.2.4.3/opam +++ b/packages/odoc/odoc.2.4.3/opam @@ -39,7 +39,7 @@ depends: [ "cppo" {build & >= "1.1.0"} "dune" {>= "3.7.0"} "fpath" - "ocaml" {>= "4.02.0"} + "ocaml" {>= "4.02.0" & < "5.3"} "result" "tyxml" {>= "4.4.0"} "fmt" diff --git a/packages/xapi-backtrace/xapi-backtrace.0.7/opam b/packages/xapi-backtrace/xapi-backtrace.0.7/opam index c22889bf..62572824 100644 --- a/packages/xapi-backtrace/xapi-backtrace.0.7/opam +++ b/packages/xapi-backtrace/xapi-backtrace.0.7/opam @@ -23,5 +23,8 @@ build: ["dune" "build" "-p" name "-j" jobs] dev-repo: "git+https://github.com/xapi-project/backtrace.git" url { src: "https://github.com/xapi-project/backtrace/archive/v0.7.tar.gz" - checksum: "md5=0c62a615ae48504e4de2c5d62ab344b5" + checksum: [ + "sha256=9a9f7276997cc53e1eaa5739d91ccd790f78c7423b75060331bf3ce44f5ac1ea" + "md5=0c62a615ae48504e4de2c5d62ab344b5" + ] } diff --git a/packages/yojson/yojson.2.2.2/opam b/packages/yojson/yojson.2.2.2/opam index 29137b13..99634e7f 100644 --- a/packages/yojson/yojson.2.2.2/opam +++ b/packages/yojson/yojson.2.2.2/opam @@ -42,6 +42,7 @@ url { src: "https://github.com/ocaml-community/yojson/releases/download/2.2.2/yojson-2.2.2.tbz" checksum: [ + "sha256=9abfad8c9a79d4723ad2f6448e669c1e68dbfc87cc54a1b7c064b0c90912c595" "sha512=ac52eae3ca1d3129a7885ca638e6ae5bcfc387598a82cc30d3e4988fd154f1756719c399f96e950d898c79a6dbd4ccc44b6f468bcafbd620e6945a0415b41e0c" ] } From 3024f373a2b70025fe005c67985dbf24678d9551 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Mon, 11 Nov 2024 15:29:31 +0000 Subject: [PATCH 8/8] packages: update ocaml-lsp-server to 1.18.0 Signed-off-by: Pau Ruiz Safont --- .../{jsonrpc.1.19.0 => jsonrpc.1.18.0}/opam | 10 ++-- packages/lsp/lsp.1.18.0/opam | 48 +++++++++++++++++++ .../opam | 20 ++++---- 3 files changed, 64 insertions(+), 14 deletions(-) rename packages/jsonrpc/{jsonrpc.1.19.0 => jsonrpc.1.18.0}/opam (72%) create mode 100644 packages/lsp/lsp.1.18.0/opam rename packages/ocaml-lsp-server/{ocaml-lsp-server.1.17.0 => ocaml-lsp-server.1.18.0}/opam (69%) diff --git a/packages/jsonrpc/jsonrpc.1.19.0/opam b/packages/jsonrpc/jsonrpc.1.18.0/opam similarity index 72% rename from packages/jsonrpc/jsonrpc.1.19.0/opam rename to packages/jsonrpc/jsonrpc.1.18.0/opam index 42298670..349b24a6 100644 --- a/packages/jsonrpc/jsonrpc.1.19.0/opam +++ b/packages/jsonrpc/jsonrpc.1.18.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "jsonrpc" -version: "1.19.0" +version: "1.18.0" synopsis: "Jsonrpc protocol implemenation" description: "See https://www.jsonrpc.org/specification" maintainer: "Rudi Grinberg " @@ -31,10 +31,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.19.0/lsp-1.19.0.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.18.0/lsp-1.18.0.tbz" checksum: [ - "sha256=e783d9f1a7f89ce1bf4c9148aa34a228368bd149bbcca43de80b459221dee5ec" - "sha512=85c233a7a14d38e76b3d28694054b04fb818290d2c4c009e7ce189040e2aab570ee0caaf1a826b064fb1595f29b696932daea9f6812d3dfa9b6f0387e02e254b" + "sha256=b59da43ccfd2ffd277c9e5f695a0e39c72c0d78e1bf2cbf2f62c1a7b7da75f03" + "sha512=be24188a2c63bf3a255c8085a8db067fa3d77d8ec989a7c9ba623bfea139455cf9eef6dd543d1bd276321abe77403c51b107745fbf4aa090e5902645dfb0343b" ] } -x-commit-hash: "45f5ddac12bb580b4ecaec2d93ee7fac2c903aff" +x-commit-hash: "58c71c7d5a3e6d6c143a7d87896d7ae9d2fec547" diff --git a/packages/lsp/lsp.1.18.0/opam b/packages/lsp/lsp.1.18.0/opam new file mode 100644 index 00000000..e688a782 --- /dev/null +++ b/packages/lsp/lsp.1.18.0/opam @@ -0,0 +1,48 @@ +opam-version: "2.0" +name: "lsp" +version: "1.18.0" +synopsis: "LSP protocol implementation in OCaml" +description: """\ +Implementation of the LSP protocol in OCaml. It is designed to be as portable as +possible and does not make any assumptions about IO.""" +maintainer: "Rudi Grinberg " +authors: [ + "Andrey Popp <8mayday@gmail.com>" + "Rusty Key " + "Louis Roché " + "Oleksiy Golovko " + "Rudi Grinberg " + "Sacha Ayoun " + "cannorin " + "Ulugbek Abdullaev " + "Thibaut Mattio " + "Max Lantas " +] +license: "ISC" +homepage: "https://github.com/ocaml/ocaml-lsp" +bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" +depends: [ + "dune" {>= "3.0"} + "jsonrpc" {= version} + "yojson" + "ppx_yojson_conv_lib" {>= "v0.14"} + "cinaps" {with-test} + "ppx_expect" {>= "v0.15.0" & with-test} + "uutf" {>= "1.0.2"} + "odoc" {with-doc} + "ocaml" {>= "4.14"} +] +build: [ + ["dune" "subst"] {dev} + ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}] +] +dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" +url { + src: + "https://github.com/ocaml/ocaml-lsp/releases/download/1.18.0/lsp-1.18.0.tbz" + checksum: [ + "sha256=b59da43ccfd2ffd277c9e5f695a0e39c72c0d78e1bf2cbf2f62c1a7b7da75f03" + "sha512=be24188a2c63bf3a255c8085a8db067fa3d77d8ec989a7c9ba623bfea139455cf9eef6dd543d1bd276321abe77403c51b107745fbf4aa090e5902645dfb0343b" + ] +} +x-commit-hash: "58c71c7d5a3e6d6c143a7d87896d7ae9d2fec547" diff --git a/packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam b/packages/ocaml-lsp-server/ocaml-lsp-server.1.18.0/opam similarity index 69% rename from packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam rename to packages/ocaml-lsp-server/ocaml-lsp-server.1.18.0/opam index 1a731744..c6cc7e9e 100644 --- a/packages/ocaml-lsp-server/ocaml-lsp-server.1.17.0/opam +++ b/packages/ocaml-lsp-server/ocaml-lsp-server.1.18.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "ocaml-lsp-server" -version: "1.17.0" +version: "1.18.0" synopsis: "LSP Server for OCaml" description: "An LSP server for OCaml." maintainer: "Rudi Grinberg " @@ -22,6 +22,9 @@ bug-reports: "https://github.com/ocaml/ocaml-lsp/issues" depends: [ "dune" {>= "3.0"} "yojson" + "base" + "lsp" {= version} + "jsonrpc" {= version} "re" {>= "1.5.0"} "ppx_yojson_conv_lib" {>= "v0.14"} "dune-rpc" {>= "3.4.0"} @@ -36,27 +39,26 @@ depends: [ "astring" "camlp-streams" "ppx_expect" {>= "v0.15.0" & with-test} - "ocamlformat" {with-test & = "0.24.1"} + "ocamlformat" {with-test & = "0.26.2"} "ocamlc-loc" {>= "3.7.0"} - "uutf" {>= "1.0.2"} "pp" {>= "1.1.2"} "csexp" {>= "1.5"} "ocamlformat-rpc-lib" {>= "0.21.0"} "odoc" {with-doc} "ocaml" {>= "4.14" & < "5.2"} - "merlin-lib" {>= "4.9" & < "4.17"} + "merlin-lib" {>= "4.16" & < "4.17"} ] build: [ ["dune" "subst"] {dev} - ["dune" "build" "-j" jobs "ocaml-lsp-server.install" "--release"] + ["dune" "build" "-p" name "-j" jobs "@install" "@doc" {with-doc}] ] dev-repo: "git+https://github.com/ocaml/ocaml-lsp.git" url { src: - "https://github.com/ocaml/ocaml-lsp/releases/download/1.17.0/lsp-1.17.0.tbz" + "https://github.com/ocaml/ocaml-lsp/releases/download/1.18.0/lsp-1.18.0.tbz" checksum: [ - "sha256=8fb8bbd717eefd2608b4d83458105b660e0de3a1134dc8fc216ae659d4d19600" - "sha512=6876df760dbcb51f85e7fd9d08cc8498c69ede38a52f4e12407187da3fbd9657c71f3223f9490ad97edd5259cfdeb2819d943db65bb9ce3c2a18dace3b65ffa8" + "sha256=b59da43ccfd2ffd277c9e5f695a0e39c72c0d78e1bf2cbf2f62c1a7b7da75f03" + "sha512=be24188a2c63bf3a255c8085a8db067fa3d77d8ec989a7c9ba623bfea139455cf9eef6dd543d1bd276321abe77403c51b107745fbf4aa090e5902645dfb0343b" ] } -x-commit-hash: "d3d8de5a4213c2a16e43ac4f87cbbe88a894d05f" +x-commit-hash: "58c71c7d5a3e6d6c143a7d87896d7ae9d2fec547"