From 52ed09d210d3d6bcb1e3021058c3afe69a02a318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Jul 2013 10:34:17 +0200
Subject: [PATCH 1/2] pciutils: update

This breaks udev145 due to enabling compression again,
but I rather think we should remove udev145 (not used anywhere).
---
 pkgs/tools/system/pciutils/default.nix | 33 ++++++++++++--------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 78ff9131fa8b..3f63d077c7fa 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation rec {
-  name = "pciutils-3.1.10";
-
-  src = fetchurl {
-    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
-    sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl";
-  };
-
-  buildInputs = [ zlib ];
+{ 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.20120929.bz2;
     sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
   };
+in
+stdenv.mkDerivation rec {
+  name = "pciutils-3.2.0";
 
-  # Override broken auto-detect logic.
-  # Note: we can't compress pci.ids (ZLIB=yes) because udev requires
-  # an uncompressed pci.ids.
-  makeFlags = "ZLIB=no DNS=yes SHARED=yes PREFIX=\${out}";
+  src = fetchurl {
+    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
+    sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq";
+  };
 
-  preBuild = ''
-    bunzip2 < $pciids > pci.ids
-  '';
+  buildInputs = [ pkgconfig zlib kmod which ];
+
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${pciids} > pci.ids";
+
+  makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";
 

From 0a30727ca0f462f866a6fa1c0ef291dc4f42cac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Jul 2013 11:55:40 +0200
Subject: [PATCH 2/2] usbutils: update 006 -> 007

---
 pkgs/os-specific/linux/usbutils/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 3956b5e04d09..b7d139a534f0 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -11,16 +11,17 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "usbutils-006";
+  name = "usbutils-007";
 
   src = fetchurl {
-    url = mirror://kernel/linux/utils/usb/usbutils/usbutils-006.tar.xz;
-    sha256 = "03pd57vv8c6x0hgjqcbrxnzi14h8hcghmapg89p8k5zpwpkvbdfr";
+    url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
+    sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm";
   };
 
   buildInputs = [ pkgconfig libusb1 ];
 
-  preBuild = "bunzip2 < ${usbids} > usb.ids";
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${usbids} > usb.ids";
 
   meta = {
     homepage = http://www.linux-usb.org/;