Merge branch 'master' into staging

pkgs/os-specific/linux/firejail/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   '';
 
   preBuild = ''
-    sed -e "s@/etc/@$out/etc/@g" -i Makefile
+    sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile
   '';
 
   meta = {

pkgs/os-specific/linux/kbdlight/default.nix

@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     substituteInPlace Makefile \
-      --replace /usr/local $out
+      --replace /usr/local $out \
+      --replace 4755 0755
   '';
 
   meta = with stdenv.lib; {

pkgs/os-specific/linux/kmod-debian-aliases/default.nix

@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "22-1.1";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
+    url = "http://snapshot.debian.org/archive/debian/20160404T220610Z/pool/main/k/kmod/kmod_${version}.debian.tar.xz";
     sha256 = "0daap2n4bvjqcnksaayy6csmdb1px4r02w3xp36bcp6w3lbnqamh";
   };