mirror of
https://github.com/gytis-ivaskevicius/flake-utils-plus.git
synced 2024-08-17 03:50:24 +03:00
Fix tests
This commit is contained in:
parent
062bc257bd
commit
0e0cc7b28d
@ -6,6 +6,7 @@
|
|||||||
outputs = { self, flake-utils }:
|
outputs = { self, flake-utils }:
|
||||||
let
|
let
|
||||||
inherit (builtins) isList isAttrs mapAttrs;
|
inherit (builtins) isList isAttrs mapAttrs;
|
||||||
|
inherit (flake-utils.lib) defaultSystems eachSystemMap;
|
||||||
fupArgs = { flake-utils-plus = self; };
|
fupArgs = { flake-utils-plus = self; };
|
||||||
|
|
||||||
mkFlake = import ./lib/mkFlake.nix fupArgs;
|
mkFlake = import ./lib/mkFlake.nix fupArgs;
|
||||||
@ -22,7 +23,7 @@
|
|||||||
nixosModules.autoGenFromInputs = import ./lib/options.nix;
|
nixosModules.autoGenFromInputs = import ./lib/options.nix;
|
||||||
darwinModules.autoGenFromInputs = import ./lib/options.nix;
|
darwinModules.autoGenFromInputs = import ./lib/options.nix;
|
||||||
|
|
||||||
devShell.x86_64-linux = import ./devShell.nix { system = "x86_64-linux"; };
|
devShell = eachSystemMap defaultSystems (system: import ./devShell.nix { inherit system; });
|
||||||
|
|
||||||
lib = flake-utils.lib // {
|
lib = flake-utils.lib // {
|
||||||
inherit mkFlake exportModules exportOverlays exportPackages genPkgOverlay;
|
inherit mkFlake exportModules exportOverlays exportPackages genPkgOverlay;
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
inputs.utils.url = path:../../;
|
inputs.utils.url = path:../../;
|
||||||
|
inputs.nix-darwin.url = github:LnL7/nix-darwin?ref=2f2bdf658d2b79bada78dc914af99c53cad37cba;
|
||||||
|
|
||||||
outputs = inputs@{ self, nixpkgs, utils }:
|
outputs = inputs@{ self, nixpkgs, nix-darwin, utils }:
|
||||||
let
|
let
|
||||||
base-nixos = {
|
base-nixos = {
|
||||||
boot.loader.grub.devices = [ "nodev" ];
|
boot.loader.grub.devices = [ "nodev" ];
|
||||||
@ -31,7 +32,6 @@
|
|||||||
specialArgs.sharedSpecialArg = "sharedSpecialArg";
|
specialArgs.sharedSpecialArg = "sharedSpecialArg";
|
||||||
|
|
||||||
modules = [
|
modules = [
|
||||||
base-nixos
|
|
||||||
# Assigning to lib.* so we could assert these options in checks
|
# Assigning to lib.* so we could assert these options in checks
|
||||||
({ sharedExtraArg, sharedSpecialArg, ... }: {
|
({ sharedExtraArg, sharedSpecialArg, ... }: {
|
||||||
lib = { inherit sharedExtraArg sharedSpecialArg; };
|
lib = { inherit sharedExtraArg sharedSpecialArg; };
|
||||||
@ -39,11 +39,12 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
hosts.Plain = { };
|
hosts.Plain.modules = [ base-nixos ];
|
||||||
|
|
||||||
hosts."com.example.myhost" = { };
|
hosts."com.example.myhost".modules = [ base-nixos ];
|
||||||
|
|
||||||
hosts.WithFakeBuilder = {
|
hosts.WithFakeBuilder = {
|
||||||
|
modules = [ base-nixos ];
|
||||||
builder = args: { fakeBuilder = "fakeBuilder"; };
|
builder = args: { fakeBuilder = "fakeBuilder"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -53,6 +54,7 @@
|
|||||||
channelName = "unstable";
|
channelName = "unstable";
|
||||||
extraArgs.hostExtraArg = "hostExtraArg";
|
extraArgs.hostExtraArg = "hostExtraArg";
|
||||||
specialArgs.hostSpecialArg = "hostSpecialArg";
|
specialArgs.hostSpecialArg = "hostSpecialArg";
|
||||||
|
builder = nix-darwin.lib.darwinSystem;
|
||||||
|
|
||||||
# Assigning to lib.* so we could assert these options in checks
|
# Assigning to lib.* so we could assert these options in checks
|
||||||
modules = [
|
modules = [
|
||||||
@ -83,7 +85,7 @@
|
|||||||
reverseDnsHostDomain = reverseDnsHost.config.networking.domain;
|
reverseDnsHostDomain = reverseDnsHost.config.networking.domain;
|
||||||
|
|
||||||
customizedHost = self.darwinConfigurations.Customized;
|
customizedHost = self.darwinConfigurations.Customized;
|
||||||
customizedHostPkgs = customizedHost.config.nixpkgs.pkgs;
|
customizedHostPkgs = customizedHost.pkgs;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user