From d904724adf6650747d79b80426432f59620ec175 Mon Sep 17 00:00:00 2001 From: sterni Date: Wed, 15 Sep 2021 13:25:08 +0200 Subject: refactor(rust-crates-advisory): check type instead of blacklisting `our-crates` can just check if the attributes in question are derivation (i. e. have an `outPath`) instead of blacklisting the `__readTree` attribute specifically. Change-Id: I472692e89c0e9eff551372c72a73ab765b0b6599 --- tools/rust-crates-advisory/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/rust-crates-advisory/default.nix b/tools/rust-crates-advisory/default.nix index d9b8783904..1a26a523b2 100644 --- a/tools/rust-crates-advisory/default.nix +++ b/tools/rust-crates-advisory/default.nix @@ -15,9 +15,8 @@ let sha256 = "0v086ybwr71zgs5nv8yr4w2w2d4daxx6in2s1sjb4m41q1r9p0wj"; }}/crates"; - our-crates = lib.mapAttrsToList (_: lib.id) - # this is a bit eh, but no idea how to avoid the readTree thing otherwise - (builtins.removeAttrs depot.third_party.rust-crates [ "__readTree" ]); + our-crates = lib.filter (v: v ? outPath) + (builtins.attrValues depot.third_party.rust-crates); check-security-advisory = depot.nix.writers.rustSimple { name = "parse-security-advisory"; -- cgit 1.4.1