From 0b38a0587b2dc044f3c5a3b6693814b02cdc492e Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Tue, 19 May 2026 18:24:49 -0500
Subject: [PATCH] use zig from nixpkgs

---
 .tangled/workflows/publish.yml |  3 ---
 flake.lock                     | 31 +++++--------------------------
 flake.nix                      | 15 ++++++---------
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/.tangled/workflows/publish.yml b/.tangled/workflows/publish.yml
index bd79b57..cef9374 100644
--- a/.tangled/workflows/publish.yml
+++ b/.tangled/workflows/publish.yml
@@ -12,9 +12,6 @@ dependencies:
   nixpkgs:
     - curl
 
-  github:NixOS/nixpkgs/nixpkgs-unstable:
-    - zig_0_16
-
 environment:
   SITE_PATH: zig-out/docs
   SITE_NAME: notmuch.zig
diff --git a/flake.lock b/flake.lock
index 4eb74ea..9a3baac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772542754,
-        "narHash": "sha256-jx4kZFawgvwWOWmWLc9Jsn0kHNkG+0ESflhb1p8ajb0=",
-        "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4",
+        "lastModified": 1778869304,
+        "narHash": "sha256-VdRy3A14M5vIE882DJcaaR+5wrss9Qsg4YNVbr7uj3k=",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre957538.8c809a146a14/nixexprs.tar.xz"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre998534.d233902339c0/nixexprs.tar.xz"
       },
       "original": {
         "type": "tarball",
@@ -15,28 +15,7 @@
     },
     "root": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "zig": "zig"
-      }
-    },
-    "zig": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1772539971,
-        "narHash": "sha256-smH2rYpsi1dMyMtACkqVyp0BphMsb9JZMsqwq8V1ZLM=",
-        "ref": "refs/heads/main",
-        "rev": "923ff568cf6c20df674df6f5ef7245ea5678be44",
-        "revCount": 1631,
-        "type": "git",
-        "url": "https://git.ocjtech.us/jeff/zig-overlay.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.ocjtech.us/jeff/zig-overlay.git"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 55a2c22..7985393 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,23 +6,20 @@
     nixpkgs = {
       url = "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz";
     };
-    zig = {
-      url = "git+https://git.ocjtech.us/jeff/zig-overlay.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
   };
 
   outputs =
     {
       nixpkgs,
-      zig,
       ...
     }:
     let
       lib = nixpkgs.lib;
-      platforms = lib.attrNames zig.packages;
+      platforms = [
+        "aarch64-darwin"
+        "aarch64-linux"
+        "x86_64-linux"
+      ];
       makePackages =
         system:
         import nixpkgs {
@@ -35,11 +32,11 @@
       devShells = forAllSystems (pkgs: {
         default = pkgs.mkShell {
           nativeBuildInputs = [
-            zig.packages.${pkgs.stdenv.hostPlatform.system}.master
             pkgs.git-pages-cli
             pkgs.pinact
             pkgs.pkg-config
             pkgs.reuse
+            pkgs.zig_0_16
           ];
           buildInputs = [
             pkgs.notmuch
-- 
2.51.2