From 5f39adda150eedfa330d52c3d03ea0249622edde Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Tue, 25 Mar 2025 08:42:55 +0100 Subject: [PATCH] make re-exports explicit again --- launch/default.nix | 13 +++++++++---- panel/default.nix | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/launch/default.nix b/launch/default.nix index 9a533dd8..8d01c0ef 100644 --- a/launch/default.nix +++ b/launch/default.nix @@ -4,7 +4,7 @@ pkgs ? import sources.nixpkgs { inherit system; }, -}@args: +}: let inherit (pkgs) lib; in @@ -16,7 +16,12 @@ in (import ./tf.nix { inherit lib pkgs; }) ]; }; + + # re-export inputs so they can be overridden granularly + # (they can't be accessed from the outside any other way) + inherit + sources + system + pkgs + ; } -# re-export inputs so they can be overridden granularly -# (they can't be accessed from the outside any other way) -// args diff --git a/panel/default.nix b/panel/default.nix index e8b95a6a..767802be 100644 --- a/panel/default.nix +++ b/panel/default.nix @@ -6,7 +6,7 @@ config = { }; overlays = [ (import ./nix/overlay.nix) ]; }, -}@args: +}: let inherit (pkgs) lib; manage = pkgs.writeScriptBin "manage" '' @@ -36,7 +36,12 @@ in module = import ./nix/configuration.nix; tests = pkgs.callPackage ./nix/tests.nix { }; + + # re-export inputs so they can be overridden granularly + # (they can't be accessed from the outside any other way) + inherit + sources + system + pkgs + ; } -# re-export inputs so they can be overridden granularly -# (they can't be accessed from the outside any other way) -// args