diff options
| author | Sebastian Sellmeier <mail@sebastian-sellmeier.de> | 2021-05-31 20:31:25 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-01 16:40:07 +0000 |
| commit | cc8409db5c4a844b2468dcd319aaf36f65a22d6d (patch) | |
| tree | f2ddb9aef1e0cfaf383bb1a9d88eb1cac157aa6d | |
| parent | Merge pull request #125229 from NixOS/backport-125225-to-release-21.05 (diff) | |
| download | nixpkgs-origin/backport-125097-to-release-21.05.tar.gz | |
usbutils: 012 -> 013origin/backport-125097-to-release-21.05
(cherry picked from commit bafd47b37015aec26832a110dc255c4e2282ee93)
| -rw-r--r-- | pkgs/os-specific/linux/usbutils/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/usbutils/fix-paths.patch | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 9e298697d4b3..fba025b29d94 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { - name = "usbutils-012"; + name = "usbutils-013"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8"; + sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy"; }; patches = [ diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/os-specific/linux/usbutils/fix-paths.patch index d75c68505efc..ef63a41e726c 100644 --- a/pkgs/os-specific/linux/usbutils/fix-paths.patch +++ b/pkgs/os-specific/linux/usbutils/fix-paths.patch @@ -1,7 +1,7 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -51,11 +51,11 @@ - usbreset.c +@@ -61,7 +61,7 @@ EXTRA_DIST = \ + LICENSES/GPL-3.0-only.txt lsusb.py: $(srcdir)/lsusb.py.in - sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ @@ -9,8 +9,3 @@ chmod 755 $@ lsusb.8: $(srcdir)/lsusb.8.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@ - - usb-devices.1: $(srcdir)/usb-devices.1.in - sed 's|VERSION|$(VERSION)|g' $< >$@ |