Merge branch 'master' into closure-size

pkgs/tools/system/ansible/default.nix

@@ -1,33 +0,0 @@
-{ windowsSupport ? true, stdenv, fetchurl, pythonPackages, python }:
-
-pythonPackages.buildPythonPackage rec {
-  version = "1.9.4";
-  name = "ansible-${version}";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "https://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "1qvgzb66nlyc2ncmgmqhzdk0x0p2px09967p1yypf5czwjn2yb4p";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = true;
-
-  pythonPath = with pythonPackages; [
-    paramiko jinja2 pyyaml httplib2 boto six
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = "http://www.ansible.com";
-    description = "A simple automation tool";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.joamaki ];
-    platforms = platforms.linux ++ [ "x86_64-darwin" ];
-  };
-}

pkgs/tools/system/sleuthkit/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, libewf, afflib, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.3";
+  version = "4.2.0";
   name = "sleuthkit-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sleuthkit/${name}.tar.gz";
-    sha256 = "09q3ky4rpv18jasf5gc2hlivzadzl70jy4nnk23db1483aix5yb7";
+    sha256 = "08s7c1jwn2rjq2jm8859ywaiq12adrl02m61hc04iblqjzqqgcli";
   };
 
   enableParallelBuilding = true;