From 317cb8c1e98c2d1f037f4fa32e0bbe999908cebf Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 8 Jan 2022 01:52:17 +0100 Subject: [PATCH] flake.nix: update nixosSystem' for nixos-21.11 _module.args instead of extraArgs gets rid of warnings --- flake.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 3158cd7a..60d890bd 100644 --- a/flake.nix +++ b/flake.nix @@ -192,18 +192,19 @@ nixosConfigurations = let nixosSystem' = # Our custom NixOS builder - { nixpkgs ? inputs.nixpkgs, extraArgs ? {}, ... }@args: - nixpkgs.lib.nixosSystem (nixpkgs.lib.filterAttrs (n: _: n != "nixpkgs") args // { - extraArgs = extraArgs // { - inherit hostRegistry inputs zentralwerk; - }; - extraModules = [ + { nixpkgs ? inputs.nixpkgs, modules, extraArgs ? {}, system }: + nixpkgs.lib.nixosSystem { + inherit system; + modules = modules ++ [ self.nixosModules.c3d2 ({ pkgs, ... }: { + _module.args = extraArgs // { + inherit hostRegistry inputs zentralwerk; + }; nixpkgs.overlays = [ self.overlay ]; }) ]; - }); + }; in { freifunk = nixosSystem' {