JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Latest pciutils and usbutils, along with the latest PCI and USB IDs.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=22687
This commit is contained in:
Eelco Dolstra 2010-07-21 12:01:57 +00:00
parent df7091a4a1
commit 2f6c7cd3dd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/usbutils/default.nix
View File

@ -1,24 +1,24 @@
{stdenv, fetchurl, pkgconfig, libusb}: { stdenv, fetchurl, pkgconfig, libusb }:
let let
# Obtained from http://www.linux-usb.org/usb.ids.bz2. # Obtained from http://www.linux-usb.org/usb.ids.bz2.
usbids = fetchurl { usbids = fetchurl {
url = http://nixos.org/tarballs/usb.ids.20090808.bz2; url = http://nixos.org/tarballs/usb.ids.20100720.bz2;
sha256 = "1007p5cm3k6vdsfrkwy92yvscazycz71k8wx32jygr50qsv1advj"; sha256 = "0krncssk0b10z6grw305824zma953l3g2rb7jkk25mb78pw5fd5d";
}; };
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "usbutils-0.84"; name = "usbutils-0.86";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/linux-usb/${name}.tar.gz"; url = "mirror://sourceforge/linux-usb/${name}.tar.gz";
sha256 = "1aksgfsnxq43q3aas4cwhmy34ik3h2sg4iv2al9vz2v9aqnib83n"; sha256 = "1x0jkiwrgdb8qwy21iwhxpc8k61apxqp1901h866d1ydsakbxcmk";
}; };
buildInputs = [pkgconfig libusb]; buildInputs = [ pkgconfig libusb ];
preBuild = "bunzip2 < ${usbids} > usb.ids"; preBuild = "bunzip2 < ${usbids} > usb.ids";

16
pkgs/tools/system/pciutils/default.nix
View File

@ -1,19 +1,19 @@
{stdenv, fetchurl, zlib}: { stdenv, fetchurl, zlib }:
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "pciutils-3.1.2"; name = "pciutils-3.1.7";
src = fetchurl { src = fetchurl {
url = mirror://kernel/software/utils/pciutils/pciutils-3.1.2.tar.bz2; url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
sha256 = "15wksvqcgdj0hvsp5irc1igiqid69rrzpc33qj9nlyssvyw40vpn"; sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq";
}; };
buildInputs = [zlib]; buildInputs = [ zlib ];
pciids = fetchurl { pciids = fetchurl {
# Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
url = http://nixos.org/tarballs/pci.ids.20090727.bz2; url = http://nixos.org/tarballs/pci.ids.20100714.bz2;
sha256 = "0q7fs5ww92a6v5dc514ff4vy7v9hzpdqbd1agbafc2wk2zgi10mk"; sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap";
}; };
# Override broken auto-detect logic. # Override broken auto-detect logic.