From 2f6c7cd3dd2ce0cd39d92f47048a489419be7686 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Jul 2010 12:01:57 +0000
Subject: [PATCH] * Latest pciutils and usbutils, along with the latest PCI and
 USB IDs.

svn path=/nixpkgs/branches/x-updates/; revision=22687
---
 pkgs/os-specific/linux/usbutils/default.nix | 12 ++++++------
 pkgs/tools/system/pciutils/default.nix      | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 4d692c97ad77..b3093b22a25d 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,24 +1,24 @@
-{stdenv, fetchurl, pkgconfig, libusb}:
+{ stdenv, fetchurl, pkgconfig, libusb }:
 
 let
 
   # Obtained from http://www.linux-usb.org/usb.ids.bz2.
   usbids = fetchurl {
-    url = http://nixos.org/tarballs/usb.ids.20090808.bz2;
-    sha256 = "1007p5cm3k6vdsfrkwy92yvscazycz71k8wx32jygr50qsv1advj";
+    url = http://nixos.org/tarballs/usb.ids.20100720.bz2;
+    sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d";
   };
 
 in
 
 stdenv.mkDerivation rec {
-  name = "usbutils-0.84";
+  name = "usbutils-0.86";
   
   src = fetchurl {
     url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
-    sha256 = "1aksgfsnxq43q3aas4cwhmy34ik3h2sg4iv2al9vz2v9aqnib83n";
+    sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk";
   };
   
-  buildInputs = [pkgconfig libusb];
+  buildInputs = [ pkgconfig libusb ];
   
   preBuild = "bunzip2 < ${usbids} > usb.ids";
 
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 0c933967113b..563521429a8e 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, zlib}:
+{ stdenv, fetchurl, zlib }:
 
-stdenv.mkDerivation {
-  name = "pciutils-3.1.2";
+stdenv.mkDerivation rec {
+  name = "pciutils-3.1.7";
   
   src = fetchurl {
-    url = mirror://kernel/software/utils/pciutils/pciutils-3.1.2.tar.bz2;
-    sha256 = "15wksvqcgdj0hvsp5irc1igiqid69rrzpc33qj9nlyssvyw40vpn";
+    url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
+    sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq";
   };
   
-  buildInputs = [zlib];
+  buildInputs = [ zlib ];
 
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://nixos.org/tarballs/pci.ids.20090727.bz2;
-    sha256 = "0q7fs5ww92a6v5dc514ff4vy7v9hzpdqbd1agbafc2wk2zgi10mk";
+    url = http://nixos.org/tarballs/pci.ids.20100714.bz2;
+    sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap";
   };
 
   # Override broken auto-detect logic.