From a8e5c4a27c81ef226ce38f25ce1c065182e58655 Mon Sep 17 00:00:00 2001
From: Simon Guest <simon.guest@datacom.com>
Date: Thu, 13 Aug 2026 10:01:54 +1200
Subject: [PATCH] Remove dependency on flake-utils

---
 flake.lock | 34 ----------------------------------
 flake.nix  | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/flake.lock b/flake.lock
index 376f488..0793da5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1728538411,
@@ -36,24 +18,8 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index e316999..0547d9c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,12 +3,13 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
   };
 
-  outputs = { nixpkgs, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem
-      (system:
+  outputs = { nixpkgs, ... }:
+    let
+      forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
+
+      perSystem = system:
         let
           pkgs = import nixpkgs {
             inherit system;
@@ -33,6 +34,12 @@
             };
 
           packages.default = bash-env-json;
-        }
-      );
+        };
+
+      systemOutputs = forAllSystems perSystem;
+    in
+    {
+      packages = forAllSystems (system: systemOutputs.${system}.packages);
+      devShells = forAllSystems (system: systemOutputs.${system}.devShells);
+    };
 }