Merge branch 'master' into staging

Hydra: ?compare=1430035

pkgs/tools/system/augeas/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "augeas-${version}";
-  version = "1.8.1";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://download.augeas.net/${name}.tar.gz";
-    sha256 = "1yf93fqwav1zsl8dpyfkf0g11w05mmfckqy6qsjy5zkklnspbkv5";
+    sha256 = "04q2hr3xj71rdbjdj3jiygi8dbiq1x4szlyavxj1xjiw9jcgd41a";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ readline libxml2 ];

pkgs/tools/system/sleuthkit/default.nix

@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, libewf, afflib, openssl, zlib }:
+{ stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "4.2.0";
+  version = "4.5.0";
   name = "sleuthkit-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/sleuthkit/${name}.tar.gz";
-    sha256 = "08s7c1jwn2rjq2jm8859ywaiq12adrl02m61hc04iblqjzqqgcli";
+  src = fetchFromGitHub {
+    owner = "sleuthkit";
+    repo = "sleuthkit";
+    rev = name;
+    sha256 = "0h9l9yl5ibbgriq12gizg8k0r6jw6bnii3iljjp4p963wc0ms9b9";
   };
 
+  postPatch = ''
+    substituteInPlace tsk/img/ewf.c --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset
+  '';
+
   enableParallelBuilding = true;
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libewf afflib openssl zlib ];
 
   # Hack to fix the RPATH.
@@ -18,6 +25,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A forensic/data recovery tool";
+    homepage = https://www.sleuthkit.org/;
     maintainers = [ stdenv.lib.maintainers.raskin ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.ipl10;

pkgs/tools/system/sleuthkit/default.upstream

@@ -1,5 +0,0 @@
-url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/
-SF_version_dir
-SF_version_tarball
-SF_redirect
-minimize_overwrite