ref: make onion with flake-utils

This commit is contained in:
David Arnold 2021-04-17 20:56:24 -05:00
parent 6cccb55263
commit 9dca402914
5 changed files with 14 additions and 11 deletions

View File

@ -12,8 +12,6 @@
lib = prev.lib.extend (lfinal: lprev: {
inherit lib;
inherit (lib) nixosSystem;
utils = inputs.utils.lib;
});
})
(overridesOverlay overridePkgs)

View File

@ -30,6 +30,11 @@
lists = callLibs ./lists.nix;
strings = callLibs ./strings.nix;
in
utils.lib
//
{
inherit callLibs;
@ -47,19 +52,19 @@
pathsToImportedAttrs concatAttrs filterPackages;
inherit (lists) pathsIn;
inherit (strings) rgxToString;
});
}
);
in
{
# ... but don't force that choice onto the user
lib = {
lib = utils.lib // {
mkFlake = combinedLib.mkFlake;
pkgs-lib = combinedLib.pkgs-lib;
};
}
//

View File

@ -1,4 +1,4 @@
{ lib, utils, deploy, ... }:
{ lib, deploy, ... }:
let
inherit (dev) os;
in
@ -31,7 +31,7 @@ let
deploy.nodes = os.mkNodes deploy userFlakeSelf.nixosConfigurations;
};
systemOutputs = utils.lib.eachDefaultSystem (system:
systemOutputs = lib.eachDefaultSystem (system:
let
pkgs = multiPkgs.${system};
pkgs-lib = lib.pkgs-lib.${system};

View File

@ -1,4 +1,4 @@
{ userFlakeSelf, lib, nixpkgs, utils, ... }:
{ userFlakeSelf, lib, nixpkgs, ... }:
{ args }:
let
@ -190,7 +190,7 @@ let
};
supportedSystems = mkOption {
type = listOf str;
default = utils.lib.defaultSystems;
default = lib.defaultSystems;
description = ''
The systems supported by this flake
'';

View File

@ -1,5 +1,5 @@
args@{ lib, utils, nixpkgs, ... }:
lib.genAttrs utils.lib.defaultSystems (system:
args@{ lib, nixpkgs, ... }:
lib.genAttrs lib.defaultSystems (system:
lib.makeExtensible (final:
let
pkgs = import nixpkgs { inherit system; };