fix: various left-overs

This commit is contained in:
David Arnold 2021-04-18 23:48:19 -05:00
parent 8134350545
commit a714cf466d
No known key found for this signature in database
GPG Key ID: 6D6A936E69C59D08
9 changed files with 18 additions and 15 deletions

4
extern/default.nix vendored
View File

@ -7,10 +7,6 @@
overlays = [
nur.overlay
devshell.overlay
(final: prev: {
deploy-rs = deploy.packages.${prev.system}.deploy-rs;
})
pkgs.overlay
];

View File

@ -81,7 +81,7 @@
"utils": "utils_2"
},
"locked": {
"narHash": "sha256-/SJJ8u/qBnCtMbMxBmDNBDnLWnmro2ioi35gL45hP9w=",
"narHash": "sha256-Mf67M0twCyNmRQxnhH51f6VroHaCwJKvFDMc1Wc7pt8=",
"path": "./lib",
"type": "path"
},

View File

@ -35,7 +35,7 @@
outputs = inputs@{ self, devos, nixos, nur, ... }:
devos.lib.mkFlake {
inherit self;
inherit self inputs nixos;
hosts = ./hosts;
packages = import ./pkgs;
suites = import ./suites;

View File

@ -1,6 +1,6 @@
{ lib }:
{ userFlakeNixos, userFlakeSelf, userFlakeInputs }:
{ userFlakeNixOS, userFlakeSelf, userFlakeInputs }:
{ modules, ... } @ args:
lib.nixosSystem (args // {
@ -15,7 +15,7 @@ lib.nixosSystem (args // {
(args // {
modules = moduleList ++ [
"${userFlakeNixos}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
"${userFlakeNixOS}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
({ config, suites, ... }: {

View File

@ -65,7 +65,7 @@ let
# Everything in `./modules/list.nix`.
flakeModules = { imports = builtins.attrValues userFlakeSelf.nixosModules ++ extern.modules; };
cachix = ../../cachix.nix;
cachix = "${userFlakeSelf}/cachix.nix";
};
specialArgs = extern.specialArgs // { suites = suites.system; };
@ -84,12 +84,12 @@ let
hosts = builtins.mapAttrs (_: host: host.config)
(removeAttrs hosts [ hostName ]);
};
};
lib = {
lib = { inherit specialArgs; };
lib.testModule = {
imports = builtins.attrValues modules;
};
};
in
lib.os.devosSystem {
@ -97,7 +97,7 @@ let
} {
inherit specialArgs;
system = defaultSystem;
modules = modules // { inherit local lib; };
modules = modules // { inherit local; };
};
hosts = lib.os.recImport

View File

@ -22,6 +22,14 @@ let
type = addCheck attrs lib.isStorePath;
description = "The flake to create the devos outputs for";
};
nixos = mkOption {
type = addCheck attrs lib.isStorePath;
description = "The default nixpkgs channel of the devos";
};
inputs = mkOption {
type = addCheck attrs lib.isStorePath;
description = "All inptus of the devos";
};
hosts = mkOption {
type = path;
default = "${userFlakeSelf}/hosts";

View File

@ -3,7 +3,7 @@
lib.genAttrs
lib.defaultSystems (system:
{
tests = import ./tests { inherit lib deploy nixpkgs pkgs system; };
tests = import ./tests { inherit lib deploy nixpkgs system; };
shell = import ./shell { inherit lib devshell deploy nixpkgs system; };
}
)

View File

@ -11,7 +11,7 @@ let
];
pkgs = import nixpkgs { inherit system overlays;; config = {}; };
pkgs = import nixpkgs { inherit system overlays; config = {}; };
flk = pkgs.callPackage ./flk.nix { };

View File

@ -11,7 +11,6 @@ in
binutils
coreutils
curl
deploy-rs
direnv
dnsutils
dosfstools