diff --git a/ez.lock.toml b/ez.lock.toml index 8ba4a79..d45c797 100644 --- a/ez.lock.toml +++ b/ez.lock.toml @@ -4,8 +4,8 @@ hub = "https://hub.bend-lang.com" [tools] [tools.bolt] git = "https://github.com/Emerging-Patterns/bolt" -rev = "02fb09377f5c0fbddb5f6b7c32c8ab4ae14240df" -tag = "v1.8.0" +rev = "d5a67600a96ba423f2212bd661a30c1fba38eb55" +tag = "v1.9.0" root = "." -narHash = "sha256-53zE+3lZ/jn9GvIeGoavvNMaFyUs5dEFWd7fwP49TlM=" +narHash = "sha256-HmJ8J1xDshBdSWXIiEp48GZ9qHsm+bmpHw06ZWwcDVE=" entry = "main.bend" diff --git a/ez.toml b/ez.toml index fbae312..b4cb9a3 100644 --- a/ez.toml +++ b/ez.toml @@ -4,8 +4,8 @@ entry = "main.bend" [tools.bolt] git = "https://github.com/Emerging-Patterns/bolt" -rev = "02fb09377f5c0fbddb5f6b7c32c8ab4ae14240df" -tag = "v1.8.0" +rev = "d5a67600a96ba423f2212bd661a30c1fba38eb55" +tag = "v1.9.0" root = "." -narHash = "sha256-53zE+3lZ/jn9GvIeGoavvNMaFyUs5dEFWd7fwP49TlM=" +narHash = "sha256-HmJ8J1xDshBdSWXIiEp48GZ9qHsm+bmpHw06ZWwcDVE=" entry = "main.bend" diff --git a/flake.lock b/flake.lock index 6ac021f..aa8e418 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1790359392, - "narHash": "sha256-z0Xwg46QesyRnlb7+sQue2GRq90v9M2XVaNVVSdd5Vs=", + "lastModified": 1790482124, + "narHash": "sha256-Gv309ikt48M8cISbwSo6V0md2572iieIRiyl3noF1cA=", "owner": "bendlang", "repo": "bend", - "rev": "11c65a2572e16d0bfc2e83068b23ed8fb180ccc0", + "rev": "af569d4826913b2ce3557e9829ccad31fcf86f94", "type": "github" }, "original": { @@ -20,38 +20,21 @@ "type": "github" } }, - "bend_2": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1790200275, - "narHash": "sha256-huYLnKbMUukFhFLypIXx/wLVU3EmgsUEe9l67mU6CDw=", - "owner": "bendlang", - "repo": "bend", - "rev": "d37909174ebd664338ae3194799a9e0899dedd51", - "type": "github" - }, - "original": { - "owner": "bendlang", - "repo": "bend", - "rev": "d37909174ebd664338ae3194799a9e0899dedd51", - "type": "github" - } - }, "ez": { "inputs": { - "bend": "bend_2", + "bend": [ + "bend" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1790364897, - "narHash": "sha256-WBj/Hg/Gys7sIz/IYt204QEGQPjQ/qw0TpcXAYpuGQI=", + "lastModified": 1790514265, + "narHash": "sha256-NrMlq4aruqBVCNsy9TZtcMayDn3HEhb1I8AyiE233Kw=", "owner": "Emerging-Patterns", "repo": "ez", - "rev": "94d441e9b58e8b6a8a2f6cb8a74ae35d13b47ceb", + "rev": "f37f6d20dc144cd74bb0cd51f9ec4e6925826548", "type": "github" }, "original": { @@ -61,22 +44,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1790185690, - "narHash": "sha256-xJ+X4hBtOcAFGBOe5nAMyMUeF9foJBmIOu3NjBqBycU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4975466d324710c576dc11ad614684e6bd8cad8e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1789546076, "narHash": "sha256-zVxLZiSnmaaPLwnhj7pwmqe3axBg/C6nG5JZsJMh2g4=", @@ -96,7 +63,7 @@ "inputs": { "bend": "bend", "ez": "ez", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 4b80b54..b3e7857 100644 --- a/flake.nix +++ b/flake.nix @@ -9,10 +9,7 @@ inputs.ez = { url = "github:Emerging-Patterns/ez"; inputs.nixpkgs.follows = "nixpkgs"; - # not `inputs.bend.follows = "bend"`: ez 1.2.0 does not build on bend - # 2.0.28, so ez (and `ez prove`, and bolt through mkLint) keep the bend - # ez 1.2.0 locks, 2.0.27 - inputs.bend.url = "github:bendlang/bend/d37909174ebd664338ae3194799a9e0899dedd51"; + inputs.bend.follows = "bend"; }; outputs = { self, nixpkgs, ... }@inputs: