From 5bb9bf47740bb98bf6c2c404a086d7ed6a5c595d Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 20 May 2022 20:17:02 +0100 Subject: [PATCH] meta.sourceProvenance: inline hasSourceProvenance it may be what the license handling code does, but it's confusing and not very useful Co-authored-by: Adam Joseph <54836058+a-m-joseph@users.noreply.github.com> --- pkgs/stdenv/generic/check-meta.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 96e2a40b2de9..4e5db210637a 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -89,13 +89,11 @@ let allowInsecurePredicate attrs || builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; - hasSourceProvenance = attrs: - attrs ? meta.sourceProvenance; isNonSource = sourceTypes: lib.lists.any (t: !t.isSource) sourceTypes; hasNonSourceProvenance = attrs: - hasSourceProvenance attrs && + (attrs ? meta.sourceProvenance) && isNonSource (lib.lists.toList attrs.meta.sourceProvenance); # Allow granular checks to allow only some non-source-built packages