From 7697c7e9696127fa3632f6225781e813771e183d Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Thu, 16 Nov 2023 13:12:06 +0000 Subject: [PATCH 1/2] upstream-extra: update merlin packages to 4.12-414 Signed-off-by: Pau Ruiz Safont --- .../{merlin-lib.4.11-414 => merlin-lib.4.12-414}/opam | 10 +++++----- .../{merlin.4.11-414 => merlin.4.12-414}/opam | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) rename packages/upstream-extra/{merlin-lib.4.11-414 => merlin-lib.4.12-414}/opam (68%) rename packages/upstream-extra/{merlin.4.11-414 => merlin.4.12-414}/opam (86%) diff --git a/packages/upstream-extra/merlin-lib.4.11-414/opam b/packages/upstream-extra/merlin-lib.4.12-414/opam similarity index 68% rename from packages/upstream-extra/merlin-lib.4.11-414/opam rename to packages/upstream-extra/merlin-lib.4.12-414/opam index f0b284c59..b96d0395b 100644 --- a/packages/upstream-extra/merlin-lib.4.11-414/opam +++ b/packages/upstream-extra/merlin-lib.4.12-414/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "merlin-lib" -version: "4.11-414" +version: "4.12-414" synopsis: "Merlin's libraries" description: """\ These libraries provides access to low-level compiler interfaces and the @@ -26,10 +26,10 @@ build: [ dev-repo: "git+https://github.com/ocaml/merlin.git" url { src: - "https://github.com/ocaml/merlin/releases/download/v4.11-414/merlin-4.11-414.tbz" + "https://github.com/ocaml/merlin/releases/download/v4.12-414/merlin-4.12-414.tbz" checksum: [ - "sha256=834d4e88c7b2fac56b2fe88d17b93ef963dff52de6c8e6d01bf63fd2d10d9158" - "sha512=5481a90f4168aa9f7a053b98215e916981e627c450698f60cdded8be53d31c1468dcdd3bd58da31eee9464afb7a6a336de7973a6b7081fd9b56582dbb5cbb9d8" + "sha256=b603144f82b215e26e6d8558d5276ff59bcf07527072a106702bb0b8ca971d14" + "sha512=3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29" ] } -x-commit-hash: "c6835c65f7caeaf41fc6acb1b8f466f2dd190d75" +x-commit-hash: "cc56ce484b89890cd08fd77c1dd17682834134b8" diff --git a/packages/upstream-extra/merlin.4.11-414/opam b/packages/upstream-extra/merlin.4.12-414/opam similarity index 86% rename from packages/upstream-extra/merlin.4.11-414/opam rename to packages/upstream-extra/merlin.4.12-414/opam index 0eee9aacd..5aa8d569b 100644 --- a/packages/upstream-extra/merlin.4.11-414/opam +++ b/packages/upstream-extra/merlin.4.12-414/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "merlin" -version: "4.11-414" +version: "4.12-414" synopsis: "Editor helper, provides completion, typing and source browsing in Vim and Emacs" description: @@ -73,10 +73,10 @@ See https://github.com/OCamlPro/opam-user-setup""" dev-repo: "git+https://github.com/ocaml/merlin.git" url { src: - "https://github.com/ocaml/merlin/releases/download/v4.11-414/merlin-4.11-414.tbz" + "https://github.com/ocaml/merlin/releases/download/v4.12-414/merlin-4.12-414.tbz" checksum: [ - "sha256=834d4e88c7b2fac56b2fe88d17b93ef963dff52de6c8e6d01bf63fd2d10d9158" - "sha512=5481a90f4168aa9f7a053b98215e916981e627c450698f60cdded8be53d31c1468dcdd3bd58da31eee9464afb7a6a336de7973a6b7081fd9b56582dbb5cbb9d8" + "sha256=b603144f82b215e26e6d8558d5276ff59bcf07527072a106702bb0b8ca971d14" + "sha512=3bf4f5e4754def9818ce0abbdf2253fe9d5e0abec7e8814012e2ff9de6a174f288c257780eb9f8aa4d794c0b62a524848d579d2a3495a5747a0970ee9fbfff29" ] } -x-commit-hash: "c6835c65f7caeaf41fc6acb1b8f466f2dd190d75" +x-commit-hash: "cc56ce484b89890cd08fd77c1dd17682834134b8" From f7e34d79f526d66df6cea2d9ccf42d6e8187ebb3 Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Thu, 16 Nov 2023 15:25:45 +0000 Subject: [PATCH 2/2] xs: update xapi-rrd to 1.11.0 Removed List.hd errors Signed-off-by: Pau Ruiz Safont --- packages/xs/{xapi-rrd.1.10.0 => xapi-rrd.1.11.0}/opam | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename packages/xs/{xapi-rrd.1.10.0 => xapi-rrd.1.11.0}/opam (77%) diff --git a/packages/xs/xapi-rrd.1.10.0/opam b/packages/xs/xapi-rrd.1.11.0/opam similarity index 77% rename from packages/xs/xapi-rrd.1.10.0/opam rename to packages/xs/xapi-rrd.1.11.0/opam index d06dca415..2606150c8 100644 --- a/packages/xs/xapi-rrd.1.10.0/opam +++ b/packages/xs/xapi-rrd.1.11.0/opam @@ -1,6 +1,6 @@ opam-version: "2.0" name: "xapi-rrd" -version: "1.10.0" +version: "1.11.0" synopsis: "RRD library for use with xapi" description: """\ Round-Robin Databases (RRDs) are constant-space datastructures @@ -35,10 +35,10 @@ build: [ dev-repo: "git+https://github.com/xapi-project/xcp-rrd.git" url { src: - "https://github.com/xapi-project/xcp-rrd/releases/download/v1.10.0/xapi-rrd-1.10.0.tbz" + "https://github.com/xapi-project/xcp-rrd/releases/download/v1.11.0/xapi-rrd-1.11.0.tbz" checksum: [ - "sha256=29ba8104ed5765f1c9ce922dfb2badee0542a0d36aad96badbd57b7099e1447c" - "sha512=3f5e2b8d4448006ace213a133401ffc2bb7924b63c83bf40d126893085e8289bc42b0dfb22c8fbd900fa755fa920f3faeb5a71c8fc047d5f321c7f944d4782f1" + "sha256=7d05044c4074981c714fc299722cc916d1f67141622765c47e9915b89014b55e" + "sha512=6531b6a6ce18d6677f29b90b69cb7f1e892d75a8c169e95996490ef38fed3d7785babb50812cc3a72d5eea8c1aa52f3340c7f23e7d4a9bbf1d4e6d96dd415fca" ] } -x-commit-hash: "c1e97c591889537e5a64e00519517fcf920a230e" +x-commit-hash: "61d362abe84eefb43c18e392842c5970a937741c"