From b7262f6781f4f0962b12834059574077cdb141d5 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Fri, 27 Jan 2023 23:44:41 -0700
Subject: [PATCH] flake.nix: Update nixpkgs, remove nix-eval-jobs

---
 flake.lock                           | 31 +++-------------------------
 flake.nix                            | 20 ++----------------
 integration-tests/nixpkgs-stable.nix |  1 -
 integration-tests/nixpkgs.nix        |  1 -
 4 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2b3f0e7..be44c8e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,37 +31,13 @@
         "type": "github"
       }
     },
-    "nix-eval-jobs": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1660713017,
-        "narHash": "sha256-w6KLNkT/2fI7UvPg3NoKj7gve4CgUHpyWOFq0BUwW7o=",
-        "owner": "zhaofengli",
-        "repo": "nix-eval-jobs",
-        "rev": "b4c078a4870c5b1a5b74420ca1dca41f4d75b7cc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "ref": "colmena",
-        "repo": "nix-eval-jobs",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1669542132,
-        "narHash": "sha256-DRlg++NJAwPh8io3ExBJdNW7Djs3plVI5jgYQ+iXAZQ=",
+        "lastModified": 1674641431,
+        "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a115bb9bd56831941be3776c8a94005867f316a7",
+        "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
         "type": "github"
       },
       "original": {
@@ -75,7 +51,6 @@
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nix-eval-jobs": "nix-eval-jobs",
         "nixpkgs": "nixpkgs",
         "stable": "stable"
       }
diff --git a/flake.nix b/flake.nix
index 55a8599..f0e0221 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,27 +7,20 @@
 
     flake-utils.url = "github:numtide/flake-utils";
 
-    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";
       flake = false;
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, nix-eval-jobs, ... }: let
+  outputs = { self, nixpkgs, flake-utils, ... }: let
     supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
     colmenaOptions = import ./src/nix/hive/options.nix;
     colmenaModules = import ./src/nix/hive/modules.nix;
   in flake-utils.lib.eachSystem supportedSystems (system: let
     pkgs = import nixpkgs {
       inherit system;
-      overlays = [ self._evalJobsOverlay ];
+      overlays = [];
     };
   in rec {
     # We still maintain the expression in a Nixpkgs-acceptable form
@@ -87,15 +80,6 @@
       ];
     };
   }) // {
-    # Temporary fork of nix-eval-job with changes to be upstreamed
-    _evalJobsOverlay = final: prev: let
-      patched = nix-eval-jobs.packages.${final.system}.nix-eval-jobs.overrideAttrs (old: {
-        version = "2.9.0-colmena";
-      });
-    in {
-      nix-eval-jobs = patched;
-    };
-
     overlay = final: prev: {
       colmena = final.callPackage ./package.nix { };
     };
diff --git a/integration-tests/nixpkgs-stable.nix b/integration-tests/nixpkgs-stable.nix
index 8e019d9..d0f3057 100644
--- a/integration-tests/nixpkgs-stable.nix
+++ b/integration-tests/nixpkgs-stable.nix
@@ -2,7 +2,6 @@ let
   flake = (import ../flake-compat.nix).defaultNix;
 in import flake.inputs.stable.outPath {
   overlays = [
-    flake._evalJobsOverlay
     flake.overlay
 
     # Pass through original flake inputs
diff --git a/integration-tests/nixpkgs.nix b/integration-tests/nixpkgs.nix
index 718a862..9dc1c7d 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
 
     # Pass through original flake inputs