Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

pkgs/applications/window-managers/clfswm/default.nix

@@ -0,0 +1,44 @@
+{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
+, extraModulePaths ? [] }:
+
+stdenv.mkDerivation rec {
+  name = "clfswm";
+
+  src = fetchgit {
+    url = "https://gitlab.common-lisp.net/clfswm/clfswm.git";
+    rev = "refs/heads/master";
+    sha256 = "1hkm6bn5xww932w34l13bg87m5hsnwnd0i1lka6sw0cq8whndya0";
+  };
+
+  buildInputs = [
+    texinfo4 makeWrapper autoconf
+    sbcl
+    lispPackages.clx
+    lispPackages.cl-ppcre
+    xdpyinfo
+  ];
+
+  patches = [ ./require-clx.patch ];
+
+  # Stripping destroys the generated SBCL image
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    make DESTDIR=$out install
+
+    # Paths in the compressed image $out/bin/clfswm are not
+    # recognized by Nix. Add explicit reference here.
+    mkdir $out/nix-support
+    echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A(nother) Common Lisp FullScreen Window Manager";
+    homepage    = https://common-lisp.net/project/clfswm/;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ robgssp ];
+    platforms   = platforms.linux;
+  };
+}

pkgs/applications/window-managers/clfswm/require-clx.patch

@@ -0,0 +1,13 @@
+diff --git a/load.lisp b/load.lisp
+index c8c4cf0..8c9ca2e 100644
+--- a/load.lisp
++++ b/load.lisp
+@@ -111,6 +111,8 @@ from $XDG_CONFIG_HOME/clfswm/clfswmrc")
+ ;;;------------------
+ (load-info "Requiring CLX")
+ 
++(require 'clx)
++
+ ;;; Loading clisp dynamic module. This part needs clisp >= 2.50
+ ;;#+(AND CLISP (not CLX))
+ ;;(when (fboundp 'require)

pkgs/applications/window-managers/dwm/default.nix

@@ -1,17 +1,17 @@
-{stdenv, fetchurl, libX11, libXinerama, patches ? []}:
+{stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}:
 
 let
-  name = "dwm-6.0";
+  name = "dwm-6.1";
 in
 stdenv.mkDerivation {
   inherit name;
  
   src = fetchurl {
     url = "http://dl.suckless.org/dwm/${name}.tar.gz";
-    sha256 = "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj";
+    sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2";
   };
  
-  buildInputs = [ libX11 libXinerama ];
+  buildInputs = [ libX11 libXinerama libXft ];
  
   prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
 

pkgs/applications/window-managers/i3/default.nix

@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.10.4";
+  version = "4.11";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "0pk580jkv7cxmsrr276q25fgdbrkzldiiz4ny61szzmqqnjsfkyx";
+    sha256 = "0bwqklb6irgjmgvj7mlyz4brr4lggfm3zqmvclvxcbyrzc31xkkq";
   };
 
   buildInputs = [

pkgs/applications/window-managers/kbdd/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "kbdd";
+
+  src = fetchgit {
+    url = https://github.com/qnikst/kbdd;
+    rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
+    sha256 = "1b9a66d216326a9759cad26393fbf8259fe7a0c2dd1075047fc989f0e52d969f";
+  };
+
+  buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ];
+
+  meta = {
+    description = "Simple daemon and library to make per window layout using XKB";
+    homepage = https://github.com/qnikst/kbdd;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.wedens ];
+  };
+}

pkgs/applications/window-managers/qtile/default.nix

@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   name = "qtile-${version}";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "1g02lvk2cqy6w6y6nw6dnsmy4i9k4fyawyibpkf0a7a1nfrd6a99";
+    sha256 = "0dhdwjr4pdlzli68fa8glrnsjzxp6agdab9cnmpsqlwiwh97x9a6";
   };
 
   patches = [ ./restart_executable.patch ];