From 680b4af3b780d15dc069e7f1c3e65f4d3d37a471 Mon Sep 17 00:00:00 2001
From: Noah Gardner <ngngardner@gmail.com>
Date: Fri, 25 Sep 2026 11:15:19 -0400
Subject: [PATCH] build: bolt from [tools.bolt] (v1.8.0), no bolt flake input

Drop the bolt flake input. bolt is now the lock's [tools.bolt] pin
(v1.8.0), built by ez's nix lib: ez.mkLint for the lint check,
ez.toolPackage for packages.bolt, and ez.mkShell { src = self; } puts it
in the dev shell. ez lock wrote ez.lock.toml and the .ez/lib allowlist.
Relock the flake's ez (836aa9c) and bend (2.0.27).

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 .gitignore   |  4 +++-
 ez.lock.toml | 11 ++++++++++
 ez.toml      |  8 +++++++
 flake.lock   | 62 +++++-----------------------------------------------
 flake.nix    | 11 +++-------
 5 files changed, 31 insertions(+), 65 deletions(-)
 create mode 100644 ez.lock.toml

diff --git a/.gitignore b/.gitignore
index 204079e..279a810 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 result
 bin/
-.ez/
+.ez/*
+!.ez/lib
+.ez/lib/*
 .gate/
 *.gpu
 .claude/
diff --git a/ez.lock.toml b/ez.lock.toml
new file mode 100644
index 0000000..fb31278
--- /dev/null
+++ b/ez.lock.toml
@@ -0,0 +1,11 @@
+[lock]
+version = "2"
+hub = "https://hub.bend-lang.com"
+
+[tools.bolt]
+git = "https://github.com/Emerging-Patterns/bolt"
+rev = "02fb09377f5c0fbddb5f6b7c32c8ab4ae14240df"
+tag = "v1.8.0"
+root = "."
+narHash = "sha256-53zE+3lZ/jn9GvIeGoavvNMaFyUs5dEFWd7fwP49TlM="
+entry = "main.bend"
diff --git a/ez.toml b/ez.toml
index 5cd3840..fbae312 100644
--- a/ez.toml
+++ b/ez.toml
@@ -1,3 +1,11 @@
 [package]
 name = "ezjson"
 entry = "main.bend"
+
+[tools.bolt]
+git = "https://github.com/Emerging-Patterns/bolt"
+rev = "02fb09377f5c0fbddb5f6b7c32c8ab4ae14240df"
+tag = "v1.8.0"
+root = "."
+narHash = "sha256-53zE+3lZ/jn9GvIeGoavvNMaFyUs5dEFWd7fwP49TlM="
+entry = "main.bend"
diff --git a/flake.lock b/flake.lock
index f28ed98..2b58c85 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790200275,
-        "narHash": "sha256-huYLnKbMUukFhFLypIXx/wLVU3EmgsUEe9l67mU6CDw=",
+        "lastModified": 1790348040,
+        "narHash": "sha256-6oh+6jj7kyl4xJsmq4p3BtU/BUl2f2LlC/5kH081D1M=",
         "owner": "bendlang",
         "repo": "bend",
-        "rev": "d37909174ebd664338ae3194799a9e0899dedd51",
+        "rev": "774ef644dccf9c3f8053f7276d8901ad23da006c",
         "type": "github"
       },
       "original": {
@@ -20,30 +20,6 @@
         "type": "github"
       }
     },
-    "bolt": {
-      "inputs": {
-        "bend": [
-          "bend"
-        ],
-        "ez": "ez_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1790257846,
-        "narHash": "sha256-XaBdAuxtVDPZO4KzQA0V3s6qK1nwS7dS1gYAoXRVLxM=",
-        "owner": "Emerging-Patterns",
-        "repo": "bolt",
-        "rev": "38da7d930a9251f44cf7434032e954b2e706564b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Emerging-Patterns",
-        "repo": "bolt",
-        "type": "github"
-      }
-    },
     "ez": {
       "inputs": {
         "bend": [
@@ -54,36 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1790016710,
-        "narHash": "sha256-6ZUA05LIhKkY+iS2d7dlBw6PDlRHCxaO0vu/hVCGlhY=",
-        "owner": "Emerging-Patterns",
-        "repo": "ez",
-        "rev": "61cdee440a20e7f250f64e1bd28ea201a2858c70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Emerging-Patterns",
-        "repo": "ez",
-        "type": "github"
-      }
-    },
-    "ez_2": {
-      "inputs": {
-        "bend": [
-          "bolt",
-          "bend"
-        ],
-        "nixpkgs": [
-          "bolt",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1790195007,
-        "narHash": "sha256-DtaKysIWHczZW08OjTloixIJ6b8XlW3BLVpHOWxLy/w=",
+        "lastModified": 1790310127,
+        "narHash": "sha256-csxvWEjzbSOTuXxWcKbyfBrHMXru2JkA2u3oO1AH5MU=",
         "owner": "Emerging-Patterns",
         "repo": "ez",
-        "rev": "baee2c6e1b57118ffae574e8c8388f6255b6d6f5",
+        "rev": "836aa9c0a4f9a53a7d8e15e80a8451c58eb03503",
         "type": "github"
       },
       "original": {
@@ -111,7 +62,6 @@
     "root": {
       "inputs": {
         "bend": "bend",
-        "bolt": "bolt",
         "ez": "ez",
         "nixpkgs": "nixpkgs"
       }
diff --git a/flake.nix b/flake.nix
index 57f3141..ded507e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,11 +11,6 @@
     inputs.nixpkgs.follows = "nixpkgs";
     inputs.bend.follows = "bend";
   };
-  inputs.bolt = {
-    url = "github:Emerging-Patterns/bolt";
-    inputs.nixpkgs.follows = "nixpkgs";
-    inputs.bend.follows = "bend";
-  };
 
   outputs = { self, nixpkgs, ... }@inputs:
     let
@@ -25,7 +20,7 @@
       ez = inputs.ez.lib.${system};
       ezBin = inputs.ez.packages.${system}.default;
       bend = inputs.bend.packages.${system}.default;
-      bolt = inputs.bolt.packages.${system}.default;
+      bolt = ez.toolPackage { name = "bolt"; src = self; inherit bend; wrapFlags = [ "--gpu" "off" ]; };
       bend-cc = ez.bend-cc;
 
       bench = import ./bench {
@@ -47,15 +42,15 @@
 
       checks.${system} = {
         proofs = ez.mkProofs { ez = ezBin; src = self; };
-        lint = ez.mkLint { inherit bolt; src = self; };
+        lint = ez.mkLint { src = self; };
       } // bench.checks // scale.checks;
 
       devShells.${system}.default = ez.mkShell {
+        src = self;
         packages = [
           bend
           bend-cc
           ezBin
-          bolt
           pkgs.python3
           bench.packages.ezjson-bench-drv
           bench.packages.ezjson-rust-ref