From 0c5ebff6f845f6b2d8ac8c85dce915e7acd191a3 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Date: Mon, 28 Aug 2023 13:32:25 +1200
Subject: [PATCH] Use upstream flake-utils

---
 flake.lock            | 29 +++++++++++++++++++++++------
 flake.nix             |  2 +-
 hix/init/flake.nix    |  2 +-
 hix/project/flake.nix |  2 +-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/flake.lock b/flake.lock
index f25d73ece5..e58ff4926a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -101,17 +101,19 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1679360468,
-        "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=",
-        "owner": "hamishmack",
+        "lastModified": 1692799911,
+        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "e1ea268ff47ad475443dbabcd54744b4e5b9d4f5",
+        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
         "type": "github"
       },
       "original": {
-        "owner": "hamishmack",
-        "ref": "hkm/nested-hydraJobs",
+        "owner": "numtide",
         "repo": "flake-utils",
         "type": "github"
       }
@@ -481,6 +483,21 @@
         "repo": "stackage.nix",
         "type": "github"
       }
+    },
+    "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 9dbd532b61..dd4264d0dc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,7 @@
     nixpkgs-2305 = { url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin"; };
     nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; };
     flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; };
-    flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; };
+    flake-utils = { url = "github:numtide/flake-utils"; };
     "hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; };
     "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; };
     hydra.url = "hydra";
diff --git a/hix/init/flake.nix b/hix/init/flake.nix
index 0ff50743ec..bdf8504981 100644
--- a/hix/init/flake.nix
+++ b/hix/init/flake.nix
@@ -2,7 +2,7 @@
   # This is a template created by `hix init`
   inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
   inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
-  inputs.flake-utils.follows = "haskellNix/flake-utils";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
   outputs = { self, nixpkgs, flake-utils, haskellNix }:
     let
       supportedSystems = [
diff --git a/hix/project/flake.nix b/hix/project/flake.nix
index 72caaba440..b6bc6f69bf 100644
--- a/hix/project/flake.nix
+++ b/hix/project/flake.nix
@@ -4,7 +4,7 @@
   description = "Default hix flake";
   inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
   inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
-  inputs.flake-utils.follows = "haskellNix/flake-utils";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.src.flake = false;
   outputs = { self, src, nixpkgs, flake-utils, haskellNix }:
     flake-utils.lib.eachSystem [ "EVAL_SYSTEM" ] (system: