From 10bca370941dae8fbd9b5683ff3f27084e998b89 Mon Sep 17 00:00:00 2001 From: Nat Karmios Date: Mon, 16 Oct 2023 19:46:26 +0100 Subject: [PATCH] Update esy overrides --- esy.json | 5 +-- esy.lock/index.json | 37 ++++++++-------- .../conf-python-3-7.1.0.0/files/configure.sh | 8 ++++ .../opam/conf-python-3-7.1.0.0/files/test.py | 2 + esy.lock/opam/conf-python-3-7.1.0.0/opam | 44 +++++++++++++++++++ .../.gitignore | 0 .../package.json | 0 .../test/package.json | 0 .../test/test.c | 0 .../package.json | 0 10 files changed, 75 insertions(+), 21 deletions(-) create mode 100644 esy.lock/opam/conf-python-3-7.1.0.0/files/configure.sh create mode 100644 esy.lock/opam/conf-python-3-7.1.0.0/files/test.py create mode 100644 esy.lock/opam/conf-python-3-7.1.0.0/opam rename esy.lock/overrides/{970088ca61c313c3c7c346d14ceb70d0 => b7788c94efa7edeebd57e710cce6713d}/.gitignore (100%) rename esy.lock/overrides/{970088ca61c313c3c7c346d14ceb70d0 => b7788c94efa7edeebd57e710cce6713d}/package.json (100%) rename esy.lock/overrides/{970088ca61c313c3c7c346d14ceb70d0 => b7788c94efa7edeebd57e710cce6713d}/test/package.json (100%) rename esy.lock/overrides/{970088ca61c313c3c7c346d14ceb70d0 => b7788c94efa7edeebd57e710cce6713d}/test/test.c (100%) rename esy.lock/overrides/{fc8aca50331b1614aabf2a8e74820a5e => ee5be9c1213cfc9c8d43f4061c829e80}/package.json (100%) diff --git a/esy.json b/esy.json index b272fe657..2d2be1352 100644 --- a/esy.json +++ b/esy.json @@ -94,7 +94,7 @@ "@opam/visitors": ">=2.3", "@opam/yojson": "^1.7.0", "@opam/zarith": ">=1.12", - "@opam/z3": "NatKarmios/esy-z3#37b3fae3f019bd331a5f3cf22ffa193af1a0cdc2", + "@opam/z3": "GillianPlatform/esy-z3#37b3fae3f019bd331a5f3cf22ffa193af1a0cdc2", "compcert": "giltho/CompCert#3a6f14016f0c9aaab2ddcdd61492e5fe54f12259", "ocaml": "4.14.x" }, @@ -112,7 +112,6 @@ }, "resolutions": { "@opam/conf-sqlite3": "ManasJayanth/esy-sqlite:esy.json#28dfc73a8eda790213a8359ad708231069ed7079", - "esy-gmp": "NatKarmios/esy-gmp:package.json#d68dce1a9aacc0534cca93d84d2b7f9c8105ee87", - "@opam/conf-python-3-7": "NatKarmios/conf-python-3-7:conf-python-3-7.opam#1a624b3cd5738a6a0f51f5638b5d101ad2c9844b" + "esy-gmp": "GillianPlatform/esy-gmp:package.json#d68dce1a9aacc0534cca93d84d2b7f9c8105ee87" } } \ No newline at end of file diff --git a/esy.lock/index.json b/esy.lock/index.json index 75849ffd1..2659de0cc 100644 --- a/esy.lock/index.json +++ b/esy.lock/index.json @@ -1,5 +1,5 @@ { - "checksum": "49956878ee32ed5a435f68b82621ec92", + "checksum": "122100d5b64171817b3864785e4e7fdb", "root": "gillian-platform@link-dev:./esy.json", "node": { "yargs-parser@21.1.1@d41d8cd9": { @@ -290,7 +290,7 @@ "ocaml@4.14.1000@d41d8cd9", "compcert@github:giltho/CompCert#3a6f14016f0c9aaab2ddcdd61492e5fe54f12259@d41d8cd9", "@opam/zarith@opam:1.13@e4e498f3", - "@opam/z3@archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057@fc8aca50", + "@opam/z3@archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057@ee5be9c1", "@opam/yojson@opam:2.1.1@ad5e299c", "@opam/visitors@opam:20210608@7b4a1100", "@opam/uuidm@opam:0.9.7@a349b245", @@ -333,9 +333,9 @@ "dependencies": [], "devDependencies": [] }, - "esy-gmp@archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2@970088ca": { + "esy-gmp@archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2@b7788c94": { "id": - "esy-gmp@archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2@970088ca", + "esy-gmp@archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2@b7788c94", "name": "esy-gmp", "version": "archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2", @@ -346,7 +346,7 @@ ] }, "overrides": [ - "esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/package.json" + "esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/package.json" ], "dependencies": [], "devDependencies": [] @@ -584,9 +584,9 @@ "@opam/conf-gmp@opam:4@862d40a8" ] }, - "@opam/z3@archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057@fc8aca50": { + "@opam/z3@archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057@ee5be9c1": { "id": - "@opam/z3@archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057@fc8aca50", + "@opam/z3@archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057@ee5be9c1", "name": "@opam/z3", "version": "archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057", @@ -596,11 +596,11 @@ "archive:https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.12.2.tar.gz#md5:4061317f7948c19abd13041c5a32b057" ] }, - "overrides": [ "esy.lock/overrides/fc8aca50331b1614aabf2a8e74820a5e" ], + "overrides": [ "esy.lock/overrides/ee5be9c1213cfc9c8d43f4061c829e80" ], "dependencies": [ "ocaml@4.14.1000@d41d8cd9", "@opam/zarith@opam:1.13@e4e498f3", "@opam/ocamlfind@opam:1.9.6@da5169c7", - "@opam/conf-python-3-7@github:NatKarmios/conf-python-3-7:conf-python-3-7.opam#1a624b3cd5738a6a0f51f5638b5d101ad2c9844b@d41d8cd9", + "@opam/conf-python-3-7@opam:1.0.0@cb56517c", "@opam/conf-gmp@opam:4@862d40a8" ], "devDependencies": [] @@ -3277,17 +3277,18 @@ "dependencies": [], "devDependencies": [] }, - "@opam/conf-python-3-7@github:NatKarmios/conf-python-3-7:conf-python-3-7.opam#1a624b3cd5738a6a0f51f5638b5d101ad2c9844b@d41d8cd9": { - "id": - "@opam/conf-python-3-7@github:NatKarmios/conf-python-3-7:conf-python-3-7.opam#1a624b3cd5738a6a0f51f5638b5d101ad2c9844b@d41d8cd9", + "@opam/conf-python-3-7@opam:1.0.0@cb56517c": { + "id": "@opam/conf-python-3-7@opam:1.0.0@cb56517c", "name": "@opam/conf-python-3-7", - "version": - "github:NatKarmios/conf-python-3-7:conf-python-3-7.opam#1a624b3cd5738a6a0f51f5638b5d101ad2c9844b", + "version": "opam:1.0.0", "source": { "type": "install", - "source": [ - "github:NatKarmios/conf-python-3-7:conf-python-3-7.opam#1a624b3cd5738a6a0f51f5638b5d101ad2c9844b" - ] + "source": [ "no-source:" ], + "opam": { + "name": "conf-python-3-7", + "version": "1.0.0", + "path": "esy.lock/opam/conf-python-3-7.1.0.0" + } }, "overrides": [], "dependencies": [ @@ -3315,7 +3316,7 @@ } ], "dependencies": [ - "esy-gmp@archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2@970088ca", + "esy-gmp@archive:https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz#sha1:0578d48607ec0e272177d175fd1807c30b00fdf2@b7788c94", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [] diff --git a/esy.lock/opam/conf-python-3-7.1.0.0/files/configure.sh b/esy.lock/opam/conf-python-3-7.1.0.0/files/configure.sh new file mode 100644 index 000000000..fce943a88 --- /dev/null +++ b/esy.lock/opam/conf-python-3-7.1.0.0/files/configure.sh @@ -0,0 +1,8 @@ +for version in 3.11 3.10 3.9 3.8 3.7; do + python_exe="python$version" + if "$python_exe" test.py; then + echo "python3: \"$python_exe\"" >> conf-python-3-7.config + exit 0 + fi +done +exit 1 diff --git a/esy.lock/opam/conf-python-3-7.1.0.0/files/test.py b/esy.lock/opam/conf-python-3-7.1.0.0/files/test.py new file mode 100644 index 000000000..a45974e2a --- /dev/null +++ b/esy.lock/opam/conf-python-3-7.1.0.0/files/test.py @@ -0,0 +1,2 @@ +import sys +assert(sys.hexversion >= 0x03070000) diff --git a/esy.lock/opam/conf-python-3-7.1.0.0/opam b/esy.lock/opam/conf-python-3-7.1.0.0/opam new file mode 100644 index 000000000..f53ca2858 --- /dev/null +++ b/esy.lock/opam/conf-python-3-7.1.0.0/opam @@ -0,0 +1,44 @@ +opam-version: "2.0" +maintainer: "thierry.martinez@inria.fr" +homepage: "https://www.python.org/download/releases/3.7" +authors: "Python Software Foundation" +license: "PSF-2.0" +bug-reports: "https://github.com/ocaml/opam-repository/issues" +build: ["bash" "-ex" "configure.sh"] +depends: [ + "conf-bash" {build} +] +depexts: [ + ["python3.7"] + {os-distribution = "ubuntu" & os-version < "20.04"} + ["python3"] {os-family = "debian" + & !(os-distribution = "ubuntu" & os-version < "20.04")} + ["python3"] {os-distribution = "nixos"} + ["python3"] {os-distribution = "alpine"} + ["python37" "epel-release"] {os-distribution = "centos"} + ["python3"] {os-distribution = "fedora"} + ["python38"] {os-distribution = "ol"} # No python37 package + ["python"] {os-distribution = "arch"} + ["python3"] {os-family = "suse" | os-family = "opensuse"} + ["dev-lang/python:3.7"] {os-distribution = "gentoo"} + ["python3"] {os = "openbsd"} + ["lang/python37"] {os = "netbsd"} + ["lang/python37"] {os = "freebsd"} + ["python37"] {os-distribution = "macports" & os = "macos"} + ["python@3"] {os-distribution = "homebrew" & os = "macos"} + ["system:python3"] {os-distribution = "cygwinports"} +] +x-ci-accept-failures: [ + "opensuse-15.3" # python >=3.7 not packaged +] +synopsis: "Virtual package relying on Python >=3.7 installation" +description: """ +This package can only install if a Python interpreter >=3.7 is available +on the system. +If a minor version needs to be specified for your operating system, then +python-3.7 will be used. +""" +extra-files: [ + ["test.py" "sha512=a9d993b9380d636fc2aff8af6bae1078ad14a2af4e510b7c437d5f1e01cd125b7f12e15fb8f0e0c4536d2f7d6aa0d36aafdf2f9da828ac7686df6dc782fa1a23"] + ["configure.sh" "sha512=119e7ab0f6763705b4b06ff6ac1e9724687ea824709ce1bc6a3752cc1f262a6c050c92bbc0f10fe78c9b6a07705cb29422a0063433ff38c00cba8fb58af3ec0b"]] +flags: conf diff --git a/esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/.gitignore b/esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/.gitignore similarity index 100% rename from esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/.gitignore rename to esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/.gitignore diff --git a/esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/package.json b/esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/package.json similarity index 100% rename from esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/package.json rename to esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/package.json diff --git a/esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/test/package.json b/esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/test/package.json similarity index 100% rename from esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/test/package.json rename to esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/test/package.json diff --git a/esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/test/test.c b/esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/test/test.c similarity index 100% rename from esy.lock/overrides/970088ca61c313c3c7c346d14ceb70d0/test/test.c rename to esy.lock/overrides/b7788c94efa7edeebd57e710cce6713d/test/test.c diff --git a/esy.lock/overrides/fc8aca50331b1614aabf2a8e74820a5e/package.json b/esy.lock/overrides/ee5be9c1213cfc9c8d43f4061c829e80/package.json similarity index 100% rename from esy.lock/overrides/fc8aca50331b1614aabf2a8e74820a5e/package.json rename to esy.lock/overrides/ee5be9c1213cfc9c8d43f4061c829e80/package.json