diff options
| author | aszlig <aszlig@nix.build> | 2019-09-05 06:56:24 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2019-09-05 07:00:12 +0200 |
| commit | 601bed3849405956ce4e301e89ab5a9ec2276f3f (patch) | |
| tree | 15a2d56e4ee95693317cb9e3b004598eca953fb1 /nixos/tests/quake3.nix | |
| parent | 5e86891baa57ba4e8aace81c0f24399df3082d37 (diff) | |
| download | nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.tar nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.tar.gz nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.tar.bz2 nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.tar.lz nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.tar.xz nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.tar.zst nixpkgs-601bed3849405956ce4e301e89ab5a9ec2276f3f.zip | |
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 <aszlig@nix.build>
Diffstat (limited to 'nixos/tests/quake3.nix')
| -rw-r--r-- | nixos/tests/quake3.nix | 4 |
1 files 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 |