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.

7 files changed, 79 insertions, 6 deletions

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 6495b2de7f37..474486b6d6ce 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "ckbcomp-${version}";
-  version = "1.131";
+  version = "1.133";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/d-i/console-setup.git";
     rev = "refs/tags/${version}";
-    sha256 = "0xmdnzhm1wsdpjb0wsi24xzk1xpv5h2bxgwm9f4awb7aj7wv59ma";
+    sha256 = "0za7y5v5rsl9da67rfiwzyfaia4xgnavqdadq0l6v8blc2kcsxr7";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix
new file mode 100644
index 000000000000..d147ef4a70c1
--- /dev/null
+++ b/pkgs/tools/X11/dex/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, python3 }:
+
+stdenv.mkDerivation rec {
+  program = "dex";
+  name = "${program}-${version}";
+  version = "0.7";
+
+  src = fetchFromGitHub {
+    owner = "jceb";
+    repo = program;
+    rev = "v${version}";
+    sha256 = "041ms01snalapapaniabr92d8iim1qrxian626nharjmp2rd69v5";
+  };
+
+  propagatedBuildInputs = [ python3 ];
+  makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" ];
+
+  meta = {
+    description = "A program to generate and execute DesktopEntry files of the Application type";
+    homepage = https://github.com/jceb/dex;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix
new file mode 100644
index 000000000000..0aa1c8a8b5a9
--- /dev/null
+++ b/pkgs/tools/X11/dragon-drop/default.nix
@@ -0,0 +1,28 @@
+
+{ stdenv, gtk, pkgconfig, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "dragon-drop-${version}";
+  version = "git-2014-08-14";
+
+  src = fetchFromGitHub {
+    owner = "mwh";
+    repo = "dragon";
+    rev = "a49d775dd9d43bd22cee4c1fd3e32ede0dc2e9c2";
+    sha256 = "03vdbmqlbmk3j2ay1wy6snrm2y27faxz7qv81vyzjzngj345095a";
+  };
+
+  buildInputs = [ gtk pkgconfig ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv dragon $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple drag-and-drop source/sink for X";
+    homepage = "https://github.com/mwh/dragon";
+    maintainers = with maintainers; [ jb55 ];
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/tools/X11/numlockx/default.nix b/pkgs/tools/X11/numlockx/default.nix
new file mode 100644
index 000000000000..2c4807e4661f
--- /dev/null
+++ b/pkgs/tools/X11/numlockx/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, libX11, libXext, autoconf }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "1.2";
+  pname = "numlockx";
+
+  src = fetchFromGitHub {
+    owner = "rg3";
+    repo = pname;
+    rev = "9159fd3c5717c595dadfcb33b380a85c88406185";
+    sha256 = "1w49fayhwzn5rx0z1q2lrvm7z8jrd34lgb89p853a024bixc3cf2";
+  };
+
+  buildInputs = [ libX11 libXext autoconf ];
+
+  meta = with stdenv.lib; {
+    description = "Allows to start X with NumLock turned on";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix
index adc04b629444..b377369f464c 100644
--- a/pkgs/tools/X11/x2vnc/default.nix
+++ b/pkgs/tools/X11/x2vnc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   preInstall = "mkdir -p $out";
 
   meta = {
-    homepahe = http://fredrik.hubbe.net/x2vnc.html;
+    homepage = http://fredrik.hubbe.net/x2vnc.html;
     description = "A program to control a remote VNC server";
   };
 }
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index a8915e38d375..23b406c2d43f 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     description = "A set of command line tools that assist applications with a variety of desktop integration tasks";
     license = if mimiSupport then licenses.gpl2 else licenses.free;
     maintainers = [ maintainers.eelco ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix
index 7e570cbd396d..035b4fd6ee73 100644
--- a/pkgs/tools/X11/xvkbd/default.nix
+++ b/pkgs/tools/X11/xvkbd/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "xvkbd-${version}";
-  version = "3.6";
+  version = "3.7";
   src = fetchurl {
     url = "http://homepage3.nifty.com/tsato/xvkbd/xvkbd-${version}.tar.gz";
-    sha256 = "1bjvv93xmmjjk6ir95shwrk6aaiqiprwk12npyahfsik4cf58y16";
+    sha256 = "02y9ks9sa4sn3vkbgswjs5qcd85xhwvarnmhg41pq3l2d617cpw9";
   };
 
   buildInputs = [ imake libXt libXaw libXtst xextproto libXi Xaw3d libXpm gccmakedep ];