diff --git a/flake.lock b/flake.lock index ab547076..703c7ea8 100644 --- a/flake.lock +++ b/flake.lock @@ -58,22 +58,6 @@ "type": "github" } }, - "flake-utils": { - "locked": { - "lastModified": 1608663846, - "narHash": "sha256-YOAXeoNLW0IubQ6AZLGuSj5kAD5n4DYXLYReLtyds1A=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a68df93a37cd5137ac22ffeb2d8a03acf253cc24", - "type": "github" - }, - "original": { - "owner": "numtide", - "ref": "flatten-tree-system", - "repo": "flake-utils", - "type": "github" - } - }, "home": { "inputs": { "nixpkgs": [ @@ -173,13 +157,29 @@ "inputs": { "ci-agent": "ci-agent", "devshell": "devshell", - "flake-utils": "flake-utils", "flake-compat": "flake-compat", "home": "home", "nixos": "nixos", "nixos-hardware": "nixos-hardware", "nur": "nur", - "override": "override" + "override": "override", + "utils": "utils" + } + }, + "utils": { + "locked": { + "lastModified": 1608663846, + "narHash": "sha256-YOAXeoNLW0IubQ6AZLGuSj5kAD5n4DYXLYReLtyds1A=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a68df93a37cd5137ac22ffeb2d8a03acf253cc24", + "type": "github" + }, + "original": { + "owner": "numtide", + "ref": "flatten-tree-system", + "repo": "flake-utils", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index a9d0bf53..b10ba755 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ nixos.url = "nixpkgs/release-20.09"; home.url = "github:nix-community/home-manager/release-20.09"; home.inputs.nixpkgs.follows = "nixos"; - flake-utils.url = "github:numtide/flake-utils/flatten-tree-system"; + utils.url = "github:numtide/flake-utils/flatten-tree-system"; devshell.url = "github:numtide/devshell"; nixos-hardware.url = "github:nixos/nixos-hardware"; ci-agent.url = "github:hercules-ci/hercules-ci-agent"; @@ -24,14 +24,14 @@ , home , nixos , override - , flake-utils + , utils , nur , devshell , nixos-hardware , ... }: let - inherit (flake-utils.lib) eachDefaultSystem flattenTreeSystem; + inherit (utils.lib) eachDefaultSystem flattenTreeSystem; inherit (nixos.lib) recursiveUpdate; inherit (self.lib) overlays nixosModules genPackages genPkgs genHomeActivationPackages; diff --git a/lib/default.nix b/lib/default.nix index cde0042e..8300ffbc 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -79,7 +79,7 @@ in genPkgs = { self }: let inherit (self) inputs; in - (inputs.flake-utils.lib.eachDefaultSystem + (inputs.utils.lib.eachDefaultSystem (system: let extern = import ../extern { inherit inputs; }; @@ -93,7 +93,7 @@ in lib = (prev.lib or { }) // { inherit (nixos.lib) nixosSystem; flk = self.lib; - utils = inputs.flake-utils.lib; + utils = inputs.utils.lib; }; }) ]