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

refactor(readTree): Move 'drvTargets' into readTree

Browse source 
This function is also generally useful for readTree consumers that
have the concept of subtargets.

Change-Id: Ic7fc03380dec6953fb288763a28e50ab3624d233
This commit is contained in:
Vincent Ambo 2021-11-23 16:31:17 +03:00 committed by tazjin
parent 5cad3f7b81
commit 4f1249e46f
19 changed files with 34 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fun/idual/default.nix
View file

@ -14,7 +14,7 @@ let
};
package = python3Packages.buildPythonPackage opts;
script = python3Packages.buildPythonApplication opts;
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit script;
python = python3.withPackages (_: [ package ]);
setAlarm = pkgs.writeShellScriptBin "set-alarm" ''

17
nix/readTree/default.nix
View file

@ -157,6 +157,10 @@ let
})
(node.meta.targets or []))
else [];
# Determine whether a given value is a derivation.
# Copied from nixpkgs/lib for cases where lib is not available yet.
isDerivation = x: isAttrs x && x ? type && x.type == "derivation";
in {
inherit gather;
@ -210,4 +214,17 @@ in {
#
# It is often required to create the args attribute set.
fix = f: let x = f x; in x;
# Takes an attribute set and adds a meta.targets attribute to it
# which contains all direct children of the attribute set which are
# derivations.
#
# Type: attrs -> attrs
drvTargets = attrs: attrs // {
meta = {
targets = builtins.filter
(x: isDerivation attrs."${x}")
(builtins.attrNames attrs);
} // (attrs.meta or {});
};
}

17
nix/utils/default.nix
View file

@ -1,22 +1,6 @@
{ depot, lib, ... }:
let
/* Takes an attribute set and adds a meta.targets
attribute to it which contains all direct children
of the attribute set which are derivations.
Type: attrs -> attrs
*/
drvTargets = attrs:
attrs // {
meta = {
targets = builtins.filter
(x: lib.isDerivation attrs."${x}")
(builtins.attrNames attrs);
} // (attrs.meta or {});
};
/* Get the basename of a store path without
the leading hash.
@ -186,7 +170,6 @@ let
in {
inherit
drvTargets
storePathName
pathType
isDirectory

2
nix/writers/tests/rust.nix
View file

@ -60,7 +60,7 @@ let
'');
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit
rustTransitiveLib
rustWithLib

6
ops/dns/default.nix
View file

@ -2,15 +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 {
nixery-dev = checkZone "nixery.dev" ./nixery.dev.zone;
tvl-fyi = checkZone "tvl.fyi" ./tvl.fyi.zone;
tvl-su = checkZone "tvl.su" ./tvl.su.zone;

2
third_party/gerrit_plugins/default.nix vendored
View file

@ -2,7 +2,7 @@
let
inherit (import ./builder.nix args) buildGerritBazelPlugin;
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
# https://gerrit.googlesource.com/plugins/owners
owners = buildGerritBazelPlugin rec {
name = "owners";

2
third_party/nixery/default.nix vendored
View file

@ -3,7 +3,7 @@
{ depot, pkgs, ... }:
let
inherit (depot.nix.utils) drvTargets;
inherit (depot.nix.readTree) drvTargets;
commit = "6c4a69fa4280f0154ce257a1dfd23fb463c1ec5b";
src = pkgs.fetchFromGitHub {

2
tools/rust-crates-advisory/default.nix
View file

@ -77,7 +77,7 @@ let
bins.s6-touch "$out"
];
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
check-all-our-crates =
depot.nix.drvSeqL

2
users/Profpatsch/arglib/netencode.nix
View file

@ -37,4 +37,4 @@ let
'';
};
in depot.nix.utils.drvTargets netencode
in depot.nix.readTree.drvTargets netencode

2
users/Profpatsch/blog/default.nix
View file

@ -358,7 +358,7 @@ let
bins.cdbget "$2"
];
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit
router
depotCgitLink

2
users/Profpatsch/execline/default.nix
View file

@ -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
;

2
users/Profpatsch/netencode/default.nix
View file

@ -135,7 +135,7 @@ let
}
'';
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit
netencode-rs
pretty-rs

2
users/Profpatsch/netstring/default.nix
View file

@ -55,7 +55,7 @@ let
}
'';
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit
python-netstring
rust-netstring

2
users/Profpatsch/netstring/tests/default.nix
View file

@ -53,7 +53,7 @@ let
}
'';
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit
python-netstring-test
rust-netstring-test

2
users/Profpatsch/nixpkgs-rewriter/default.nix
View file

@ -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

2
users/Profpatsch/tree-sitter.nix
View file

@ -169,7 +169,7 @@ let
'';
};
in depot.nix.utils.drvTargets {
in depot.nix.readTree.drvTargets {
inherit
print-ast
tree-sitter-nix

2
users/Profpatsch/writers/tests/default.nix
View file

@ -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
;

4
users/tazjin/dns/default.nix
View file

@ -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;
}

2
web/tvl/logo/default.nix
View file

@ -67,7 +67,7 @@ let
</svg>
'';
in depot.nix.utils.drvTargets(lib.fix (self: {
in depot.nix.readTree.drvTargets(lib.fix (self: {
# Expose the logo construction functions.
inherit palette darkCss lightCss animatedCss staticCss;