From 30caf6f8bec1ce36edf105cb8714470675476a0f Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Mon, 8 Jul 2024 09:39:03 -0700 Subject: [PATCH] Fix nobodyMaintains check --- flake.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index c1d9d28..4181286 100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,9 @@ else if ! hasAttr "maintainers" drv.meta then [] else drv.meta.maintainers; nobodyMaintains = drv: - if ! hasAttr "meta" drv then true - else if ! hasAttr "maintainers" drv.meta then true - else (length drv.meta.maintainers) == 0; + hasAttr "meta" drv && + hasAttr "maintainers" drv.meta && + (length drv.meta.maintainers) == 0; maintainerToString = m: "${m.name} (${m.email})"; drvToString = drv: "${drv.name}"; }; @@ -52,7 +52,7 @@ drvNames = map drvToString drvsNoMain; drvNamesList = writeText "no-maintainers" (concatLines drvNames); uniqNames = runCommandLocal "no-maintainers.txt" {} '' - <${drvNamesList} sort | uniq -c > $out + <${drvNamesList} sort -u > $out ''; in uniqNames; };