From b5fd02b0758a049ade357108541ed19896dad7c7 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Fri, 7 Jun 2024 17:08:41 +0100 Subject: [PATCH 01/11] Package cvc5.1.1.3-unreleased --- packages/cvc5/cvc5.1.1.3-unreleased/opam | 42 ++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 packages/cvc5/cvc5.1.1.3-unreleased/opam diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3-unreleased/opam new file mode 100644 index 00000000000..d76a5fa9b01 --- /dev/null +++ b/packages/cvc5/cvc5.1.1.3-unreleased/opam @@ -0,0 +1,42 @@ +# This file is generated by dune, edit dune-project instead +opam-version: "2.0" +synopsis: "OCaml bindings for the cvc5 SMT solver" +description: "OCaml bindings for the cvc5 SMT solver" +maintainer: ["João Pereira "] +authors: ["João Pereira "] +license: "GPL-3.0-only" +homepage: "https://github.com/formalsec/ocaml-cvc5" +bug-reports: "https://github.com/formalsec/ocaml-cvc5/issues" +depends: [ + "dune" {>= "3.10"} + "ocaml" {>= "4.12"} + "conf-gcc" {build} + "conf-g++" {build} + "conf-gmp" {build} + "conf-cmake" {build} + "conf-python-3" {build} + "odoc" {with-doc} +] +build: [ + ["dune" "subst"] {dev} + [ + "dune" + "build" + "-p" + name + "-j" + jobs + "@install" + "@runtest" {with-test} + "@doc" {with-doc} + ] +] +dev-repo: "git+https://github.com/formalsec/ocaml-cvc5.git" +url { + src: + "https://github.com/formalsec/ocaml-cvc5/archive/refs/tags/v1.1.3-unreleased.tar.gz" + checksum: [ + "md5=2c34475ff7dfd5e92fca5ce1ba1c0d6d" + "sha512=cc1cae0cc1cddb2c1bb9fa7978bc43cc3a862c6fc4a8d7f79ae66c08e0af7fe82cac3c00d351e01806b064fce317705870f0a91bd0dafbb0ec06023786186bcb" + ] +} From 92cf399323e64c5273056f3d4223472585bc7278 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Sat, 8 Jun 2024 14:27:24 +0100 Subject: [PATCH 02/11] Fix release tarball --- packages/cvc5/cvc5.1.1.3-unreleased/opam | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3-unreleased/opam index d76a5fa9b01..5bf8a94daf2 100644 --- a/packages/cvc5/cvc5.1.1.3-unreleased/opam +++ b/packages/cvc5/cvc5.1.1.3-unreleased/opam @@ -34,9 +34,9 @@ build: [ dev-repo: "git+https://github.com/formalsec/ocaml-cvc5.git" url { src: - "https://github.com/formalsec/ocaml-cvc5/archive/refs/tags/v1.1.3-unreleased.tar.gz" + "https://github.com/formalsec/ocaml-cvc5/releases/download/v1.1.3-unreleased/ocaml-cvc5-v1.1.3-unreleased.tar.gz" checksum: [ - "md5=2c34475ff7dfd5e92fca5ce1ba1c0d6d" - "sha512=cc1cae0cc1cddb2c1bb9fa7978bc43cc3a862c6fc4a8d7f79ae66c08e0af7fe82cac3c00d351e01806b064fce317705870f0a91bd0dafbb0ec06023786186bcb" + "md5=099a5d568fa499d42b5b1ce45ef018e6" + "sha512=16fa0aa5ef402756a0dbb165b6e21a1ee33f0393baba39b45e04973fa41326689c61d27d1f67a04faaedcec94a931b708de984447720606512df21ba4e10bd1a" ] } From 9adcc9d7f1947704c78093193b30abee5f440544 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Sat, 8 Jun 2024 18:37:43 +0100 Subject: [PATCH 03/11] Missing python-3-dev dependency --- packages/cvc5/cvc5.1.1.3-unreleased/opam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3-unreleased/opam index 5bf8a94daf2..6431772d1b4 100644 --- a/packages/cvc5/cvc5.1.1.3-unreleased/opam +++ b/packages/cvc5/cvc5.1.1.3-unreleased/opam @@ -36,7 +36,7 @@ url { src: "https://github.com/formalsec/ocaml-cvc5/releases/download/v1.1.3-unreleased/ocaml-cvc5-v1.1.3-unreleased.tar.gz" checksum: [ - "md5=099a5d568fa499d42b5b1ce45ef018e6" - "sha512=16fa0aa5ef402756a0dbb165b6e21a1ee33f0393baba39b45e04973fa41326689c61d27d1f67a04faaedcec94a931b708de984447720606512df21ba4e10bd1a" + "md5=93bdf7ddaa56ff53d38bac3b4b678f45" + "sha512=36eb44e7b07cc26084762bec8089cb238554f065835776050e1af8546140464b680f124a03f7f6055b1b48734079de0e1de569b3e46a01010381699676a2f09c" ] } From 9e7e5309df5d0d7eacb8e4e3ec51a3637d0311aa Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Sat, 8 Jun 2024 19:10:36 +0100 Subject: [PATCH 04/11] Fix dependency --- packages/cvc5/cvc5.1.1.3-unreleased/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3-unreleased/opam index 6431772d1b4..b55bebcec50 100644 --- a/packages/cvc5/cvc5.1.1.3-unreleased/opam +++ b/packages/cvc5/cvc5.1.1.3-unreleased/opam @@ -15,6 +15,7 @@ depends: [ "conf-gmp" {build} "conf-cmake" {build} "conf-python-3" {build} + "conf-python-3-dev" {build} "odoc" {with-doc} ] build: [ From 39f9c506f9b47b865b91be7d966b2911196b5cd5 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Tue, 11 Jun 2024 10:09:21 +0100 Subject: [PATCH 05/11] Add conf packages for python dependencies --- .../conf-python3-pyparsing.1/opam | 24 +++++++++++++++++++ .../conf-python3-tomli.1/opam | 24 +++++++++++++++++++ packages/cvc5/cvc5.1.1.3-unreleased/opam | 2 ++ 3 files changed, 50 insertions(+) create mode 100644 packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam create mode 100644 packages/conf-python3-tomli/conf-python3-tomli.1/opam diff --git a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam new file mode 100644 index 00000000000..9f280f68b02 --- /dev/null +++ b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +maintainer: "https://github.com/ocaml/opam-repository/issues" +homepage: "https://pypi.org/project/pyparsing/" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +authors: "PyParsing dev team" +license: "MIT" +build: [ + ["sh" "-c" "echo 'import pyparsing' > test.py"] + ["python3" "test.py"] +] +depends: [ + "conf-python-3" {build} +] +depexts: [ + ["python3-pyparsing"] {os-family = "debian"} + ["python3-pyparsing"] {os-family = "ubuntu"} + ["python-pyparsing"] {os-family = "arch"} + ["python3-pyparsing"] {os = "macos"} +] + +synopsis: "Virtual package relying on PyParsing" +description: + "This package can only install if the PyParsing python3 library is installed on the system." +flags: conf diff --git a/packages/conf-python3-tomli/conf-python3-tomli.1/opam b/packages/conf-python3-tomli/conf-python3-tomli.1/opam new file mode 100644 index 00000000000..100681d3dfd --- /dev/null +++ b/packages/conf-python3-tomli/conf-python3-tomli.1/opam @@ -0,0 +1,24 @@ +opam-version: "2.0" +maintainer: "https://github.com/ocaml/opam-repository/issues" +homepage: "https://pypi.org/project/tomli/" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +authors: "Tomli dev team" +license: "MIT" +build: [ + ["sh" "-c" "echo 'import tomli' > test.py"] + ["python3" "test.py"] +] +depends: [ + "conf-python-3" {build} +] +depexts: [ + ["python3-tomli"] {os-family = "debian"} + ["python3-tomli"] {os-family = "ubuntu"} + ["python-tomli"] {os-family = "arch"} + ["python3-tomli"] {os = "macos"} +] + +synopsis: "Virtual package relying on Tomli" +description: + "This package can only install if the Tomli python3 library is installed on the system." +flags: conf diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3-unreleased/opam index b55bebcec50..386760cf168 100644 --- a/packages/cvc5/cvc5.1.1.3-unreleased/opam +++ b/packages/cvc5/cvc5.1.1.3-unreleased/opam @@ -16,6 +16,8 @@ depends: [ "conf-cmake" {build} "conf-python-3" {build} "conf-python-3-dev" {build} + "conf-python3-tomli" {build} + "conf-python3-pyparsing" {build} "odoc" {with-doc} ] build: [ From 09d300b8cb1f14e17287d6865f451d9b901c6a2b Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Wed, 12 Jun 2024 10:23:15 +0100 Subject: [PATCH 06/11] Add support for more distros --- .../conf-python3-pyparsing/conf-python3-pyparsing.1/opam | 6 +++++- packages/conf-python3-tomli/conf-python3-tomli.1/opam | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam index 9f280f68b02..d9af3032e52 100644 --- a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam +++ b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam @@ -14,8 +14,12 @@ depends: [ depexts: [ ["python3-pyparsing"] {os-family = "debian"} ["python3-pyparsing"] {os-family = "ubuntu"} + ["python3-pyparsing"] {os-distribution = "fedora"} + ["python3-pyparsing"] {os-family = "suse" | os-family = "opensuse"} ["python-pyparsing"] {os-family = "arch"} - ["python3-pyparsing"] {os = "macos"} + ["py3-parsing"] {os-family = "alpine"} + ["py-parsing"] {os = "macos" & os-distribution = "macports"} + ["py-pyparsing"] {os = "freebsd"} ] synopsis: "Virtual package relying on PyParsing" diff --git a/packages/conf-python3-tomli/conf-python3-tomli.1/opam b/packages/conf-python3-tomli/conf-python3-tomli.1/opam index 100681d3dfd..6cb58968616 100644 --- a/packages/conf-python3-tomli/conf-python3-tomli.1/opam +++ b/packages/conf-python3-tomli/conf-python3-tomli.1/opam @@ -14,8 +14,12 @@ depends: [ depexts: [ ["python3-tomli"] {os-family = "debian"} ["python3-tomli"] {os-family = "ubuntu"} + ["python3-tomli"] {os-distribution = "fedora"} + ["python-tomli"] {os-family = "suse" | os-family = "opensuse"} ["python-tomli"] {os-family = "arch"} - ["python3-tomli"] {os = "macos"} + ["py3-tomli"] {os-family = "alpine"} + ["py-tomli"] {os = "macos" & os-distribution = "macports"} + ["py-tomli"] {os = "freebsd"} ] synopsis: "Virtual package relying on Tomli" From 71ba867350e9956891821e027ef3ca3fc137f0c1 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Wed, 12 Jun 2024 20:50:57 +0100 Subject: [PATCH 07/11] Update package versions --- packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam | 4 ++-- packages/conf-python3-tomli/conf-python3-tomli.1/opam | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam index d9af3032e52..ab4ae3d8477 100644 --- a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam +++ b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam @@ -18,8 +18,8 @@ depexts: [ ["python3-pyparsing"] {os-family = "suse" | os-family = "opensuse"} ["python-pyparsing"] {os-family = "arch"} ["py3-parsing"] {os-family = "alpine"} - ["py-parsing"] {os = "macos" & os-distribution = "macports"} - ["py-pyparsing"] {os = "freebsd"} + ["py39-parsing"] {os = "macos" & os-distribution = "macports"} + ["py39-pyparsing"] {os = "freebsd"} ] synopsis: "Virtual package relying on PyParsing" diff --git a/packages/conf-python3-tomli/conf-python3-tomli.1/opam b/packages/conf-python3-tomli/conf-python3-tomli.1/opam index 6cb58968616..cd3a3bd8b52 100644 --- a/packages/conf-python3-tomli/conf-python3-tomli.1/opam +++ b/packages/conf-python3-tomli/conf-python3-tomli.1/opam @@ -18,8 +18,8 @@ depexts: [ ["python-tomli"] {os-family = "suse" | os-family = "opensuse"} ["python-tomli"] {os-family = "arch"} ["py3-tomli"] {os-family = "alpine"} - ["py-tomli"] {os = "macos" & os-distribution = "macports"} - ["py-tomli"] {os = "freebsd"} + ["py39-tomli"] {os = "macos" & os-distribution = "macports"} + ["py39-tomli"] {os = "freebsd"} ] synopsis: "Virtual package relying on Tomli" From 874bf5279c0f661fae4b42870d06cf7f5cab56ea Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Thu, 13 Jun 2024 14:38:29 +0100 Subject: [PATCH 08/11] Update available archs and os --- packages/cvc5/cvc5.1.1.3-unreleased/opam | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3-unreleased/opam index 386760cf168..d6509f1dd1c 100644 --- a/packages/cvc5/cvc5.1.1.3-unreleased/opam +++ b/packages/cvc5/cvc5.1.1.3-unreleased/opam @@ -35,11 +35,12 @@ build: [ ] ] dev-repo: "git+https://github.com/formalsec/ocaml-cvc5.git" +available: arch != "arm32" & os != "macos" & os != "freebsd" & os-distribution != "fedora" & os-family != "arch" url { src: "https://github.com/formalsec/ocaml-cvc5/releases/download/v1.1.3-unreleased/ocaml-cvc5-v1.1.3-unreleased.tar.gz" checksum: [ - "md5=93bdf7ddaa56ff53d38bac3b4b678f45" - "sha512=36eb44e7b07cc26084762bec8089cb238554f065835776050e1af8546140464b680f124a03f7f6055b1b48734079de0e1de569b3e46a01010381699676a2f09c" + "md5=0d6f257ead39a7135725809d3bbf66f7" + "sha512=9df93944cbba98a8fb41ed39f46c0c1e8fb0804d07a73298d3450d3e9e055e4a380e8ee849d9910dcf335516ac27970342c52d0cba3fafa2e3e993d36a0a162a" ] } From 8ccd502a978fe8b6e545eb0c87e1e080259693c9 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Thu, 13 Jun 2024 15:39:05 +0100 Subject: [PATCH 09/11] Remove tomli and pyparsing from macos --- packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam | 2 +- packages/conf-python3-tomli/conf-python3-tomli.1/opam | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam index ab4ae3d8477..038d9b9a4ed 100644 --- a/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam +++ b/packages/conf-python3-pyparsing/conf-python3-pyparsing.1/opam @@ -18,10 +18,10 @@ depexts: [ ["python3-pyparsing"] {os-family = "suse" | os-family = "opensuse"} ["python-pyparsing"] {os-family = "arch"} ["py3-parsing"] {os-family = "alpine"} - ["py39-parsing"] {os = "macos" & os-distribution = "macports"} ["py39-pyparsing"] {os = "freebsd"} ] +available: os != "macos" synopsis: "Virtual package relying on PyParsing" description: "This package can only install if the PyParsing python3 library is installed on the system." diff --git a/packages/conf-python3-tomli/conf-python3-tomli.1/opam b/packages/conf-python3-tomli/conf-python3-tomli.1/opam index cd3a3bd8b52..dc70f5fe22e 100644 --- a/packages/conf-python3-tomli/conf-python3-tomli.1/opam +++ b/packages/conf-python3-tomli/conf-python3-tomli.1/opam @@ -18,10 +18,10 @@ depexts: [ ["python-tomli"] {os-family = "suse" | os-family = "opensuse"} ["python-tomli"] {os-family = "arch"} ["py3-tomli"] {os-family = "alpine"} - ["py39-tomli"] {os = "macos" & os-distribution = "macports"} ["py39-tomli"] {os = "freebsd"} ] +available: os != "macos" synopsis: "Virtual package relying on Tomli" description: "This package can only install if the Tomli python3 library is installed on the system." From 48cb53f4cf22dd73dc88f9bbd1c69f017d664f35 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Thu, 1 Aug 2024 17:33:42 +0100 Subject: [PATCH 10/11] Rename package versioning --- .../cvc5/{cvc5.1.1.3-unreleased => cvc5.1.1.3~unreleased}/opam | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename packages/cvc5/{cvc5.1.1.3-unreleased => cvc5.1.1.3~unreleased}/opam (100%) diff --git a/packages/cvc5/cvc5.1.1.3-unreleased/opam b/packages/cvc5/cvc5.1.1.3~unreleased/opam similarity index 100% rename from packages/cvc5/cvc5.1.1.3-unreleased/opam rename to packages/cvc5/cvc5.1.1.3~unreleased/opam From f5b0d1ef8a217467c3f3b3c6a75061ce48eb5782 Mon Sep 17 00:00:00 2001 From: joaomhmpereira Date: Fri, 2 Aug 2024 11:44:59 +0100 Subject: [PATCH 11/11] Fix missing header --- packages/cvc5/cvc5.1.1.3~unreleased/opam | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/cvc5/cvc5.1.1.3~unreleased/opam b/packages/cvc5/cvc5.1.1.3~unreleased/opam index d6509f1dd1c..4f4cc480452 100644 --- a/packages/cvc5/cvc5.1.1.3~unreleased/opam +++ b/packages/cvc5/cvc5.1.1.3~unreleased/opam @@ -38,9 +38,9 @@ dev-repo: "git+https://github.com/formalsec/ocaml-cvc5.git" available: arch != "arm32" & os != "macos" & os != "freebsd" & os-distribution != "fedora" & os-family != "arch" url { src: - "https://github.com/formalsec/ocaml-cvc5/releases/download/v1.1.3-unreleased/ocaml-cvc5-v1.1.3-unreleased.tar.gz" + "https://github.com/formalsec/ocaml-cvc5/releases/download/v1.1.3/ocaml-cvc5-v1.1.3.unreleased.tar.gz" checksum: [ - "md5=0d6f257ead39a7135725809d3bbf66f7" - "sha512=9df93944cbba98a8fb41ed39f46c0c1e8fb0804d07a73298d3450d3e9e055e4a380e8ee849d9910dcf335516ac27970342c52d0cba3fafa2e3e993d36a0a162a" + "md5=2beb77e9db079cd585a9a9a19b76d1ec" + "sha512=b8b92ce5a076800a0a91b69c1110da4a46b6345de5c52dbefccbd31d6efc90725798645d25ed80f1c07a7571fed8779fdc3c6bb8977e999acd0acddb46a01690" ] }