diff --git a/flake.lock b/flake.lock index ade88f9d87..baa75e6a95 100644 --- a/flake.lock +++ b/flake.lock @@ -34,17 +34,17 @@ "xbyak": "xbyak" }, "locked": { - "lastModified": 1720022499, - "narHash": "sha256-sDQjr//zKKbBVIHcFg8L6Fmd51IJza5OxHcdMek7olI=", + "lastModified": 1721811676, + "narHash": "sha256-aqbA8y9/bA6UchvVW36hQRfNiojsJ+jg9nbLHw2cS+o=", "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "b24fa372ca127d51cdc185e431d0ccf471980c04", + "rev": "8031e7be727e903b817fff6639a9d3a4bbe82f11", "type": "github" }, "original": { "owner": "runtimeverification", "repo": "blockchain-k-plugin", - "rev": "b24fa372ca127d51cdc185e431d0ccf471980c04", + "rev": "8031e7be727e903b817fff6639a9d3a4bbe82f11", "type": "github" } }, @@ -100,14 +100,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -152,25 +152,28 @@ "inputs": { "nixpkgs": [ "k-framework", - "haskell-backend", - "rv-utils", + "llvm-backend", "nixpkgs" ], - "rv-utils": "rv-utils", + "rv-utils": [ + "k-framework", + "llvm-backend", + "rv-utils" + ], "stacklock2nix": "stacklock2nix", "z3": "z3" }, "locked": { - "lastModified": 1719881076, - "narHash": "sha256-t9RTbVarwaobMiJkQjXykP8Qt+26miKzr3inONULvck=", + "lastModified": 1721316629, + "narHash": "sha256-Iq161QQX78LtJnDyOm2zv0c+leGBb/bo0laKsk86pUo=", "owner": "runtimeverification", "repo": "haskell-backend", - "rev": "11265424aeb138168bc73f1f028273de192b5be4", + "rev": "8d61e69a3cc73ae15306775bb2e97ec31247690a", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.29", + "ref": "v0.1.46", "repo": "haskell-backend", "type": "github" } @@ -194,7 +197,11 @@ }, "k-framework": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "k-framework", + "llvm-backend", + "utils" + ], "haskell-backend": "haskell-backend", "llvm-backend": "llvm-backend", "nixpkgs": [ @@ -202,14 +209,19 @@ "llvm-backend", "nixpkgs" ], - "rv-utils": "rv-utils_3" + "poetry2nix": "poetry2nix", + "rv-utils": [ + "k-framework", + "llvm-backend", + "rv-utils" + ] }, "locked": { - "lastModified": 1719970437, - "narHash": "sha256-YW38i6CMJet8upcpfF/rPpRIiqvm/SCoBgwYZcK6bcA=", + "lastModified": 1721770943, + "narHash": "sha256-TQanBINqC8h1mR2YgcjbjC+Ye0WHWPc11eRYL5M9kc0=", "owner": "runtimeverification", "repo": "k", - "rev": "8cfa50843e0789e990e391e1e7517803a2f0f03a", + "rev": "f9c131b81a6627f2b283b922d4dcd869d152de90", "type": "github" }, "original": { @@ -248,60 +260,47 @@ ], "pybind11-src": "pybind11-src", "rapidjson-src": "rapidjson-src", - "rv-utils": "rv-utils_2", - "utils": [ - "k-framework", - "flake-utils" - ] + "rv-utils": "rv-utils", + "utils": "utils" }, "locked": { - "lastModified": 1719488252, - "narHash": "sha256-f6ppPl1kYpFX8MY3Jji6ky6BDpY6QrvQJ4wy0PCjqp4=", + "lastModified": 1721760167, + "narHash": "sha256-WLW4i4vsdAMVjUZBXH2y0tsIlpKV8hH/ejk7HQq5anI=", "owner": "runtimeverification", "repo": "llvm-backend", - "rev": "9dfc379039bfa3a257d92feac6323eb246a8e995", + "rev": "9b505eafb2b47848f3b7ca16dc88f011651f5e2c", "type": "github" }, "original": { "owner": "runtimeverification", - "ref": "v0.1.52", + "ref": "v0.1.62", "repo": "llvm-backend", "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1716457947, - "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", - "type": "github" + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "k-framework", + "poetry2nix", + "nixpkgs" + ] }, - "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", + "lastModified": 1693660503, + "narHash": "sha256-B/g2V4v6gjirFmy+I5mwB2bCYc0l3j5scVfwgl6WOl8=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "bd5bdbb52350e145c526108f4ef192eb8e554fa0", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "69493a13eaea0dc4682fd07e8a084f17813dbeeb", + "owner": "nix-community", + "repo": "nix-github-actions", "type": "github" } }, - "nixpkgs_3": { + "nixpkgs": { "locked": { "lastModified": 1716457947, "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", @@ -317,7 +316,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_2": { "locked": { "lastModified": 1680577567, "narHash": "sha256-Y4W57i0TzczqwMTjfVSbAZT5RJx7u+mpQIW/ofrkTQs=", @@ -333,7 +332,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1716457947, "narHash": "sha256-Y+exebcqeprnhEpoPJrEUZmNeO60qeOxkVHhqG/OEwQ=", @@ -350,6 +349,33 @@ } }, "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", "nixpkgs": [ @@ -399,7 +425,7 @@ "k-framework", "nixpkgs" ], - "poetry2nix": "poetry2nix" + "poetry2nix": "poetry2nix_2" }, "locked": { "lastModified": 1688999199, @@ -441,13 +467,13 @@ "flake-utils" ], "k-framework": "k-framework", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "poetry2nix": [ "pyk", "poetry2nix" ], "pyk": "pyk", - "rv-utils": "rv-utils_4" + "rv-utils": "rv-utils_2" } }, "rv-utils": { @@ -470,7 +496,7 @@ }, "rv-utils_2": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1716459074, @@ -486,58 +512,52 @@ "type": "github" } }, - "rv-utils_3": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, + "stacklock2nix": { "locked": { - "lastModified": 1716459074, - "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", - "owner": "runtimeverification", - "repo": "rv-nix-tools", - "rev": "a65058865cda201de504f5546271b8e997a0be9c", + "lastModified": 1705051190, + "narHash": "sha256-xgH0gaD3dNtOzZzX3A40hZTiHJP5cIGmifbmfcS2OGI=", + "owner": "cdepillabout", + "repo": "stacklock2nix", + "rev": "22676dfc45fa1c33899ba1da1a23665172a18ba7", "type": "github" }, "original": { - "owner": "runtimeverification", - "repo": "rv-nix-tools", + "owner": "cdepillabout", + "repo": "stacklock2nix", "type": "github" } }, - "rv-utils_4": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, + "systems": { "locked": { - "lastModified": 1716459074, - "narHash": "sha256-IpahO+EkWdGl9QP7B2YXfJWpSfghjxgpz4ab47nRJY4=", - "owner": "runtimeverification", - "repo": "rv-nix-tools", - "rev": "a65058865cda201de504f5546271b8e997a0be9c", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "runtimeverification", - "repo": "rv-nix-tools", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "stacklock2nix": { + "systems_2": { "locked": { - "lastModified": 1705051190, - "narHash": "sha256-xgH0gaD3dNtOzZzX3A40hZTiHJP5cIGmifbmfcS2OGI=", - "owner": "cdepillabout", - "repo": "stacklock2nix", - "rev": "22676dfc45fa1c33899ba1da1a23665172a18ba7", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "cdepillabout", - "repo": "stacklock2nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } }, - "systems": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -547,8 +567,47 @@ "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "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" + } + }, + "utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2d51c0def3..326cc2b945 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ flake-utils.follows = "k-framework/flake-utils"; rv-utils.url = "github:runtimeverification/rv-nix-tools"; poetry2nix.follows = "pyk/poetry2nix"; - blockchain-k-plugin.url = "github:runtimeverification/blockchain-k-plugin/b24fa372ca127d51cdc185e431d0ccf471980c04"; + blockchain-k-plugin.url = "github:runtimeverification/blockchain-k-plugin/8031e7be727e903b817fff6639a9d3a4bbe82f11"; blockchain-k-plugin.inputs.flake-utils.follows = "k-framework/flake-utils"; blockchain-k-plugin.inputs.nixpkgs.follows = "k-framework/nixpkgs"; pyk.url = "github:runtimeverification/pyk/v0.1.362";