diff --git a/flake.lock b/flake.lock index bd74e06..2987100 100644 --- a/flake.lock +++ b/flake.lock @@ -33,7 +33,9 @@ }, "nix-eval-jobs": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "flake-utils" + ], "nixpkgs": [ "nixpkgs" ] @@ -72,10 +74,10 @@ "root": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs", - "stable": "stable", - "utils": "utils" + "stable": "stable" } }, "stable": { @@ -93,21 +95,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "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" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index cb6cb9e..0d1de6e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,14 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; stable.url = "github:NixOS/nixpkgs/nixos-22.05"; - utils.url = "github:numtide/flake-utils"; + 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"; @@ -17,11 +20,11 @@ }; }; - outputs = { self, nixpkgs, utils, nix-eval-jobs, ... }: let + outputs = { self, nixpkgs, flake-utils, nix-eval-jobs, ... }: 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 utils.lib.eachSystem supportedSystems (system: let + in flake-utils.lib.eachSystem supportedSystems (system: let pkgs = import nixpkgs { inherit system; overlays = [ self._evalJobsOverlay ];