diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index cb86bdb..e9c04f2 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -39,5 +39,11 @@ jobs: K_VERSION=$(poetry run python3 -c 'import pyk; print(pyk.__version__)') echo ${K_VERSION} > deps/k_release git add deps/k_release && git commit -m "deps/k_release: sync release file version ${K_VERSION}" || true + - name: 'Update Nix flake inputs' + run: | + PYKWASM_VERSION=v"$(cat deps/kwasm_release)" + sed -i 's! wasm-semantics.url = "github:runtimeverification/wasm-semantics/v[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+"! wasm-semantics.url = "github:runtimeverification/wasm-semantics/'"${PYKWASM_VERSION}"'"!' flake.nix + nix flake update + git add flake.nix flake.lock && git commit -m 'flake.{nix,lock}: update Nix derivations' || true - name: 'Push updates' run: git push diff --git a/flake.lock b/flake.lock index 473b628..fbe2cb1 100644 --- a/flake.lock +++ b/flake.lock @@ -16,22 +16,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -50,42 +34,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "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": { @@ -103,54 +51,7 @@ "type": "github" } }, - "fmt-src_2": { - "flake": false, - "locked": { - "lastModified": 1661615830, - "narHash": "sha256-rP6ymyRc7LnKxUXwPpzhHOQvpJkpnRFOt2ctvUNlYI0=", - "owner": "fmtlib", - "repo": "fmt", - "rev": "a33701196adfad74917046096bf5a2aa0ab0bb50", - "type": "github" - }, - "original": { - "owner": "fmtlib", - "ref": "9.1.0", - "repo": "fmt", - "type": "github" - } - }, "haskell-backend": { - "inputs": { - "nixpkgs": [ - "k-framework", - "llvm-backend", - "nixpkgs" - ], - "rv-utils": [ - "k-framework", - "llvm-backend", - "rv-utils" - ], - "stacklock2nix": "stacklock2nix", - "z3": "z3" - }, - "locked": { - "lastModified": 1722860063, - "narHash": "sha256-5K3BIIbwkMpN4idvAHRrw0JzHRL6Au4ui+7NqkX+c3w=", - "owner": "runtimeverification", - "repo": "haskell-backend", - "rev": "7047b0964349727e54425c2c81478caf3dad757c", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "ref": "v0.1.58", - "repo": "haskell-backend", - "type": "github" - } - }, - "haskell-backend_2": { "inputs": { "nixpkgs": [ "wasm-semantics", @@ -164,20 +65,20 @@ "llvm-backend", "rv-utils" ], - "stacklock2nix": "stacklock2nix_2", - "z3": "z3_2" + "stacklock2nix": "stacklock2nix", + "z3": "z3" }, "locked": { - "lastModified": 1722860063, - "narHash": "sha256-5K3BIIbwkMpN4idvAHRrw0JzHRL6Au4ui+7NqkX+c3w=", + "lastModified": 1724225719, + "narHash": "sha256-gR5GDTXdHksn773+pKqvdGaXvBMtVLujFURrEQClfJw=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "7047b0964349727e54425c2c81478caf3dad757c", + "rev": "ae2da4aa2abc7a1cf64bc97119cc0a60ee4f8615", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.58", + "ref": "v0.1.76", "repo": "haskell-backend", "type": "github" } @@ -199,76 +100,23 @@ "type": "github" } }, - "immer-src_2": { - "flake": false, - "locked": { - "lastModified": 1708038459, - "narHash": "sha256-aV/mQFuPzioy1PxROc85ypeP7/d0nn+xcBPzy9taw2s=", - "owner": "runtimeverification", - "repo": "immer", - "rev": "4b0914f0b2acb33befe0ba4cd3a7954f2687e9bb", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "repo": "immer", - "rev": "4b0914f0b2acb33befe0ba4cd3a7954f2687e9bb", - "type": "github" - } - }, "k-framework": { "inputs": { "flake-utils": [ + "wasm-semantics", "k-framework", "llvm-backend", "utils" ], "haskell-backend": "haskell-backend", "llvm-backend": "llvm-backend", - "nixpkgs": [ - "k-framework", - "llvm-backend", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "rv-utils": [ - "k-framework", - "llvm-backend", - "rv-utils" - ] - }, - "locked": { - "lastModified": 1723222636, - "narHash": "sha256-V4rRuc7QN7rbtFS6d76kM0AZJJJp8vsXqXYz5nQebIk=", - "owner": "runtimeverification", - "repo": "k", - "rev": "0643095937a08f26e94d58cd8c2651ab1b0b4a07", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "ref": "v7.1.103", - "repo": "k", - "type": "github" - } - }, - "k-framework_2": { - "inputs": { - "flake-utils": [ - "wasm-semantics", - "k-framework", - "llvm-backend", - "utils" - ], - "haskell-backend": "haskell-backend_2", - "llvm-backend": "llvm-backend_2", "nixpkgs": [ "wasm-semantics", "k-framework", "llvm-backend", "nixpkgs" ], - "poetry2nix": "poetry2nix_3", + "poetry2nix": "poetry2nix", "rv-utils": [ "wasm-semantics", "k-framework", @@ -277,16 +125,16 @@ ] }, "locked": { - "lastModified": 1723222636, - "narHash": "sha256-V4rRuc7QN7rbtFS6d76kM0AZJJJp8vsXqXYz5nQebIk=", + "lastModified": 1724878946, + "narHash": "sha256-DpjtnJB9FwosPKntuh+DTkWQJu9vsGfVL3eJA7J/QHs=", "owner": "runtimeverification", "repo": "k", - "rev": "0643095937a08f26e94d58cd8c2651ab1b0b4a07", + "rev": "2f19e1a50a81bc466bba7a0fb4af85ebfae6f765", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v7.1.103", + "ref": "v7.1.124", "repo": "k", "type": "github" } @@ -297,6 +145,7 @@ "fmt-src": "fmt-src", "immer-src": "immer-src", "nixpkgs": [ + "wasm-semantics", "k-framework", "llvm-backend", "rv-utils", @@ -308,97 +157,21 @@ "utils": "utils" }, "locked": { - "lastModified": 1723094785, - "narHash": "sha256-JPe1rZkx4/q7wyEGIOitt3slEHpue5gSnT9x9tbnNMs=", + "lastModified": 1724355360, + "narHash": "sha256-wy+g2rVUn2dYoZ/JSA8x0cWNWYDxnxLpAzaucjUBciQ=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "e7266f7e0082b5a90ccf47ceed47ba1811bdc636", + "rev": "b9d2a6da360e2b14a60a22928d625f43fb71ae02", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.77", - "repo": "llvm-backend", - "type": "github" - } - }, - "llvm-backend_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "fmt-src": "fmt-src_2", - "immer-src": "immer-src_2", - "nixpkgs": [ - "wasm-semantics", - "k-framework", - "llvm-backend", - "rv-utils", - "nixpkgs" - ], - "pybind11-src": "pybind11-src_2", - "rapidjson-src": "rapidjson-src_2", - "rv-utils": "rv-utils_4", - "utils": "utils_2" - }, - "locked": { - "lastModified": 1723094785, - "narHash": "sha256-JPe1rZkx4/q7wyEGIOitt3slEHpue5gSnT9x9tbnNMs=", - "owner": "runtimeverification", - "repo": "llvm-backend", - "rev": "e7266f7e0082b5a90ccf47ceed47ba1811bdc636", - "type": "github" - }, - "original": { - "owner": "runtimeverification", - "ref": "v0.1.77", + "ref": "v0.1.84", "repo": "llvm-backend", "type": "github" } }, "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "k-framework", - "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" - } - }, - "nix-github-actions_2": { - "inputs": { - "nixpkgs": [ - "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" - } - }, - "nix-github-actions_3": { "inputs": { "nixpkgs": [ "wasm-semantics", @@ -422,38 +195,6 @@ } }, "nixpkgs": { - "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" - } - }, - "nixpkgs_2": { - "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" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -469,23 +210,7 @@ "type": "github" } }, - "nixpkgs_4": { - "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" - } - }, - "nixpkgs_5": { + "nixpkgs_2": { "locked": { "lastModified": 1716457947, "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", @@ -501,171 +226,52 @@ "type": "github" } }, - "poetry2nix": { - "inputs": { - "flake-utils": "flake-utils", - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "k-framework", - "llvm-backend", - "nixpkgs" - ], - "systems": "systems_3", - "treefmt-nix": "treefmt-nix" - }, - "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" - } - }, - "poetry2nix_2": { - "inputs": { - "flake-utils": "flake-utils_2", - "nix-github-actions": "nix-github-actions_2", - "nixpkgs": [ - "pyk", - "nixpkgs" - ], - "systems": "systems_5", - "treefmt-nix": "treefmt-nix_2" - }, - "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" - } - }, - "poetry2nix_3": { - "inputs": { - "flake-utils": "flake-utils_3", - "nix-github-actions": "nix-github-actions_3", - "nixpkgs": [ - "wasm-semantics", - "k-framework", - "llvm-backend", - "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" - } - }, - "pybind11-src": { - "flake": false, - "locked": { - "lastModified": 1657936673, - "narHash": "sha256-/X8DZPFsNrKGbhjZ1GFOj17/NU6p4R+saCW3pLKVNeA=", - "owner": "pybind", - "repo": "pybind11", - "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", - "type": "github" - }, - "original": { - "owner": "pybind", - "repo": "pybind11", - "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", - "type": "github" - } - }, - "pybind11-src_2": { - "flake": false, - "locked": { - "lastModified": 1657936673, - "narHash": "sha256-/X8DZPFsNrKGbhjZ1GFOj17/NU6p4R+saCW3pLKVNeA=", - "owner": "pybind", - "repo": "pybind11", - "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", - "type": "github" - }, - "original": { - "owner": "pybind", - "repo": "pybind11", - "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", - "type": "github" - } - }, - "pyk": { + "poetry2nix": { "inputs": { - "flake-utils": [ - "pyk", - "poetry2nix", - "flake-utils" - ], + "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", "nixpkgs": [ - "pyk", - "rv-utils", + "wasm-semantics", + "k-framework", + "llvm-backend", "nixpkgs" ], - "poetry2nix": "poetry2nix_2", - "rv-utils": "rv-utils_2" + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "dir": "pyk", - "lastModified": 1723222636, - "narHash": "sha256-V4rRuc7QN7rbtFS6d76kM0AZJJJp8vsXqXYz5nQebIk=", - "owner": "runtimeverification", - "repo": "k", - "rev": "0643095937a08f26e94d58cd8c2651ab1b0b4a07", + "lastModified": 1698640399, + "narHash": "sha256-mXzyx79/iFLZ0UDuSkqgFfejYRcSJfsCnJ9WlMusaI0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", "type": "github" }, "original": { - "dir": "pyk", - "owner": "runtimeverification", - "ref": "v7.1.103", - "repo": "k", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "626111646fe236cb1ddc8191a48c75e072a82b7c", "type": "github" } }, - "rapidjson-src": { + "pybind11-src": { "flake": false, "locked": { - "lastModified": 1472111945, - "narHash": "sha256-SxUXSOQDZ0/3zlFI4R84J56/1fkw2jhge4mexNF6Pco=", - "owner": "Tencent", - "repo": "rapidjson", - "rev": "f54b0e47a08782a6131cc3d60f94d038fa6e0a51", + "lastModified": 1657936673, + "narHash": "sha256-/X8DZPFsNrKGbhjZ1GFOj17/NU6p4R+saCW3pLKVNeA=", + "owner": "pybind", + "repo": "pybind11", + "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", "type": "github" }, "original": { - "owner": "Tencent", - "repo": "rapidjson", - "rev": "f54b0e47a08782a6131cc3d60f94d038fa6e0a51", + "owner": "pybind", + "repo": "pybind11", + "rev": "0ba639d6177659c5dc2955ac06ad7b5b0d22e05c", "type": "github" } }, - "rapidjson-src_2": { + "rapidjson-src": { "flake": false, "locked": { "lastModified": 1472111945, @@ -688,28 +294,29 @@ "k-framework", "flake-utils" ], - "k-framework": "k-framework", + "k-framework": [ + "wasm-semantics", + "k-framework" + ], "nixpkgs": [ "k-framework", "nixpkgs" ], - "nixpkgs-pyk": [ - "pyk", - "nixpkgs" - ], "poetry2nix": [ - "pyk", + "k-framework", "poetry2nix" ], - "pyk": "pyk", "rust-overlay": "rust-overlay", - "rv-utils": "rv-utils_3", + "rv-utils": [ + "k-framework", + "rv-utils" + ], "wasm-semantics": "wasm-semantics" } }, "rust-overlay": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1724293269, @@ -726,24 +333,6 @@ } }, "rv-utils": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "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" - } - }, - "rv-utils_2": { "inputs": { "nixpkgs": "nixpkgs_2" }, @@ -761,42 +350,6 @@ "type": "github" } }, - "rv-utils_3": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, - "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" - } - }, - "rv-utils_4": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "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" - } - }, "stacklock2nix": { "locked": { "lastModified": 1705051190, @@ -812,21 +365,6 @@ "type": "github" } }, - "stacklock2nix_2": { - "locked": { - "lastModified": 1705051190, - "narHash": "sha256-xgH0gaD3dNtOzZzX3A40hZTiHJP5cIGmifbmfcS2OGI=", - "owner": "cdepillabout", - "repo": "stacklock2nix", - "rev": "22676dfc45fa1c33899ba1da1a23665172a18ba7", - "type": "github" - }, - "original": { - "owner": "cdepillabout", - "repo": "stacklock2nix", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -871,124 +409,7 @@ "type": "indirect" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "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": [ - "k-framework", - "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" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "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" - } - }, - "treefmt-nix_3": { "inputs": { "nixpkgs": [ "wasm-semantics", @@ -1029,24 +450,6 @@ "type": "github" } }, - "utils_2": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wasm-semantics": { "inputs": { "flake-utils": [ @@ -1054,7 +457,7 @@ "k-framework", "flake-utils" ], - "k-framework": "k-framework_2", + "k-framework": "k-framework", "nixpkgs": [ "wasm-semantics", "k-framework", @@ -1072,16 +475,16 @@ ] }, "locked": { - "lastModified": 1723228022, - "narHash": "sha256-uCBfMwU3KHGv8dDVP32dlaTCig0zjzPjEgENW1xcbsk=", + "lastModified": 1724922157, + "narHash": "sha256-+7uFgpWBIFT/6TMhX8HbU6qly8O4ZPi9OKNgffGiCzc=", "owner": "runtimeverification", "repo": "wasm-semantics", - "rev": "8b29c636dd8a78ca25f4ceaa8cec2409ae9b99a0", + "rev": "9d4027348d24121e493f642df28ed62b7b3b84fd", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.98", + "ref": "v0.1.102", "repo": "wasm-semantics", "type": "github" } @@ -1089,33 +492,16 @@ "z3": { "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" - } - }, - "z3_2": { - "flake": false, - "locked": { - "lastModified": 1674011426, - "narHash": "sha256-7cuUf29TMpX62PwO1ab3ZuzmzlcrRjTKB1CyXnYgYus=", + "lastModified": 1709835916, + "narHash": "sha256-MIbP3QgKIGF/qUMTupaO7xD46LbmH69kF/394Sajhkg=", "owner": "Z3Prover", "repo": "z3", - "rev": "3012293c35eadbfd73e5b94adbe50b0cc44ffb83", + "rev": "3049f578a8f98a0b0992eca193afe57a73b30ca3", "type": "github" }, "original": { "owner": "Z3Prover", - "ref": "z3-4.12.1", + "ref": "z3-4.13.0", "repo": "z3", "type": "github" } diff --git a/flake.nix b/flake.nix index 327c496..bde4c3d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,19 +2,17 @@ description = "komet - K tooling for the Soroban platform"; inputs = { - wasm-semantics.url = "github:runtimeverification/wasm-semantics/v0.1.98"; - k-framework.url = "github:runtimeverification/k/v7.1.103"; - pyk.url = "github:runtimeverification/k/v7.1.103?dir=pyk"; + wasm-semantics.url = "github:runtimeverification/wasm-semantics/v0.1.102"; + k-framework.follows = "wasm-semantics/k-framework"; nixpkgs.follows = "k-framework/nixpkgs"; flake-utils.follows = "k-framework/flake-utils"; - rv-utils.url = "github:runtimeverification/rv-nix-tools"; - nixpkgs-pyk.follows = "pyk/nixpkgs"; - poetry2nix.follows = "pyk/poetry2nix"; + rv-utils.follows = "k-framework/rv-utils"; + poetry2nix.follows = "k-framework/poetry2nix"; rust-overlay.url = "github:oxalica/rust-overlay"; }; - outputs = { self, k-framework, nixpkgs, flake-utils, rv-utils, pyk - , nixpkgs-pyk, poetry2nix, wasm-semantics, rust-overlay }@inputs: + outputs = { self, k-framework, nixpkgs, flake-utils, rv-utils, wasm-semantics + , rust-overlay, ... }@inputs: let overlay = (final: prev: let @@ -26,23 +24,14 @@ ] ./.); version = self.rev or "dirty"; - - nixpkgs-pyk = import inputs.nixpkgs-pyk { - system = prev.system; - overlays = [ pyk.overlay ]; - }; - - python310-pyk = nixpkgs-pyk.python310; - - poetry2nix = - inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = nixpkgs-pyk; }; + poetry2nix = inputs.poetry2nix.lib.mkPoetry2Nix { pkgs = prev; }; in rec { komet = prev.stdenv.mkDerivation { pname = "komet"; inherit src version; buildInputs = with final; [ - nixpkgs-pyk.pyk-python310 + k-framework.packages.${system}.pyk-python310 k-framework.packages.${system}.k komet-pyk ]; @@ -73,7 +62,7 @@ }; komet-pyk = poetry2nix.mkPoetryApplication { - python = nixpkgs-pyk.python310; + python = prev.python310; projectDir = ./.; src = rv-utils.lib.mkSubdirectoryAppSrc { pkgs = import nixpkgs { system = prev.system; }; @@ -83,35 +72,8 @@ }; overrides = poetry2nix.overrides.withDefaults (finalPython: prevPython: { - cmd2 = prevPython.cmd2.overridePythonAttrs (old: { - propagatedBuildInputs = prev.lib.filter - (x: !(prev.lib.strings.hasInfix "exceptiongroup" x.name)) - old.propagatedBuildInputs ++ [ finalPython.exceptiongroup ]; - }); - pytest = prevPython.pytest.overridePythonAttrs (old: { - propagatedBuildInputs = prev.lib.filter - (x: !(prev.lib.strings.hasInfix "attrs" x.name)) - old.propagatedBuildInputs ++ [ finalPython.attrs ]; - }); - kframework = nixpkgs-pyk.pyk-python310.overridePythonAttrs - (old: { - propagatedBuildInputs = prev.lib.filter (x: - !(prev.lib.strings.hasInfix "hypothesis" x.name) - && !(prev.lib.strings.hasInfix "pytest" x.name) - && !(prev.lib.strings.hasInfix "cmd2" x.name)) - old.propagatedBuildInputs ++ [ - finalPython.hypothesis - finalPython.pytest - finalPython.cmd2 - ]; - }); - pykwasm = - wasm-semantics.packages.${prev.system}.kwasm-pyk.overridePythonAttrs - (old: { - propagatedBuildInputs = prev.lib.filter - (x: !(prev.lib.strings.hasInfix "kframework" x.name)) - old.propagatedBuildInputs ++ [ finalPython.kframework ]; - }); + kframework = k-framework.packages.${prev.system}.pyk-python310; + pykwasm = wasm-semantics.packages.${prev.system}.kwasm-pyk; }); groups = [ ]; checkGroups = [ ]; diff --git a/package/version b/package/version index 013adb7..db7a480 100644 --- a/package/version +++ b/package/version @@ -1 +1 @@ -0.1.30 +0.1.31 diff --git a/pyproject.toml b/pyproject.toml index 175ab16..8f0dcfc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "komet" -version = "0.1.30" +version = "0.1.31" description = "K tooling for the Soroban platform" authors = [ "Runtime Verification, Inc. ",