diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-31 00:16:31 +0100 |
commit | 5cc0468a206c93ff246605a18eff562619d5a3b7 (patch) | |
tree | b845e8566f5f895d9b4fe451bb40e5a816670de7 /pkgs/tools | |
parent | 035bbb336aecc791ba3917f39653e7b6fa00036b (diff) | |
parent | 1a3a0e818144629b6b3dd8fbe174dc867aabdbf1 (diff) | |
download | nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.gz nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.bz2 nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.lz nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.xz nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.tar.zst nixlib-5cc0468a206c93ff246605a18eff562619d5a3b7.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/system/pciutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/gnused/default.nix | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index f38d4cd1a1d6..06ddd0e85896 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -57,9 +57,6 @@ in py.pkgs.buildPythonApplication rec { pyyaml groff less - urllib3 - dateutil - jmespath ]; postInstall = '' diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 519a33c60d69..1294c6758f48 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -52,6 +52,10 @@ stdenv.mkDerivation (rec { sed '2i print "Skipping env -S test"; exit 77;' -i ./tests/misc/env-S.pl + # Fails on systems with a rootfs. Looks like a bug in the test, see + # https://lists.gnu.org/archive/html/bug-coreutils/2019-12/msg00000.html + sed '2i print "Skipping df skip-rootfs test"; exit 77' -i ./tests/df/skip-rootfs.sh + # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do sed '2i echo Skipping chgrp && exit 77' -i "$f" diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index b773529a0d77..51cfaf9f333c 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.2"; # with release-date database + name = "pciutils-3.6.4"; # with release-date database src = fetchurl { url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; - sha256 = "1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv"; + sha256 = "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 3d73bfba6576..953be5e07d66 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnused"; - version = "4.7"; + version = "4.8"; src = fetchurl { url = "mirror://gnu/sed/sed-${version}.tar.xz"; - sha256 = "0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198"; + sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp"; }; outputs = [ "out" "info" ]; |