kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity

make re-exports explicit again

Browse source
This commit is contained in:
Kiara Grouwstra 2025-03-25 08:42:55 +01:00
parent 95769084ce
commit 5f39adda15
Signed by: kiara
SSH key fingerprint: SHA256:COspvLoLJ5WC5rFb9ZDe5urVCkK4LJZOsjfF4duRJFU
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
launch/default.nix
View file

@ -4,7 +4,7 @@
pkgs ? import sources.nixpkgs { pkgs ? import sources.nixpkgs {
inherit system; inherit system;
}, },
}@args: }:
let let
inherit (pkgs) lib; inherit (pkgs) lib;
in in
@ -16,7 +16,12 @@ in
(import ./tf.nix { inherit lib pkgs; }) (import ./tf.nix { inherit lib pkgs; })
]; ];
}; };
}
# re-export inputs so they can be overridden granularly # re-export inputs so they can be overridden granularly
# (they can't be accessed from the outside any other way) # (they can't be accessed from the outside any other way)
// args inherit
sources
system
pkgs
;
}

11
panel/default.nix
View file

@ -6,7 +6,7 @@
config = { }; config = { };
overlays = [ (import ./nix/overlay.nix) ]; overlays = [ (import ./nix/overlay.nix) ];
}, },
}@args: }:
let let
inherit (pkgs) lib; inherit (pkgs) lib;
manage = pkgs.writeScriptBin "manage" '' manage = pkgs.writeScriptBin "manage" ''
@ -36,7 +36,12 @@ in
module = import ./nix/configuration.nix; module = import ./nix/configuration.nix;
tests = pkgs.callPackage ./nix/tests.nix { }; tests = pkgs.callPackage ./nix/tests.nix { };
}
# re-export inputs so they can be overridden granularly # re-export inputs so they can be overridden granularly
# (they can't be accessed from the outside any other way) # (they can't be accessed from the outside any other way)
// args inherit
sources
system
pkgs
;
}