From 3d1a59a0b5a1b04747f5f57b9df34c465bd5a6d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Jul 2018 08:39:39 -0700 Subject: [PATCH 1/2] pciutils: 3.6.0 -> 3.6.1 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions. --- pkgs/tools/system/pciutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 0ee17ffcc38..1762b98984f 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, kmod, which }: stdenv.mkDerivation rec { - name = "pciutils-3.6.0"; # with database from 2018-06-29 + name = "pciutils-3.6.1"; # with database from 2018-06-29 src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "17g9rvjknj2yqwxldnz8m5kaabbdvkcjnfic4sbx88kh0s81197j"; + sha256 = "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w"; }; nativeBuildInputs = [ pkgconfig ]; From 0262431889319d92ffd926cee79e00b00d85219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Jul 2018 20:46:42 +0200 Subject: [PATCH 2/2] Revert "pciutils: use standardized equivalent for canonicalize_file_name" This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7. Patching should no longer be needed with 3.6.1. --- pkgs/tools/system/pciutils/default.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index db4376affba..1762b98984f 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -22,16 +22,6 @@ stdenv.mkDerivation rec { installTargets = "install install-lib"; - # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path). - # This is documented to be equivalent, see `man 3 canonicalize_file_name`. - # Fixes w/musl. - # Upstream PR: https://github.com/pciutils/pciutils/pull/6 - postPatch = '' - substituteInPlace lib/sysfs.c \ - --replace "canonicalize_file_name(path)" \ - "realpath(path, NULL)" - ''; - # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";