summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2017-10-22 18:16:17 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2017-10-22 18:16:17 +0300
commitac2acca7d9f6c79960578c0921a93eda77193659 (patch)
tree56f8214344d01524badb29d5cc77ecd024dac5f0 /pkgs/tools
parent909fd5ecfae44960ea5439e436b99042d966c726 (diff)
parent7b4db5da18b6ed3e00b0433ddb46f724b63dfa63 (diff)
downloadnixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.tar
nixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.tar.gz
nixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.tar.bz2
nixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.tar.lz
nixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.tar.xz
nixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.tar.zst
nixpkgs-ac2acca7d9f6c79960578c0921a93eda77193659.zip
Merge remote-tracking branch 'upstream/staging' into master
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/filesystems/e2fsprogs/default.nix4
-rw-r--r--pkgs/tools/misc/less/default.nix4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 7c3ab92fa88..22dc9e74723 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.43.4";
+  name = "e2fsprogs-1.43.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d";
+    sha256 = "1i51w5l45zhz3i98k92xbbvkqklvjrvw3zvqky3gk9cdmqp5y0w7";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index b3370a3cab1..49796c5f229 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, lessSecure ? false }:
 
 stdenv.mkDerivation rec {
-  name = "less-487";
+  name = "less-520";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "01i7n6jaxwmww3pasy3hg38zc6x7jw0w05mqqvh6caqbrdaq9p7k";
+    sha256 = "12wh0j07971j53v7irfcv0vkb7wpi7f83jll4mwjy92wc27fm2bv";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.