From 72a898dde4b6dc59a9fa532d747f2bfc5f274e13 Mon Sep 17 00:00:00 2001 From: Sam Balco Date: Wed, 4 Sep 2024 12:57:06 +0100 Subject: [PATCH] update k version and fix breaking nix changes introduced recently --- deps/k_release | 2 +- flake.lock | 234 ++++--------------------------------------------- flake.nix | 22 ++--- poetry.lock | 60 +++++++------ pyproject.toml | 2 +- 5 files changed, 55 insertions(+), 265 deletions(-) diff --git a/deps/k_release b/deps/k_release index 4578ffe50..d5d966726 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -7.1.125 +7.1.131 diff --git a/flake.lock b/flake.lock index ecc9d69d8..928dcd558 100644 --- a/flake.lock +++ b/flake.lock @@ -165,24 +165,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fmt-src": { "flake": false, "locked": { @@ -227,11 +209,11 @@ ] }, "locked": { - "lastModified": 1725268290, - "narHash": "sha256-Y53z5Sb0XfEuxRnjlexIUkQFwA4JBwfZw83B636NdmQ=", + "lastModified": 1725354688, + "narHash": "sha256-KHHFemVt6C/hbGoMzIq7cpxmjdp+KZVZaqbvx02aliY=", "owner": "shazow", "repo": "foundry.nix", - "rev": "e844ebd34940dc0197f9a8b7b13b9e5fe6ac1219", + "rev": "671672bd60a0d2e5f6757638fdf27e806df755a4", "type": "github" }, "original": { @@ -408,16 +390,16 @@ ] }, "locked": { - "lastModified": 1724947368, - "narHash": "sha256-lJfhlPjI515NJnV8621tVSD1tOeAOKn1G4bDgO4szcs=", + "lastModified": 1725395202, + "narHash": "sha256-UCMS6H8zIjFzN4xAXdCNcW7UChAp9knpRnscTg5z+jA=", "owner": "runtimeverification", "repo": "k", - "rev": "fd1ebee32b51b25a5008fe4daee28ec816927856", + "rev": "42e03545c319847e7df84e6fbc196b2f51c148a0", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.1.125", + "ref": "v7.1.131", "repo": "k", "type": "github" } @@ -441,17 +423,11 @@ "k-framework", "nixpkgs" ], - "nixpkgs-pyk": [ - "kevm", - "pyk", - "nixpkgs" - ], "poetry2nix": [ "kevm", - "pyk", + "k-framework", "poetry2nix" ], - "pyk": "pyk", "rv-utils": [ "kevm", "k-framework", @@ -459,16 +435,16 @@ ] }, "locked": { - "lastModified": 1725271315, - "narHash": "sha256-QarMN6coUghkopIEeMKJsh9C2z68w+yLbuCyueKZaio=", + "lastModified": 1725445595, + "narHash": "sha256-BA310hwjtZl4D6G1TtJnSoJk3Nc1tYJmQNZQHnJtb9Y=", "owner": "runtimeverification", "repo": "evm-semantics", - "rev": "b33854c070637db4da006a75908f75e60c0c3dfd", + "rev": "6be9c545754b61169be827da056cfb8623de02a3", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v1.0.706", + "ref": "v1.0.707", "repo": "evm-semantics", "type": "github" } @@ -602,29 +578,6 @@ "type": "github" } }, - "nix-github-actions_3": { - "inputs": { - "nixpkgs": [ - "kevm", - "pyk", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1693660503, - "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1716457947, @@ -657,22 +610,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1716457947, - "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", - "type": "github" - } - }, "poetry2nix": { "inputs": { "flake-utils": "flake-utils", @@ -716,44 +653,17 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1698640399, - "narHash": "sha256-mXzyx79/iFLZ0UDuSkqgFfejYRcSJfsCnJ9WlMusaI0=", + "lastModified": 1725253878, + "narHash": "sha256-HwXut4WbOUAjmybhui2eNSE6+Wb0nigYgDzBBOZaPG4=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", + "rev": "0d3fad5740d892487805cd2d60d8e4ed828486e9", "type": "github" }, "original": { "owner": "nix-community", + "ref": "2024.9.219347", "repo": "poetry2nix", - "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", - "type": "github" - } - }, - "poetry2nix_3": { - "inputs": { - "flake-utils": "flake-utils_3", - "nix-github-actions": "nix-github-actions_3", - "nixpkgs": [ - "kevm", - "pyk", - "nixpkgs" - ], - "systems": "systems_8", - "treefmt-nix": "treefmt-nix_3" - }, - "locked": { - "lastModified": 1698640399, - "narHash": "sha256-mXzyx79/iFLZ0UDuSkqgFfejYRcSJfsCnJ9WlMusaI0=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", "type": "github" } }, @@ -791,40 +701,6 @@ "type": "github" } }, - "pyk": { - "inputs": { - "flake-utils": [ - "kevm", - "pyk", - "poetry2nix", - "flake-utils" - ], - "nixpkgs": [ - "kevm", - "pyk", - "rv-utils", - "nixpkgs" - ], - "poetry2nix": "poetry2nix_3", - "rv-utils": "rv-utils_3" - }, - "locked": { - "dir": "pyk", - "lastModified": 1724947368, - "narHash": "sha256-lJfhlPjI515NJnV8621tVSD1tOeAOKn1G4bDgO4szcs=", - "owner": "runtimeverification", - "repo": "k", - "rev": "fd1ebee32b51b25a5008fe4daee28ec816927856", - "type": "github" - }, - "original": { - "dir": "pyk", - "owner": "runtimeverification", - "ref": "v7.1.125", - "repo": "k", - "type": "github" - } - }, "rapidjson-src": { "flake": false, "locked": { @@ -875,18 +751,10 @@ "kevm", "nixpkgs" ], - "nixpkgs-pyk": [ - "kevm", - "nixpkgs-pyk" - ], "poetry2nix": [ "kevm", "poetry2nix" ], - "pyk": [ - "kevm", - "pyk" - ], "rv-utils": [ "kevm", "rv-utils" @@ -930,24 +798,6 @@ "type": "github" } }, - "rv-utils_3": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1716459074, - "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", - "owner": "runtimeverification", - "repo": "rv-nix-tools", - "rev": "a65058865cda201de504f5546271b8e997a0be9c", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "repo": "rv-nix-tools", - "type": "github" - } - }, "solc": { "inputs": { "flake-utils": [ @@ -1102,35 +952,6 @@ "type": "indirect" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1178,29 +999,6 @@ "type": "github" } }, - "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "kevm", - "pyk", - "poetry2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1697388351, - "narHash": "sha256-63N2eBpKaziIy4R44vjpUu8Nz5fCJY7okKrkixvDQmY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "aae39f64f5ecbe89792d05eacea5cb241891292a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index dd5d8bea8..0f68b6a70 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,11 @@ description = "Kontrol"; inputs = { - kevm.url = "github:runtimeverification/evm-semantics/v1.0.706"; + kevm.url = "github:runtimeverification/evm-semantics/v1.0.707"; nixpkgs.follows = "kevm/nixpkgs"; - nixpkgs-pyk.follows = "kevm/nixpkgs-pyk"; k-framework.follows = "kevm/k-framework"; flake-utils.follows = "kevm/flake-utils"; rv-utils.follows = "kevm/rv-utils"; - pyk.follows = "kevm/pyk"; poetry2nix.follows = "kevm/poetry2nix"; foundry = { url = @@ -23,23 +21,19 @@ }; }; outputs = { self, k-framework, nixpkgs, flake-utils, poetry2nix, kevm - , rv-utils, pyk, foundry, solc, ... }@inputs: + , rv-utils, foundry, solc, ... }@inputs: let nixLibs = pkgs: with pkgs; "-I${openssl.dev}/include -L${openssl.out}/lib -I${secp256k1}/include -L${secp256k1}/lib"; overlay = final: prev: let - nixpkgs-pyk = import inputs.nixpkgs-pyk { - system = prev.system; - overlays = [ pyk.overlay ]; - }; poetry2nix = - inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = nixpkgs-pyk; }; + inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = prev; }; kontrol-pyk = { solc_version ? null }: (poetry2nix.mkPoetryApplication { - python = nixpkgs-pyk.python310; + python = prev.python310; projectDir = ./.; postPatch = '' @@ -53,13 +47,8 @@ overrides = poetry2nix.overrides.withDefaults (finalPython: prevPython: { - pyk = nixpkgs-pyk.pyk-python310; + pyk = prev.pyk-python310; kevm-pyk = prev.kevm-pyk; - xdg-base-dirs = prevPython.xdg-base-dirs.overridePythonAttrs - (old: { - propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) - ++ [ finalPython.poetry ]; - }); }); groups = [ ]; # We remove `"dev"` from `checkGroups`, so that poetry2nix does not try to resolve dev dependencies. @@ -140,6 +129,7 @@ overlays = [ (final: prev: { llvm-backend-release = false; }) k-framework.overlay + k-framework.overlays.pyk foundry.overlay solc.overlay kevm.overlays.default diff --git a/poetry.lock b/poetry.lock index fd22748f0..d0643d6fa 100644 --- a/poetry.lock +++ b/poetry.lock @@ -665,7 +665,7 @@ colors = ["colorama (>=0.4.6)"] [[package]] name = "kevm-pyk" -version = "1.0.706" +version = "1.0.707" description = "" optional = false python-versions = "^3.10" @@ -673,26 +673,26 @@ files = [] develop = false [package.dependencies] -kframework = "7.1.125" +kframework = "7.1.131" pathos = "*" tomlkit = "^0.11.6" [package.source] type = "git" url = "https://github.com/runtimeverification/evm-semantics.git" -reference = "v1.0.706" -resolved_reference = "b33854c070637db4da006a75908f75e60c0c3dfd" +reference = "v1.0.707" +resolved_reference = "6be9c545754b61169be827da056cfb8623de02a3" subdirectory = "kevm-pyk" [[package]] name = "kframework" -version = "7.1.125" +version = "7.1.131" description = "" optional = false python-versions = "<4.0,>=3.10" files = [ - {file = "kframework-7.1.125-py3-none-any.whl", hash = "sha256:34eb95d0fb1cf7815697a558615412eaac0a54140d828606785fea6e0ead594f"}, - {file = "kframework-7.1.125.tar.gz", hash = "sha256:4e6b4296b2beefd30662d9e401bd910e4dff713b2bfee53468f453e6769f30a3"}, + {file = "kframework-7.1.131-py3-none-any.whl", hash = "sha256:b16de689e8b4c70f6484b5b399b09a9dbe35ffbc847fce719d7c17de53d2ee9f"}, + {file = "kframework-7.1.131.tar.gz", hash = "sha256:2052038a3c8627f3127a3efb5de41d8fce462c3119f91d47a958d2c8e8687553"}, ] [package.dependencies] @@ -701,7 +701,7 @@ coloredlogs = ">=15.0.1,<16.0.0" filelock = ">=3.9.0,<4.0.0" graphviz = ">=0.20.1,<0.21.0" hypothesis = ">=6.103.1,<7.0.0" -psutil = "5.9.5" +psutil = ">=5.9.5,<6.0.0" pybind11 = ">=2.10.3,<3.0.0" pytest = "*" textual = ">=0.27.0,<0.28.0" @@ -988,25 +988,27 @@ dill = ["dill (>=0.3.8)"] [[package]] name = "psutil" -version = "5.9.5" +version = "5.9.8" description = "Cross-platform lib for process and system monitoring in Python." optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -files = [ - {file = "psutil-5.9.5-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:be8929ce4313f9f8146caad4272f6abb8bf99fc6cf59344a3167ecd74f4f203f"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:ab8ed1a1d77c95453db1ae00a3f9c50227ebd955437bcf2a574ba8adbf6a74d5"}, - {file = "psutil-5.9.5-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4aef137f3345082a3d3232187aeb4ac4ef959ba3d7c10c33dd73763fbc063da4"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ea8518d152174e1249c4f2a1c89e3e6065941df2fa13a1ab45327716a23c2b48"}, - {file = "psutil-5.9.5-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:acf2aef9391710afded549ff602b5887d7a2349831ae4c26be7c807c0a39fac4"}, - {file = "psutil-5.9.5-cp27-none-win32.whl", hash = "sha256:5b9b8cb93f507e8dbaf22af6a2fd0ccbe8244bf30b1baad6b3954e935157ae3f"}, - {file = "psutil-5.9.5-cp27-none-win_amd64.whl", hash = "sha256:8c5f7c5a052d1d567db4ddd231a9d27a74e8e4a9c3f44b1032762bd7b9fdcd42"}, - {file = "psutil-5.9.5-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:3c6f686f4225553615612f6d9bc21f1c0e305f75d7d8454f9b46e901778e7217"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a7dd9997128a0d928ed4fb2c2d57e5102bb6089027939f3b722f3a210f9a8da"}, - {file = "psutil-5.9.5-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89518112647f1276b03ca97b65cc7f64ca587b1eb0278383017c2a0dcc26cbe4"}, - {file = "psutil-5.9.5-cp36-abi3-win32.whl", hash = "sha256:104a5cc0e31baa2bcf67900be36acde157756b9c44017b86b2c049f11957887d"}, - {file = "psutil-5.9.5-cp36-abi3-win_amd64.whl", hash = "sha256:b258c0c1c9d145a1d5ceffab1134441c4c5113b2417fafff7315a917a026c3c9"}, - {file = "psutil-5.9.5-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:c607bb3b57dc779d55e1554846352b4e358c10fff3abf3514a7a6601beebdb30"}, - {file = "psutil-5.9.5.tar.gz", hash = "sha256:5410638e4df39c54d957fc51ce03048acd8e6d60abc0f5107af51e5fb566eb3c"}, +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +files = [ + {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"}, + {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"}, + {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"}, + {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"}, + {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"}, + {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"}, + {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"}, + {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"}, + {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"}, + {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"}, + {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"}, + {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"}, + {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"}, + {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"}, + {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"}, + {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"}, ] [package.extras] @@ -1249,13 +1251,13 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"] [[package]] name = "setuptools" -version = "74.0.0" +version = "74.1.1" description = "Easily download, build, install, upgrade, and uninstall Python packages" optional = false python-versions = ">=3.8" files = [ - {file = "setuptools-74.0.0-py3-none-any.whl", hash = "sha256:0274581a0037b638b9fc1c6883cc71c0210865aaa76073f7882376b641b84e8f"}, - {file = "setuptools-74.0.0.tar.gz", hash = "sha256:a85e96b8be2b906f3e3e789adec6a9323abf79758ecfa3065bd740d81158b11e"}, + {file = "setuptools-74.1.1-py3-none-any.whl", hash = "sha256:fc91b5f89e392ef5b77fe143b17e32f65d3024744fba66dc3afe07201684d766"}, + {file = "setuptools-74.1.1.tar.gz", hash = "sha256:2353af060c06388be1cecbf5953dcdb1f38362f87a2356c480b6b4d5fcfc8847"}, ] [package.extras] @@ -1411,4 +1413,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "ee74ff5430c84455ab800518ce199f810cf12ab5a17a56ae07f52ea86d8042dd" +content-hash = "0e64d44b850bf6001890d1f1547f72e1bec86fbb3c91c2e013e0154763835178" diff --git a/pyproject.toml b/pyproject.toml index fee770dc6..87fc57d6c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ authors = [ [tool.poetry.dependencies] python = "^3.10" -kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.706", subdirectory = "kevm-pyk" } +kevm-pyk = { git = "https://github.com/runtimeverification/evm-semantics.git", tag = "v1.0.707", subdirectory = "kevm-pyk" } eth-utils = "^4.1.1" pycryptodome = "^3.20.0"