From 2d980888778114e91829d33b51743bb116134deb Mon Sep 17 00:00:00 2001
From: Bernardo Meurer <bernardo@meurer.org>
Date: Sat, 8 Oct 2022 23:33:25 -0300
Subject: [PATCH] refactor(flake): make nix-eval-jobs's flake-utils follow ours

This avoids having a duplicated flake-utils entry in the lockfile
---
 flake.lock | 19 +++----------------
 flake.nix  |  9 ++++++---
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 5ab8dae..2987100 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,24 +31,11 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "nix-eval-jobs": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
diff --git a/flake.nix b/flake.nix
index eba776a..0d1de6e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,9 +7,12 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    # Temporary fork of nix-eval-job with changes to be upstreamed
-    nix-eval-jobs.url = "github:zhaofengli/nix-eval-jobs/colmena";
-    nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs";
+    nix-eval-jobs = {
+      # Temporary fork of nix-eval-job with changes to be upstreamed
+      url = "github:zhaofengli/nix-eval-jobs/colmena";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
 
     flake-compat = {
       url = "github:edolstra/flake-compat";