From 601bed3849405956ce4e301e89ab5a9ec2276f3f Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 5 Sep 2019 06:56:24 +0200 Subject: [PATCH] nixos/tests/quake3: Fix evaluation error In c814d72b517bb201c8bbbfc64e386c7023352886, a bunch of packages were changed to use the pname attribute, among them were the quake3-demodata and quake3-pointrelease which we use for the quake3 test. Fortunately, having pname available means that we no longer need to match using a prefix, so fixing this eval error also simplifies our matching. I directly pushed this to master because the change is non-controversial and we can't break things that are already broken :-) Signed-off-by: aszlig --- nixos/tests/quake3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index fbb798515e1..9ea43a71ccc 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -12,9 +12,9 @@ let # Only allow the demo data to be used (only if it's unfreeRedistributable). unfreePredicate = pkg: with pkgs.lib; let - allowDrvPredicates = [ "quake3-demo" "quake3-pointrelease" ]; + allowPackageNames = [ "quake3-demodata" "quake3-pointrelease" ]; allowLicenses = [ pkgs.lib.licenses.unfreeRedistributable ]; - in any (flip hasPrefix pkg.name) allowDrvPredicates && + in elem pkg.pname allowPackageNames && elem (pkg.meta.license or null) allowLicenses; in