summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Justin Bauer <mjbauer95@gmail.com>2018-03-27 12:39:56 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-03-27 18:17:46 -0500
commit00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad (patch)
tree25b135480c7675c078f69dd2e3b2f6d40154f44e
parent80aec24b92707daf5ae2cd954e08ccd8c68ef3ad (diff)
downloadnixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.tar
nixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.tar.gz
nixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.tar.bz2
nixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.tar.lz
nixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.tar.xz
nixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.tar.zst
nixlib-00e6cc94ae18c6d5f43f2849b81dff1cf35f48ad.zip
Cleanup all-packages.nix
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1f9e198aafa..d7e581eff7ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13086,7 +13086,7 @@ with pkgs;
     })
     else if stdenv.isLinux
     then utillinuxMinimal
-    else libossp_uuid;
+    else null;
 
   light = callPackage ../os-specific/linux/light { };
 
@@ -21135,5 +21135,6 @@ with pkgs;
 
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
-  inherit (unixtools) hexdump ps logger eject modprobe umount mount wall hostname more;
+  inherit (unixtools) hexdump ps logger eject modprobe umount
+                      mount wall hostname more sysctl;
 }