* usbutils updated to 0.84.

* usb.ids updated to the latest version.

svn path=/nixpkgs/trunk/; revision=16681
This commit is contained in:
Eelco Dolstra 2009-08-11 20:48:56 +00:00
parent 4d7e5187d8
commit c2737e315a
2 changed files with 18 additions and 9 deletions

View File

@ -1,20 +1,29 @@
{stdenv, fetchurl, libusb}: {stdenv, fetchurl, pkgconfig, libusb}:
let let
# Obtained from http://www.linux-usb.org/usb.ids.bz2.
usbids = fetchurl { usbids = fetchurl {
url = http://nixos.org/tarballs/usb.ids.20080115.bz2; url = http://nixos.org/tarballs/usb.ids.20090808.bz2;
sha256 = "0xymp8fpp9pnkj2i4ry8zpsvy18zw14sx03pnz316lpgwc6dx12n"; sha256 = "1007p5cm3k6vdsfrkwy92yvscazycz71k8wx32jygr50qsv1advj";
}; };
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "usbutils-0.73"; name = "usbutils-0.84";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/linux-usb/usbutils-0.73.tar.gz; url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
sha256 = "1x27mc2apyipf8fa2ac49rfnkm7f5dwv784b1ncgc5yjiz4prp1f"; sha256 = "1aksgfsnxq43q3aas4cwhmy34ik3h2sg4iv2al9vz2v9aqnib83n";
}; };
buildInputs = [libusb];
buildInputs = [pkgconfig libusb];
preBuild = "bunzip2 < ${usbids} > usb.ids"; preBuild = "bunzip2 < ${usbids} > usb.ids";
meta = {
homepage = http://www.linux-usb.org/;
description = "Tools for working with USB devices, such as lsusb";
};
} }

View File

@ -5568,7 +5568,7 @@ let
}; };
usbutils = import ../os-specific/linux/usbutils { usbutils = import ../os-specific/linux/usbutils {
inherit fetchurl stdenv libusb; inherit fetchurl stdenv pkgconfig libusb;
}; };
utillinux = utillinuxng; utillinux = utillinuxng;