flake.lock: Update

All downstream patches to nix-eval-jobs have been merged and released as part of nix-eval-jobs 0.0.4.
fooker · Mar 20, 2022 · 017ccf1 · 017ccf1
1 parent f81170c
commit 017ccf1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 26 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -2,7 +2,6 @@ let
   flake = (import ../flake-compat.nix).defaultNix;
 in import flake.inputs.nixpkgs.outPath {
   overlays = [
-    flake._evalJobsOverlay
     flake.overlay
   ];
 }