flake: rename flake-utils input

This commit is contained in:
Timothy DeHerrera 2021-02-14 22:11:49 -07:00
parent b42f7b514d
commit cf23b8e64d
No known key found for this signature in database
GPG Key ID: 8985725DB5B0C122
3 changed files with 23 additions and 23 deletions

View File

@ -58,22 +58,6 @@
"type": "github" "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": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -173,13 +157,29 @@
"inputs": { "inputs": {
"ci-agent": "ci-agent", "ci-agent": "ci-agent",
"devshell": "devshell", "devshell": "devshell",
"flake-utils": "flake-utils",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"home": "home", "home": "home",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nur": "nur", "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"
} }
} }
}, },

View File

@ -7,7 +7,7 @@
nixos.url = "nixpkgs/release-20.09"; nixos.url = "nixpkgs/release-20.09";
home.url = "github:nix-community/home-manager/release-20.09"; home.url = "github:nix-community/home-manager/release-20.09";
home.inputs.nixpkgs.follows = "nixos"; 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"; devshell.url = "github:numtide/devshell";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
ci-agent.url = "github:hercules-ci/hercules-ci-agent"; ci-agent.url = "github:hercules-ci/hercules-ci-agent";
@ -24,14 +24,14 @@
, home , home
, nixos , nixos
, override , override
, flake-utils , utils
, nur , nur
, devshell , devshell
, nixos-hardware , nixos-hardware
, ... , ...
}: }:
let let
inherit (flake-utils.lib) eachDefaultSystem flattenTreeSystem; inherit (utils.lib) eachDefaultSystem flattenTreeSystem;
inherit (nixos.lib) recursiveUpdate; inherit (nixos.lib) recursiveUpdate;
inherit (self.lib) overlays nixosModules genPackages genPkgs inherit (self.lib) overlays nixosModules genPackages genPkgs
genHomeActivationPackages; genHomeActivationPackages;

View File

@ -79,7 +79,7 @@ in
genPkgs = { self }: genPkgs = { self }:
let inherit (self) inputs; let inherit (self) inputs;
in in
(inputs.flake-utils.lib.eachDefaultSystem (inputs.utils.lib.eachDefaultSystem
(system: (system:
let let
extern = import ../extern { inherit inputs; }; extern = import ../extern { inherit inputs; };
@ -93,7 +93,7 @@ in
lib = (prev.lib or { }) // { lib = (prev.lib or { }) // {
inherit (nixos.lib) nixosSystem; inherit (nixos.lib) nixosSystem;
flk = self.lib; flk = self.lib;
utils = inputs.flake-utils.lib; utils = inputs.utils.lib;
}; };
}) })
] ]