From 9c95f7bb163003ddbe2548fa12aa4c8ebcd6f64a Mon Sep 17 00:00:00 2001 From: rv-jenkins Date: Mon, 30 Oct 2023 14:23:45 -0600 Subject: [PATCH] Update dependency: deps/pyk_release (#2141) * deps/pyk_release: Set Version v0.1.480 * Set Version: 1.0.329 * kevm-pyk/: sync poetry files pyk version v0.1.480 * deps/k_release: sync release file version 6.0.164 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.481 * kevm-pyk/: sync poetry files pyk version v0.1.481 * deps/k_release: sync release file version 6.0.174 * flake.{nix,lock}: update Nix derivations * Set Version: 1.0.330 * kevm-pyk/: sync poetry files pyk version v0.1.481 * deps/pyk_release: Set Version v0.1.482 * kevm-pyk/: sync poetry files pyk version v0.1.482 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.483 * kevm-pyk/: sync poetry files pyk version v0.1.483 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.484 * kevm-pyk/: sync poetry files pyk version v0.1.484 * flake.{nix,lock}: update Nix derivations * deps/pyk_release: Set Version v0.1.485 * kevm-pyk/: sync poetry files pyk version v0.1.485 * flake.{nix,lock}: update Nix derivations * Set Version: 1.0.331 * deps/pyk_release: Set Version v0.1.486 * fix poetry2nix * kevm-pyk/: sync poetry files pyk version v0.1.486 * flake.{nix,lock}: update Nix derivations * minor tweak --------- Co-authored-by: devops Co-authored-by: Palina Tolmach Co-authored-by: Sam Balco --- deps/k_release | 2 +- deps/pyk_release | 2 +- flake.lock | 365 ++++++++---------------------- flake.nix | 143 +++++++----- kevm-pyk/poetry.lock | 64 +++--- kevm-pyk/pyproject.toml | 4 +- kevm-pyk/src/kevm_pyk/__init__.py | 2 +- package/version | 2 +- 8 files changed, 218 insertions(+), 366 deletions(-) diff --git a/deps/k_release b/deps/k_release index f34b555335..31ef8ee690 100644 --- a/deps/k_release +++ b/deps/k_release @@ -1 +1 @@ -6.0.163 +6.0.174 diff --git a/deps/pyk_release b/deps/pyk_release index bb74256145..c5179d2b05 100644 --- a/deps/pyk_release +++ b/deps/pyk_release @@ -1 +1 @@ -v0.1.478 +v0.1.486 diff --git a/flake.lock b/flake.lock index 6126ac44cb..36fe1adcf9 100644 --- a/flake.lock +++ b/flake.lock @@ -51,7 +51,10 @@ }, "booster-backend": { "inputs": { - "haskell-backend": "haskell-backend", + "haskell-backend": [ + "k-framework", + "haskell-backend" + ], "nixpkgs": [ "k-framework", "haskell-backend", @@ -59,23 +62,22 @@ ], "stacklock2nix": [ "k-framework", - "booster-backend", "haskell-backend", "stacklock2nix" ] }, "locked": { - "lastModified": 1697708260, - "narHash": "sha256-90yzwwRfFGXpqYHLU++r1hW+PxH09+vF11BN8JkUe0c=", + "lastModified": 1698380696, + "narHash": "sha256-+2ll6O1nn53Fgm09R+Bz4otMs5jn3Xeo2nx0tfhmnH0=", "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "26b5d2df37c6fcc210d80ff57d1c3572a41f90b5", + "rev": "59bdfa3f5e3ee4d82351d8de44137029c47e23a8", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "hs-backend-booster", - "rev": "26b5d2df37c6fcc210d80ff57d1c3572a41f90b5", + "rev": "59bdfa3f5e3ee4d82351d8de44137029c47e23a8", "type": "github" } }, @@ -164,21 +166,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -196,31 +183,16 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" + "systems": "systems_2" }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { "locked": { - "lastModified": 1676283394, - "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -248,8 +220,14 @@ }, "foundry": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "flake-utils": [ + "k-framework", + "flake-utils" + ], + "nixpkgs": [ + "k-framework", + "nixpkgs" + ] }, "locked": { "lastModified": 1696410815, @@ -268,7 +246,7 @@ }, "haskell-backend": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stacklock2nix": "stacklock2nix", "z3": "z3" }, @@ -287,27 +265,6 @@ "type": "github" } }, - "haskell-backend_2": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "stacklock2nix": "stacklock2nix_2", - "z3": "z3_2" - }, - "locked": { - "lastModified": 1697702407, - "narHash": "sha256-r9c5qpgoejKJePbxqq01QkHx/wZNypY/fUSugsapF8w=", - "owner": "runtimeverification", - "repo": "haskell-backend", - "rev": "03a6228f78d7f4805fee4b9d9c45208dcbe0c9fb", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "repo": "haskell-backend", - "rev": "03a6228f78d7f4805fee4b9d9c45208dcbe0c9fb", - "type": "github" - } - }, "immer-src": { "flake": false, "locked": { @@ -329,26 +286,28 @@ "inputs": { "booster-backend": "booster-backend", "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "haskell-backend": "haskell-backend_2", + "flake-utils": "flake-utils", + "haskell-backend": "haskell-backend", "llvm-backend": "llvm-backend", - "mavenix": "mavenix_2", + "mavenix": "mavenix", "nixpkgs": [ + "k-framework", + "haskell-backend", "nixpkgs" ], "rv-utils": "rv-utils" }, "locked": { - "lastModified": 1698092614, - "narHash": "sha256-xnvC+UGKlCajhnq/SonHVLC/CyGX1yWuLEWbq3FVkoU=", + "lastModified": 1698399750, + "narHash": "sha256-5l1tHDW848AQAniqPsITLn51ywV+s+5YILjR0CYFmQ8=", "owner": "runtimeverification", "repo": "k", - "rev": "2ce108c5aff0063d26ef2a64466566d8d91abfc2", + "rev": "5f141fe4cd5c945015c4ac45946d37c7afedb3df", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v6.0.163", + "ref": "v6.0.174", "repo": "k", "type": "github" } @@ -374,7 +333,10 @@ "inputs": { "fmt-src": "fmt-src", "immer-src": "immer-src", - "mavenix": "mavenix", + "mavenix": [ + "k-framework", + "mavenix" + ], "nixpkgs": [ "k-framework", "haskell-backend", @@ -382,7 +344,10 @@ ], "pybind11-src": "pybind11-src", "rapidjson-src": "rapidjson-src", - "utils": "utils_2" + "utils": [ + "k-framework", + "flake-utils" + ] }, "locked": { "lastModified": 1697808331, @@ -400,8 +365,15 @@ }, "mavenix": { "inputs": { - "nixpkgs": "nixpkgs_4", - "utils": "utils" + "nixpkgs": [ + "k-framework", + "haskell-backend", + "nixpkgs" + ], + "utils": [ + "k-framework", + "flake-utils" + ] }, "locked": { "lastModified": 1643802645, @@ -417,25 +389,6 @@ "type": "github" } }, - "mavenix_2": { - "inputs": { - "nixpkgs": "nixpkgs_5", - "utils": "utils_3" - }, - "locked": { - "lastModified": 1689018333, - "narHash": "sha256-sthxx50rj0E7gv38oeMj8GZOp7i1776P1qZsM7pVLd0=", - "owner": "goodlyrottenapple", - "repo": "mavenix", - "rev": "153d69e62f87e5dd37d35492cc3e35dd80d2b5fa", - "type": "github" - }, - "original": { - "owner": "goodlyrottenapple", - "repo": "mavenix", - "type": "github" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -445,11 +398,11 @@ ] }, "locked": { - "lastModified": 1688870561, - "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "lastModified": 1693660503, + "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0", "type": "github" }, "original": { @@ -459,35 +412,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1666753130, - "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1696983906, "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", @@ -502,71 +426,44 @@ "type": "indirect" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1621552131, - "narHash": "sha256-AD/AEXv+QOYAg0PIqMYv2nbGOGTIwfOGKtz3rE+y+Tc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d42cd445dde587e9a993cd9434cb43da07c4c5de", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1621552131, - "narHash": "sha256-AD/AEXv+QOYAg0PIqMYv2nbGOGTIwfOGKtz3rE+y+Tc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d42cd445dde587e9a993cd9434cb43da07c4c5de", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_6": { + "nixpkgs_2": { "locked": { - "lastModified": 1680577567, - "narHash": "sha256-Y4W57i0TzczqwMTjfVSbAZT5RJx7u+mpQIW/ofrkTQs=", + "lastModified": 1698675399, + "narHash": "sha256-nj+LNEeVXGP31vxoL3x7HW7+oEiyoLVDqwMg30yFBMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4", + "rev": "7378978469efa3b2b2f97d645a2a0b0e2447da2b", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4", "type": "github" } }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "pyk", "nixpkgs" - ] + ], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1691336383, - "narHash": "sha256-sCPemHLepJxZwYpAIs6RfgYVO8SlutWq2yc3lZgXvko=", + "lastModified": 1698640399, + "narHash": "sha256-mXzyx79/iFLZ0UDuSkqgFfejYRcSJfsCnJ9WlMusaI0=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "13db539ad3f93711a848a7cb5e50a529dfe04620", + "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "poetry2nix", + "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", "type": "github" } }, @@ -590,26 +487,24 @@ "pyk": { "inputs": { "flake-utils": [ - "k-framework", + "pyk", + "poetry2nix", "flake-utils" ], - "nixpkgs": [ - "k-framework", - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1698128838, - "narHash": "sha256-zdqn5tcD85B2Z48YagiXXVvvnsK0mnY1je1F+O7Tmno=", + "lastModified": 1698684955, + "narHash": "sha256-IO1mqA/Z4Mv9FF91qw4TfSWnBA0mse5snx3owKunnQc=", "owner": "runtimeverification", "repo": "pyk", - "rev": "5d3e77d23cfe46d682f8e2d50e9865287d3729bb", + "rev": "23a97935da94cded4392bc028cdf16bd6f7edd5b", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.478", + "ref": "v0.1.486", "repo": "pyk", "type": "github" } @@ -646,13 +541,23 @@ "haskell-backend" ], "k-framework": "k-framework", - "nixpkgs": "nixpkgs_6", + "nixpkgs": [ + "k-framework", + "nixpkgs" + ], + "nixpkgs-pyk": [ + "pyk", + "nixpkgs" + ], "poetry2nix": [ "pyk", "poetry2nix" ], "pyk": "pyk", - "rv-utils": "rv-utils_2", + "rv-utils": [ + "k-framework", + "rv-utils" + ], "solc": "solc" } }, @@ -671,21 +576,6 @@ "type": "github" } }, - "rv-utils_2": { - "locked": { - "lastModified": 1659349707, - "narHash": "sha256-+RwJvYwRS4In+pl8R5Uz+R/yZ5yO5SAa7X6UR+eSC2U=", - "owner": "runtimeverification", - "repo": "rv-nix-tools", - "rev": "7026604726c5247ceb6e7a1a7532302a58e7e2bf", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "repo": "rv-nix-tools", - "type": "github" - } - }, "secp256k1": { "flake": false, "locked": { @@ -705,8 +595,12 @@ }, "solc": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": [ + "k-framework", + "flake-utils" + ], "nixpkgs": [ + "k-framework", "nixpkgs" ] }, @@ -739,21 +633,6 @@ "type": "github" } }, - "stacklock2nix_2": { - "locked": { - "lastModified": 1696895532, - "narHash": "sha256-QXQ7frsy7D8V81oE6HQBZhlL48Vr7iPR5fSZfNaTdg0=", - "owner": "cdepillabout", - "repo": "stacklock2nix", - "rev": "10d531672cada2e02ac49b1b18293e7a94938a38", - "type": "github" - }, - "original": { - "owner": "cdepillabout", - "repo": "stacklock2nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -794,56 +673,29 @@ "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "locked": { - "lastModified": 1620759905, - "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "id": "systems", + "type": "indirect" } }, - "utils_2": { + "treefmt-nix": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" + "nixpkgs": [ + "pyk", + "poetry2nix", + "nixpkgs" + ] }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_3": { "locked": { - "lastModified": 1620759905, - "narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", + "lastModified": 1697388351, + "narHash": "sha256-63N2eBpKaziIy4R44vjpUu8Nz5fCJY7okKrkixvDQmY=", "owner": "numtide", - "repo": "flake-utils", - "rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", + "repo": "treefmt-nix", + "rev": "aae39f64f5ecbe89792d05eacea5cb241891292a", "type": "github" }, "original": { "owner": "numtide", - "repo": "flake-utils", + "repo": "treefmt-nix", "type": "github" } }, @@ -880,23 +732,6 @@ "repo": "z3", "type": "github" } - }, - "z3_2": { - "flake": false, - "locked": { - "lastModified": 1674011426, - "narHash": "sha256-7cuUf29TMpX62PwO1ab3ZuzmzlcrRjTKB1CyXnYgYus=", - "owner": "Z3Prover", - "repo": "z3", - "rev": "3012293c35eadbfd73e5b94adbe50b0cc44ffb83", - "type": "github" - }, - "original": { - "owner": "Z3Prover", - "ref": "z3-4.12.1", - "repo": "z3", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 346b276e2d..7bddead332 100644 --- a/flake.nix +++ b/flake.nix @@ -2,41 +2,52 @@ description = "A flake for the KEVM Semantics"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/b01f185e4866de7c5b5a82f833ca9ea3c3f72fc4"; - k-framework.url = "github:runtimeverification/k/v6.0.163"; - k-framework.inputs.nixpkgs.follows = "nixpkgs"; - #nixpkgs.follows = "k-framework/nixpkgs"; + k-framework.url = "github:runtimeverification/k/v6.0.174"; + nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; - rv-utils.url = "github:runtimeverification/rv-nix-tools"; + rv-utils.follows = "k-framework/rv-utils"; + pyk.url = "github:runtimeverification/pyk/v0.1.486"; + nixpkgs-pyk.follows = "pyk/nixpkgs"; poetry2nix.follows = "pyk/poetry2nix"; - blockchain-k-plugin.url = "github:runtimeverification/blockchain-k-plugin/b42e6ede9f6b72cedabc519810416e2994caad45"; - blockchain-k-plugin.inputs.flake-utils.follows = "k-framework/flake-utils"; - blockchain-k-plugin.inputs.nixpkgs.follows = "k-framework/nixpkgs"; - ethereum-tests.url = "github:ethereum/tests/6401889dec4eee58e808fd178fb2c7f628a3e039"; - ethereum-tests.flake = false; - ethereum-legacytests.url = "github:ethereum/legacytests/d7abc42a7b352a7b44b1f66b58aca54e4af6a9d7"; - ethereum-legacytests.flake = false; + blockchain-k-plugin = { + url = + "github:runtimeverification/blockchain-k-plugin/b42e6ede9f6b72cedabc519810416e2994caad45"; + inputs.flake-utils.follows = "k-framework/flake-utils"; + inputs.nixpkgs.follows = "k-framework/nixpkgs"; + }; + ethereum-tests = { + url = "github:ethereum/tests/6401889dec4eee58e808fd178fb2c7f628a3e039"; + flake = false; + }; + ethereum-legacytests = { + url = + "github:ethereum/legacytests/d7abc42a7b352a7b44b1f66b58aca54e4af6a9d7"; + flake = false; + }; haskell-backend.follows = "k-framework/haskell-backend"; - pyk.url = "github:runtimeverification/pyk/v0.1.478"; - pyk.inputs.flake-utils.follows = "k-framework/flake-utils"; - pyk.inputs.nixpkgs.follows = "k-framework/nixpkgs"; - foundry.url = "github:shazow/foundry.nix/monthly"; # Use monthly branch for permanent releases + foundry = { + url = + "github:shazow/foundry.nix/monthly"; # Use monthly branch for permanent releases + inputs.nixpkgs.follows = "k-framework/nixpkgs"; + inputs.flake-utils.follows = "k-framework/flake-utils"; + }; solc = { url = "github:hellwolf/solc.nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "k-framework/nixpkgs"; + inputs.flake-utils.follows = "k-framework/flake-utils"; }; }; outputs = { self, k-framework, haskell-backend, nixpkgs, flake-utils - , poetry2nix, blockchain-k-plugin, ethereum-tests, ethereum-legacytests - , rv-utils, pyk, foundry, solc }: + , blockchain-k-plugin, ethereum-tests, ethereum-legacytests, rv-utils, pyk + , foundry, solc, ... }@inputs: let nixLibs = pkgs: with pkgs; "-I${procps}/include -L${procps}/lib -I${openssl.dev}/include -L${openssl.out}/lib"; - buildInputs = pkgs: k: + buildInputs = pkgs: with pkgs; [ - k + k-framework.packages.${pkgs.system}.k llvm-backend autoconf automake @@ -49,17 +60,25 @@ openssl.dev pkg-config procps - python310 + python310-pyk (solc.mkDefault pkgs solc_0_8_13) time ] ++ lib.optional (!stdenv.isDarwin) elfutils; - overlay = final: prev: { - kevm = k: - prev.stdenv.mkDerivation { + overlay = final: prev: + let + nixpkgs-pyk = import inputs.nixpkgs-pyk { + system = prev.system; + overlays = [ pyk.overlay ]; + }; + poetry2nix = + inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = nixpkgs-pyk; }; + in { + python310-pyk = nixpkgs-pyk.python310; + kevm = prev.stdenv.mkDerivation { pname = "kevm"; version = self.rev or "dirty"; - buildInputs = buildInputs final k ++ [ final.kevm-pyk ]; + buildInputs = buildInputs final ++ [ final.kevm-pyk ]; nativeBuildInputs = [ prev.makeWrapper ]; src = prev.stdenv.mkDerivation { @@ -101,29 +120,31 @@ cp -r ./kdist-*/* $out/ mkdir -p $out/bin makeWrapper ${final.kevm-pyk}/bin/kevm $out/bin/kevm --prefix PATH : ${ - prev.lib.makeBinPath [ prev.which k ] + prev.lib.makeBinPath [ + prev.which + k-framework.packages.${prev.system}.k + ] } --set NIX_LIBS "${nixLibs prev}" --set KEVM_DIST_DIR $out makeWrapper ${final.kevm-pyk}/bin/kontrolx $out/bin/kontrolx --prefix PATH : ${ prev.lib.makeBinPath [ (solc.mkDefault final final.solc_0_8_13) final.foundry-bin prev.which - k + k-framework.packages.${prev.system}.k ] } --set NIX_LIBS "${nixLibs prev}" --set KEVM_DIST_DIR $out ''; }; - kevm-test = k: - prev.stdenv.mkDerivation { + kevm-test = prev.stdenv.mkDerivation { pname = "kevm-test"; version = self.rev or "dirty"; - src = (final.kevm k).src; + src = final.kevm.src; enableParallelBuilding = true; - buildInputs = [ (final.kevm k) prev.which prev.git ]; + buildInputs = [ final.kevm prev.which prev.git ]; buildPhase = '' mkdir -p tests/ethereum-tests/LegacyTests @@ -143,35 +164,35 @@ ''; }; - kevm-pyk = prev.poetry2nix.mkPoetryApplication { - python = prev.python310; - projectDir = ./kevm-pyk; + kevm-pyk = poetry2nix.mkPoetryApplication { + python = nixpkgs-pyk.python310; + projectDir = ./kevm-pyk; - postPatch = '' - substituteInPlace ./src/kontrolx/foundry.py \ - --replace "'forge', 'build'," "'forge', 'build', '--no-auto-detect'," - ''; + postPatch = '' + substituteInPlace ./src/kontrolx/foundry.py \ + --replace "'forge', 'build'," "'forge', 'build', '--no-auto-detect'," + ''; - overrides = prev.poetry2nix.overrides.withDefaults - (finalPython: prevPython: { - pyk = prev.pyk-python310; - 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. - checkGroups = [ ]; + overrides = poetry2nix.overrides.withDefaults + (finalPython: prevPython: { + pyk = nixpkgs-pyk.pyk-python310; + 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. + checkGroups = [ ]; - postInstall = '' - mkdir -p $out/${prev.python310.sitePackages}/kevm_pyk/kproj/plugin - cp -rv ${prev.blockchain-k-plugin-src}/* $out/${prev.python310.sitePackages}/kevm_pyk/kproj/plugin/ - ''; - }; + postInstall = '' + mkdir -p $out/${nixpkgs-pyk.python310.sitePackages}/kevm_pyk/kproj/plugin + cp -rv ${prev.blockchain-k-plugin-src}/* $out/${nixpkgs-pyk.python310.sitePackages}/kevm_pyk/kproj/plugin/ + ''; + }; - }; + }; in flake-utils.lib.eachSystem [ "x86_64-linux" "x86_64-darwin" @@ -188,18 +209,16 @@ }) k-framework.overlay blockchain-k-plugin.overlay - poetry2nix.overlay - pyk.overlay foundry.overlay solc.overlay overlay ]; }; - kevm = pkgs.kevm k-framework.packages.${system}.k; + kevm = pkgs.kevm; in { packages.default = kevm; devShell = pkgs.mkShell { - buildInputs = buildInputs pkgs k-framework.packages.${system}.k + buildInputs = buildInputs pkgs ++ [ pkgs.poetry-nixpkgs pkgs.foundry-bin ]; shellHook = '' @@ -226,7 +245,7 @@ packages = { inherit (pkgs) kevm-pyk; inherit kevm; - kevm-test = pkgs.kevm-test k-framework.packages.${system}.k; + kevm-test = pkgs.kevm-test; profile = pkgs.callPackage ./package/nix/profile.nix { inherit kevm; diff --git a/kevm-pyk/poetry.lock b/kevm-pyk/poetry.lock index 2ca213a5ce..adf2eb4d7b 100644 --- a/kevm-pyk/poetry.lock +++ b/kevm-pyk/poetry.lock @@ -261,19 +261,19 @@ testing = ["hatch", "pre-commit", "pytest", "tox"] [[package]] name = "filelock" -version = "3.12.4" +version = "3.13.0" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.12.4-py3-none-any.whl", hash = "sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4"}, - {file = "filelock-3.12.4.tar.gz", hash = "sha256:2e6f249f1f3654291606e046b09f1fd5eac39b360664c27f5aad072012f8bcbd"}, + {file = "filelock-3.13.0-py3-none-any.whl", hash = "sha256:a552f4fde758f4eab33191e9548f671970f8b06d436d31388c9aa1e5861a710f"}, + {file = "filelock-3.13.0.tar.gz", hash = "sha256:63c6052c82a1a24c873a549fbd39a26982e8f35a3016da231ead11a5be9dad44"}, ] [package.extras] -docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1.24)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] -typing = ["typing-extensions (>=4.7.1)"] +docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.24)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] +typing = ["typing-extensions (>=4.8)"] [[package]] name = "flake8" @@ -736,27 +736,25 @@ dill = ["dill (>=0.3.7)"] [[package]] name = "psutil" -version = "5.9.6" +version = "5.9.5" 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.*, !=3.4.*, !=3.5.*" -files = [ - {file = "psutil-5.9.6-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:fb8a697f11b0f5994550555fcfe3e69799e5b060c8ecf9e2f75c69302cc35c0d"}, - {file = "psutil-5.9.6-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:91ecd2d9c00db9817a4b4192107cf6954addb5d9d67a969a4f436dbc9200f88c"}, - {file = "psutil-5.9.6-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:10e8c17b4f898d64b121149afb136c53ea8b68c7531155147867b7b1ac9e7e28"}, - {file = "psutil-5.9.6-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:18cd22c5db486f33998f37e2bb054cc62fd06646995285e02a51b1e08da97017"}, - {file = "psutil-5.9.6-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:ca2780f5e038379e520281e4c032dddd086906ddff9ef0d1b9dcf00710e5071c"}, - {file = "psutil-5.9.6-cp27-none-win32.whl", hash = "sha256:70cb3beb98bc3fd5ac9ac617a327af7e7f826373ee64c80efd4eb2856e5051e9"}, - {file = "psutil-5.9.6-cp27-none-win_amd64.whl", hash = "sha256:51dc3d54607c73148f63732c727856f5febec1c7c336f8f41fcbd6315cce76ac"}, - {file = "psutil-5.9.6-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:c69596f9fc2f8acd574a12d5f8b7b1ba3765a641ea5d60fb4736bf3c08a8214a"}, - {file = "psutil-5.9.6-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:92e0cc43c524834af53e9d3369245e6cc3b130e78e26100d1f63cdb0abeb3d3c"}, - {file = "psutil-5.9.6-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:748c9dd2583ed86347ed65d0035f45fa8c851e8d90354c122ab72319b5f366f4"}, - {file = "psutil-5.9.6-cp36-cp36m-win32.whl", hash = "sha256:3ebf2158c16cc69db777e3c7decb3c0f43a7af94a60d72e87b2823aebac3d602"}, - {file = "psutil-5.9.6-cp36-cp36m-win_amd64.whl", hash = "sha256:ff18b8d1a784b810df0b0fff3bcb50ab941c3b8e2c8de5726f9c71c601c611aa"}, - {file = "psutil-5.9.6-cp37-abi3-win32.whl", hash = "sha256:a6f01f03bf1843280f4ad16f4bde26b817847b4c1a0db59bf6419807bc5ce05c"}, - {file = "psutil-5.9.6-cp37-abi3-win_amd64.whl", hash = "sha256:6e5fb8dc711a514da83098bc5234264e551ad980cec5f85dabf4d38ed6f15e9a"}, - {file = "psutil-5.9.6-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:daecbcbd29b289aac14ece28eca6a3e60aa361754cf6da3dfb20d4d32b6c7f57"}, - {file = "psutil-5.9.6.tar.gz", hash = "sha256:e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a"}, +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"}, ] [package.extras] @@ -814,7 +812,7 @@ plugins = ["importlib-metadata"] [[package]] name = "pyk" -version = "0.1.478" +version = "0.1.486" description = "" optional = false python-versions = "^3.10" @@ -826,7 +824,7 @@ cmd2 = "^2.4.2" coloredlogs = "^15.0.1" filelock = "^3.9.0" graphviz = "^0.20.1" -psutil = "^5.9.4" +psutil = "5.9.5" pybind11 = "^2.10.3" textual = "^0.27.0" tomli = "^2.0.1" @@ -834,8 +832,8 @@ tomli = "^2.0.1" [package.source] type = "git" url = "https://github.com/runtimeverification/pyk.git" -reference = "v0.1.478" -resolved_reference = "5d3e77d23cfe46d682f8e2d50e9865287d3729bb" +reference = "v0.1.486" +resolved_reference = "23a97935da94cded4392bc028cdf16bd6f7edd5b" [[package]] name = "pyperclip" @@ -860,13 +858,13 @@ files = [ [[package]] name = "pytest" -version = "7.4.2" +version = "7.4.3" description = "pytest: simple powerful testing with Python" optional = false python-versions = ">=3.7" files = [ - {file = "pytest-7.4.2-py3-none-any.whl", hash = "sha256:1d881c6124e08ff0a1bb75ba3ec0bfd8b5354a01c194ddd5a0a870a48d99b002"}, - {file = "pytest-7.4.2.tar.gz", hash = "sha256:a766259cfab564a2ad52cb1aae1b881a75c3eb7e34ca3779697c23ed47c47069"}, + {file = "pytest-7.4.3-py3-none-any.whl", hash = "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac"}, + {file = "pytest-7.4.3.tar.gz", hash = "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"}, ] [package.dependencies] @@ -1099,4 +1097,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "92468f5f87e8f2228e0ac2036b35fee2c198bb92249d8012b03c062b09ed180f" +content-hash = "a094e40f60ce5510e6e469413de96eaf1e633b13fe2473b03793a49dc5929af4" diff --git a/kevm-pyk/pyproject.toml b/kevm-pyk/pyproject.toml index 2e4e088d50..004698ea67 100644 --- a/kevm-pyk/pyproject.toml +++ b/kevm-pyk/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "kevm-pyk" -version = "1.0.330" +version = "1.0.331" description = "" authors = [ "Runtime Verification, Inc. ", @@ -17,7 +17,7 @@ packages = [ [tool.poetry.dependencies] python = "^3.10" pathos = "*" -pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.478" } +pyk = { git = "https://github.com/runtimeverification/pyk.git", tag="v0.1.486" } tomlkit = "^0.11.6" xdg-base-dirs = "^6.0.0" diff --git a/kevm-pyk/src/kevm_pyk/__init__.py b/kevm-pyk/src/kevm_pyk/__init__.py index fc225b4d0c..13a6abed14 100644 --- a/kevm-pyk/src/kevm_pyk/__init__.py +++ b/kevm-pyk/src/kevm_pyk/__init__.py @@ -6,4 +6,4 @@ from typing import Final -VERSION: Final = '1.0.330' +VERSION: Final = '1.0.331' diff --git a/package/version b/package/version index 4cb34c1ea2..4501612766 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -1.0.330 +1.0.331