refactor(readTree): Move 'drvTargets' into readTree
This function is also generally useful for readTree consumers that have the concept of subtargets. Change-Id: Ic7fc03380dec6953fb288763a28e50ab3624d233
This commit is contained in:
parent
5cad3f7b81
commit
4f1249e46f
19 changed files with 34 additions and 40 deletions
|
|
@ -37,4 +37,4 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
in depot.nix.utils.drvTargets netencode
|
||||
in depot.nix.readTree.drvTargets netencode
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ let
|
|||
bins.cdbget "$2"
|
||||
];
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
router
|
||||
depotCgitLink
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let
|
|||
name = "exec-helpers";
|
||||
} (builtins.readFile ./exec_helpers.rs);
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
exec-helpers
|
||||
;
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ let
|
|||
}
|
||||
'';
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
netencode-rs
|
||||
pretty-rs
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ let
|
|||
}
|
||||
'';
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
python-netstring
|
||||
rust-netstring
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ let
|
|||
}
|
||||
'';
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
python-netstring-test
|
||||
rust-netstring-test
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ let
|
|||
"nix-instantiate" "$1" "-A" "{}"
|
||||
];
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
instantiate-nixpkgs-randomly
|
||||
# requires hnix, which we don’t want in tvl for now
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
print-ast
|
||||
tree-sitter-nix
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ let
|
|||
assert(test_lib.test() == "test 1 2 3")
|
||||
'');
|
||||
|
||||
in depot.nix.utils.drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
inherit
|
||||
pythonWithLib
|
||||
;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@
|
|||
{ depot, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (depot.nix.utils) drvTargets;
|
||||
|
||||
checkZone = zone: file: pkgs.runCommandNoCC "${zone}-check" {} ''
|
||||
${pkgs.bind}/bin/named-checkzone -i local ${zone} ${file} | tee $out
|
||||
'';
|
||||
|
||||
in drvTargets {
|
||||
in depot.nix.readTree.drvTargets {
|
||||
kontemplate-works = checkZone "kontemplate.works"./kontemplate.works.zone;
|
||||
tazj-in = checkZone "tazj.in" ./tazj.in.zone;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue