public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41043 from obsidiansystems/fix-nix-env-meta

Browse Source 
lib: Fix `nix-env -qaP -f . --xml --meta`
This commit is contained in:
Peter Simons 2018-05-24 21:05:42 +02:00 committed by GitHub
commit 2ce9d4f60c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/systems/for-meta.nix
View File

@ -3,6 +3,8 @@ let
inherit (lib.systems) parse; inherit (lib.systems) parse;
inherit (lib.systems.inspect) patterns; inherit (lib.systems.inspect) patterns;
abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) parse.abis;
in rec { in rec {
all = [ {} ]; # `{}` matches anything all = [ {} ]; # `{}` matches anything
none = []; none = [];
@ -19,7 +21,7 @@ in rec {
darwin = [ patterns.isDarwin ]; darwin = [ patterns.isDarwin ];
freebsd = [ patterns.isFreeBSD ]; freebsd = [ patterns.isFreeBSD ];
# Should be better, but MinGW is unclear, and HURD is bit-rotted. # Should be better, but MinGW is unclear, and HURD is bit-rotted.
gnu = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ]; gnu = [ { kernel = parse.kernels.linux; abi = abis.gnu; } ];
illumos = [ patterns.isSunOS ]; illumos = [ patterns.isSunOS ];
linux = [ patterns.isLinux ]; linux = [ patterns.isLinux ];
netbsd = [ patterns.isNetBSD ]; netbsd = [ patterns.isNetBSD ];