Merge branch 'master' into staging

That's to get mesa rebuild from master, as it's nontrivial.

pkgs/tools/security/ecryptfs/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "ecryptfs-${version}";
-  version = "110";
+  version = "111";
 
   src = fetchurl {
     url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
-    sha256 = "1x03m9s409fmzjcnsa9f9ghzkpxcnj9irj05rx7jlwm5cach0lqs";
+    sha256 = "0zwq19siiwf09h7lwa7n7mgmrr8cxifp45lmwgcfr8c1gviv6b0i";
   };
 
   # TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;

pkgs/tools/security/eid-mw/default.nix

@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.1.17";
+  version = "4.1.18";
 
   src = fetchFromGitHub {
-    sha256 = "11d4wafcbhamkqvcfqkpz1sq66jq7bxz07m777cqsnyibccns7q6";
+    sha256 = "049rxrlcwcb9yir8q2inmqlslp49alpgm4pccl138xl34cg1hyhl";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

pkgs/tools/security/john/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, openssl, nss, nspr, kerberos, gmp, zlib, libpcap, re2
-, writeText
+, writeText, gcc
 }:
 
 with stdenv.lib;
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   preConfigure = "cd src";
   configureFlags = [ "--disable-native-macro" ];
 
-  buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 ];
+  buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ];
   enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ];