mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Pass the depot as an argument named 'depot'

Browse source 
This change, which I've been meaning to do for a while, renames the
attributes passed by readTree to things in the tree so that:

* the depot root is now 'depot'
* depot.third_party is additionally passed as 'pkgs' (for
  compatibility with exported subtrees)
This commit is contained in:
Vincent Ambo 2020-02-21 12:45:43 +00:00
parent 0e54b3eb6a
commit 5d9d84f4cf
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
default.nix
View file

@ -15,8 +15,12 @@ let
fix = f: let x = f x; in x; fix = f: let x = f x; in x;
# Global configuration that all packages are called with. # Global configuration that all packages are called with.
config = pkgs: { config = depot: {
inherit pkgs; inherit depot;
# Pass third_party as 'pkgs' (for compatibility with external
# imports for certain subdirectories)
pkgs = depot.third_party;
kms = { kms = {
project = "tazjins-infrastructure"; project = "tazjins-infrastructure";
@ -58,5 +62,5 @@ in fix(self: {
# #
# This can be used to move things from third_party into the top-level, too (such # This can be used to move things from third_party into the top-level, too (such
# as `lib`). # as `lib`).
// (readTree' { pkgs = self; }) ./overrides // (readTree' { depot = self; pkgs = self.third_party; }) ./overrides
) )