diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-10-26 22:54:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-26 22:54:04 +0200 |
| commit | df9290f2fbdca2861b97579704a50ad9b9197ac3 (patch) | |
| tree | 7dc6f40130846a90e836e07a83620836f50b5117 /pkgs/os-specific/linux | |
| parent | 7c8188df460c35177a096c97417d2f998d11f0b4 (diff) | |
| parent | 6b5571b9e878052a488fda76629e3d825ac6c207 (diff) | |
| download | nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.tar nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.tar.gz nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.tar.bz2 nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.tar.lz nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.tar.xz nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.tar.zst nixlib-df9290f2fbdca2861b97579704a50ad9b9197ac3.zip | |
Merge pull request #49183 from jtojnar/gusb
gusb: 0.2.11 → 0.3.0
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/hwdata/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/usbutils/default.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 5943ced2f8f9..dfca87e27165 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "hwdata-${version}"; - version = "0.314"; + version = "0.316"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - sha256 = "12k466ndg152fqld1w5v1zfdyv000yypazcwy75ywlxvlknv4y90"; + sha256 = "0k3fypykbq9943cnxlmmpk0xp9nhhf46pfdhkgm99iaa27b8s1gb"; }; preConfigure = "patchShebangs ./configure"; - configureFlags = [ "--datadir=$(prefix)/data" ]; + configureFlags = [ "--datadir=${placeholder "out"}/share" ]; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1w00y5kj8rd8slzydw1gw8cablxlkham4vq786kdd8zga286zabb"; + outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; meta = { homepage = https://github.com/vcrhonek/hwdata; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 657d6cc24a8d..8d53756d5101 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids + --replace /usr/share/usb.ids ${hwdata}/share/hwdata/usb.ids ''; meta = with stdenv.lib; { |