From 6df302fdd7bbc5450df83158a0bf5d090e5d065b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Apr 2023 20:48:48 +0200 Subject: [PATCH] Remove inputs from module inputs --- config/default.nix | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/default.nix b/config/default.nix index 33313229..fd4fc605 100644 --- a/config/default.nix +++ b/config/default.nix @@ -1,4 +1,4 @@ -{ config, inputs, lib, pkgs, zentralwerk, ... }: +{ config, lib, nixos, pkgs, zentralwerk, ... }: # this file contains default configuration that may be turned on depending on other config settings. # options should go to modules. @@ -81,11 +81,11 @@ randomizedDelaySec = "6h"; }; nixPath = [ - "nixpkgs=${builtins.unsafeDiscardStringContext inputs.nixos}" - "nixos=${builtins.unsafeDiscardStringContext inputs.nixos}" + "nixpkgs=${builtins.unsafeDiscardStringContext nixos}" + "nixos=${builtins.unsafeDiscardStringContext nixos}" "nixos-config=/you/shall/deploy/from/the/flake" ]; - registry.nixpkgs.flake = inputs.nixos; + registry.nixpkgs.flake = nixos; settings = { builders-use-substitutes = true; # TODO: move connect-timeout = 20; diff --git a/flake.nix b/flake.nix index 59f00a96..8df686c8 100644 --- a/flake.nix +++ b/flake.nix @@ -265,7 +265,7 @@ modules = [ (_: { _module.args = { - inherit hostRegistry inputs zentralwerk; + inherit hostRegistry nixos zentralwerk; }; nixpkgs.overlays = overlayList;