about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-04-19 22:14:57 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-04-20 11:21:20 +0200
commit3d2b24d1617f523bcd96dad48c91b7d3cbf496b3 (patch)
tree6625b7333ab8dda70e98a14af024220f2eafe90d
parent3cd32fcbed8610f6708533d8b8e5d864c3113515 (diff)
downloadnixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.tar
nixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.tar.gz
nixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.tar.bz2
nixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.tar.lz
nixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.tar.xz
nixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.tar.zst
nixlib-3d2b24d1617f523bcd96dad48c91b7d3cbf496b3.zip
Remove pciutils and usbutils from the default system path
Issue #7117.
-rw-r--r--nixos/modules/config/system-path.nix2
-rw-r--r--nixos/modules/profiles/base.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index f3e86bfd2019..25c8ac307716 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -40,7 +40,6 @@ let
       pkgs.ncurses
       pkgs.netcat
       pkgs.openssh
-      pkgs.pciutils
       pkgs.perl
       pkgs.procps
       pkgs.rsync
@@ -48,7 +47,6 @@ let
       pkgs.sysvtools
       pkgs.su
       pkgs.time
-      pkgs.usbutils
       pkgs.utillinux
       extraManpages
     ];
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 0864fe794351..0d40b7112df7 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -29,6 +29,8 @@
     pkgs.hdparm
     pkgs.dmraid
     pkgs.smartmontools # for diagnosing hard disks
+    pkgs.pciutils
+    pkgs.usbutils
 
     # Tools to create / manipulate filesystems.
     pkgs.ntfsprogs # for resizing NTFS partitions