diff --git a/flake.lock b/flake.lock index fd426c6..3b6393c 100644 --- a/flake.lock +++ b/flake.lock @@ -21,31 +21,11 @@ "type": "github" } }, - "bend_2": { - "inputs": { - "nixpkgs": [ - "ez", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1790482124, - "narHash": "sha256-Gv309ikt48M8cISbwSo6V0md2572iieIRiyl3noF1cA=", - "owner": "bendlang", - "repo": "bend", - "rev": "af569d4826913b2ce3557e9829ccad31fcf86f94", - "type": "github" - }, - "original": { - "owner": "bendlang", - "repo": "bend", - "rev": "af569d4826913b2ce3557e9829ccad31fcf86f94", - "type": "github" - } - }, "ez": { "inputs": { - "bend": "bend_2", + "bend": [ + "bend" + ], "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 7431ddf..830ca91 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,12 @@ url = "github:bendlang/bend/777ee0b55c485afdd7e68bd917b3d23a88d77371"; inputs.nixpkgs.follows = "nixpkgs"; }; - # ez and its bolt stay on the bend ez's own flake.lock records until ez - # releases on 2.0.34, so ez's inputs.bend is pinned, not followed. The - # package's own builds and its proofs (checks.proofs) run on 2.0.34. + # ez is Emerging-Patterns/ez master (1.3.0). Its bend follows this flake's + # bend, so ez, `ez prove`, and bolt all build on 2.0.34. inputs.ez = { url = "github:Emerging-Patterns/ez"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.bend.url = "github:bendlang/bend/af569d4826913b2ce3557e9829ccad31fcf86f94"; + inputs.bend.follows = "bend"; }; outputs = { self, nixpkgs, ... }@inputs: @@ -43,7 +42,7 @@ checks.${system} = { # every PROOF.bend on this flake's bend: its first line must be - # ALL PROOFS CHECK. ez.mkProofs comes back when ez runs on 2.0.34. + # ALL PROOFS CHECK. proofs = pkgs.runCommand "ezimg-proofs" { nativeBuildInputs = [ bend ]; BEND_LIB = ez.bendLib ./ez.lock.toml;