From d78995b34c9a7966228cdf2515df24c14abadfe7 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Tue, 25 Mar 2025 08:38:53 +0100
Subject: [PATCH] make re-exports explicit again
https://git.fediversity.eu/Fediversity/Fediversity/pulls/269#issuecomment-5207
---
panel/default.nix | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/panel/default.nix b/panel/default.nix
index 63f53810..767802be 100644
--- a/panel/default.nix
+++ b/panel/default.nix
@@ -6,17 +6,14 @@
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 = [
@@ -39,7 +36,12 @@ args
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