From 2261bc7c9b92763a596688a08cd55f6a83311830 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Fri, 21 Mar 2025 18:04:25 +0100 Subject: [PATCH] refactor shell re-export --- panel/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/panel/default.nix b/panel/default.nix index 0c39fce6..295671b0 100644 --- a/panel/default.nix +++ b/panel/default.nix @@ -6,14 +6,17 @@ config = { }; overlays = [ (import ./nix/overlay.nix) ]; }, -}: +}@args: let inherit (pkgs) lib; manage = pkgs.writeScriptBin "manage" '' exec ${pkgs.lib.getExe pkgs.python3} ${toString ./src/manage.py} $@ ''; in -{ +# re-export inputs so they can be overridden granularly +# (they can't be accessed from the outside any other way) +args +// { shell = pkgs.mkShellNoCC { inputsFrom = [ (pkgs.callPackage ./nix/package.nix { }) ]; packages = [ @@ -38,12 +41,4 @@ 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 - ; }