From c2737e315aff6bc1318bc255353453922979ad74 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 20:48:56 +0000
Subject: [PATCH] * usbutils updated to 0.84. * usb.ids updated to the latest
 version.

svn path=/nixpkgs/trunk/; revision=16681
---
 pkgs/os-specific/linux/usbutils/default.nix | 25 ++++++++++++++-------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index fbd5e8c7cdfb..4d692c97ad77 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,20 +1,29 @@
-{stdenv, fetchurl, 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.20080115.bz2;
-    sha256 = "0xymp8fpp9pnkj2i4ry8zpsvy18zw14sx03pnz316lpgwc6dx12n";
+    url = http://nixos.org/tarballs/usb.ids.20090808.bz2;
+    sha256 = "1007p5cm3k6vdsfrkwy92yvscazycz71k8wx32jygr50qsv1advj";
   };
 
 in
 
-stdenv.mkDerivation {
-  name = "usbutils-0.73";
+stdenv.mkDerivation rec {
+  name = "usbutils-0.84";
+  
   src = fetchurl {
-    url = mirror://sourceforge/linux-usb/usbutils-0.73.tar.gz;
-    sha256 = "1x27mc2apyipf8fa2ac49rfnkm7f5dwv784b1ncgc5yjiz4prp1f";
+    url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
+    sha256 = "1aksgfsnxq43q3aas4cwhmy34ik3h2sg4iv2al9vz2v9aqnib83n";
   };
-  buildInputs = [libusb];
+  
+  buildInputs = [pkgconfig libusb];
+  
   preBuild = "bunzip2 < ${usbids} > usb.ids";
+
+  meta = {
+    homepage = http://www.linux-usb.org/;
+    description = "Tools for working with USB devices, such as lsusb";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51b7182bdcae..47cac7763f67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5568,7 +5568,7 @@ let
   };
 
   usbutils = import ../os-specific/linux/usbutils {
-    inherit fetchurl stdenv libusb;
+    inherit fetchurl stdenv pkgconfig libusb;
   };
 
   utillinux = utillinuxng;