flake: rename flake-utils input
This commit is contained in:
parent
b42f7b514d
commit
cf23b8e64d
36
flake.lock
36
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"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
})
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue