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

Merge pull request #721 from vcunat/p/hw-utils

Browse Source 
pci and usb utils update
This commit is contained in:
Vladimír Čunát 2013-07-23 06:48:08 -07:00
commit fb37586d77
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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/;

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

@ -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";