From 017ccf142c145f275ca613c70004efc3c83c0d73 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Sat, 19 Mar 2022 20:30:21 -0700
Subject: [PATCH] flake.lock: Update

All downstream patches to nix-eval-jobs have been merged and released
as part of nix-eval-jobs 0.0.4.
---
 flake.lock                    |  6 +++---
 flake.nix                     | 22 ----------------------
 integration-tests/nixpkgs.nix |  1 -
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 93016027..7fc833d0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1646497237,
-        "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
+        "lastModified": 1647297614,
+        "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
+        "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d6ab1db8..23ac8a9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,6 @@
   in utils.lib.eachSystem supportedSystems (system: let
     pkgs = import nixpkgs {
       inherit system;
-      overlays = [ self._evalJobsOverlay ];
     };
   in rec {
     # We still maintain the expression in a Nixpkgs-acceptable form
@@ -66,27 +65,6 @@
       '';
     };
   }) // {
-    # For use in integration tests
-    _evalJobsOverlay =
-      (final: prev: {
-        nix-eval-jobs = prev.nix-eval-jobs.overrideAttrs (old: {
-          version = old.version + "-colmena";
-          patches = (old.patches or []) ++ [
-            # Add --show-trace
-            (final.fetchpatch {
-              url = "https://github.com/nix-community/nix-eval-jobs/commit/1e0f309fefc9b2d597f8475a74c82ce29c189152.patch";
-              sha256 = "sha256-246t3SGRA/9JsV2XPcI4Exp+TxmyYBoldQ43Wr5CcsM=";
-            })
-
-            # Fix buffering when piped
-            (final.fetchpatch {
-              url = "https://github.com/zhaofengli/nix-eval-jobs/commit/6d61193286aedd4e514fd8f375b2000b95fff4fb.patch";
-              sha256 = "sha256-yOuUwKHSS7Bt3q3nClirVk7DzJhxNFFZ8JnYjrPRJVc=";
-            })
-          ];
-        });
-      });
-
     overlay = final: prev: {
       colmena = final.callPackage ./package.nix { };
     };
diff --git a/integration-tests/nixpkgs.nix b/integration-tests/nixpkgs.nix
index 92cce603..fd4b9c07 100644
--- a/integration-tests/nixpkgs.nix
+++ b/integration-tests/nixpkgs.nix
@@ -2,7 +2,6 @@ let
   flake = (import ../flake-compat.nix).defaultNix;
 in import flake.inputs.nixpkgs.outPath {
   overlays = [
-    flake._evalJobsOverlay
     flake.overlay
   ];
 }