summary refs log tree commit diff
path: root/lib/systems
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-24 10:43:14 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2018-05-24 10:43:14 -0400
commitd437f2c365a12fb3894eb87f52decf53c745f475 (patch)
treeb2e07436d4961300868370fbd145912767abdb1b /lib/systems
parentc0e0c7046d1d1fdbb70f49376b7fb98f8a787920 (diff)
downloadnixlib-d437f2c365a12fb3894eb87f52decf53c745f475.tar
nixlib-d437f2c365a12fb3894eb87f52decf53c745f475.tar.gz
nixlib-d437f2c365a12fb3894eb87f52decf53c745f475.tar.bz2
nixlib-d437f2c365a12fb3894eb87f52decf53c745f475.tar.lz
nixlib-d437f2c365a12fb3894eb87f52decf53c745f475.tar.xz
nixlib-d437f2c365a12fb3894eb87f52decf53c745f475.tar.zst
nixlib-d437f2c365a12fb3894eb87f52decf53c745f475.zip
lib: Fix `nix-env -qaP -f . --xml --meta`
The function value cannot be serialized so nix-env was mad. Turns out we can
just remove it like we do in `lib/systems/inspect.nix`.
Diffstat (limited to 'lib/systems')
-rw-r--r--lib/systems/for-meta.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 9e85cea3ad11..88cb0101410b 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -3,6 +3,8 @@ let
   inherit (lib.systems) parse;
   inherit (lib.systems.inspect) patterns;
 
+  abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) parse.abis;
+
 in rec {
   all     = [ {} ]; # `{}` matches anything
   none    = [];
@@ -19,7 +21,7 @@ in rec {
   darwin  = [ patterns.isDarwin ];
   freebsd = [ patterns.isFreeBSD ];
   # 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 ];
   linux   = [ patterns.isLinux ];
   netbsd  = [ patterns.isNetBSD ];