Merge remote-tracking branch 'upstream/master' into staging

pkgs/tools/system/pciutils/default.nix

@@ -1,12 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
-let
-  pciids = fetchurl {
-    # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://tarballs.nixos.org/pci.ids.20131006.bz2;
-    sha256 = "1vmshcgxqminiyh52pdcak24lm24qlic49py9cmkp96y1s48lvsc";
-  };
-in
 stdenv.mkDerivation rec {
   name = "pciutils-3.3.1"; # with database from 2015-04
 
@@ -17,8 +10,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig zlib kmod which ];
 
-  #preBuild = "bunzip2 < ${pciids} > pci.ids";
-
   makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";