Merge remote-tracking branch 'upstream/master' into hardened-stdenv

11 files changed, 115 insertions, 14 deletions

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 87161a6442a4..dbca73359440 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://anonscm.debian.org/d-i/console-setup.git";
     rev = "refs/tags/${version}";
-    sha256 = "0za7y5v5rsl9da67rfiwzyfaia4xgnavqdadq0l6v8blc2kcsxr7";
+    sha256 = "1whli40ik5izyfs0m8d08gq8zcsdjscnxbsvxyxvdnkrvzw4izdz";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix
new file mode 100644
index 000000000000..197a7b80af36
--- /dev/null
+++ b/pkgs/tools/X11/go-sct/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "go-sct-${version}";
+  version = "20160529-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "1d6b5e05a0b63bfeac9df55003efec352e1bc19d";
+
+  goPackagePath = "github.com/d4l3k/go-sct";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/d4l3k/go-sct";
+    sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7";
+  };
+
+  goDeps = ./deps.json;
+
+  buildInputs = [ xorg.libX11 xorg.libXrandr ];
+
+  meta = with stdenv.lib; {
+    description = "Color temperature setting library and CLI that operates in a similar way to f.lux and Redshift";
+    license = licenses.mit;
+    maintainers = with maintainers; [ cstrahan ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/X11/go-sct/deps.json b/pkgs/tools/X11/go-sct/deps.json
new file mode 100644
index 000000000000..7a7ce4989d35
--- /dev/null
+++ b/pkgs/tools/X11/go-sct/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/cpucycle/astrotime"
+    ]
+  }
+]
diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix
index 233296e58ac4..a753f9bd170e 100644
--- a/pkgs/tools/X11/ksuperkey/default.nix
+++ b/pkgs/tools/X11/ksuperkey/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/hanschen/ksuperkey";
     rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639";
-    sha256 = "00be6b93daf78bae0223f002e782e30a650dded3c5a83b1adfe9439e20e398fb";
+    sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix
new file mode 100644
index 000000000000..a4b3f05c94c1
--- /dev/null
+++ b/pkgs/tools/X11/runningx/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "runningx-${version}";
+  version = "1.0";
+  
+  src = fetchurl {
+    url = "http://www.fiction.net/blong/programs/mutt/autoview/RunningX.c";
+    sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libX11 ];
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    gcc -O2 -o RunningX $(pkg-config --cflags --libs x11) $src
+  '';
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    cp -vai RunningX "$out/bin"
+  '';
+
+  meta = {
+    homepage = http://www.fiction.net/blong/programs/mutt/;
+    description = "A program for testing if X is running";
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+  };
+}
diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 87487442ada9..02a35b73c1e1 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk3 }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
 
-stdenv.mkDerivation {
-  name = "screen-message-0.23";
+stdenv.mkDerivation rec {
+  name = "screen-message-${version}";
+  version = "0.24";
 
-  srcs = fetchgit {
-    url = "git://git.nomeata.de/darcs-mirror-screen-message.debian.git";
-    rev = "refs/tags/0_23-1";
-    sha256 = "fddddd28703676b2908af71cca7225e6c7bdb15b2fdfd67679cac129028a431c";
+  src = fetchurl {
+    url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz";
+    sha256 = "1v03axr7471fmzxccl3ckv73j8gfcj615y5maxvm5phy0sd6rl49";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig gtk3 ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gtk3 ];
 
   # screen-message installs its binary in $(prefix)/games per default
   makeFlags = [ "execgamesdir=$(out)/bin" ];
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix
index b3e9ad759f19..71a4f012a01d 100644
--- a/pkgs/tools/X11/skippy-xd/default.nix
+++ b/pkgs/tools/X11/skippy-xd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/richardgv/skippy-xd/";
     rev = "397216ca67";
-    sha256 = "19lvy5888j7rl52dsxv1wwxxijdlk8d7qn1zzzy0b8wvqknhxypm";
+    sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8";
   };
   makeFlags = ["PREFIX=$(out)"];
   preInstall = ''
diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix
index 35d353d9861b..5436edd0ea37 100644
--- a/pkgs/tools/X11/xcape/default.nix
+++ b/pkgs/tools/X11/xcape/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = https://github.com/alols/xcape;
     rev = "f3802fc086ce9d961d644a5d29ad5b650db56215";
-    sha256 = "05mm4ap69ncwl4hhzf2dvbazqxjf27477cd3chpfc7qi7srqasvz";
+    sha256 = "0d79riwzmjr621ss3yhxqn2q8chn3f9rvk2nnjckz5yxbifvfg9s";
   };
   preConfigure = ''
     makeFlags="$makeFlags PREFIX=$out"
diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix
new file mode 100644
index 000000000000..76493dfb73ea
--- /dev/null
+++ b/pkgs/tools/X11/xgeometry-select/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, libX11 }:
+
+stdenv.mkDerivation rec {
+  name     = "${baseName}-${version}";
+  baseName = "xgeometry-select";
+  version  = "0.1";
+
+  src = fetchurl {
+    url    = "https://gist.githubusercontent.com/obadz/7e008b1f803c4cdcfaf7321c78bcbe92/raw/7e7361e71ff0f74655ee92bd6d2c042f8586f2ae/xgeometry-select.c";
+    sha256 = "0s7kirgh5iz91m3qy8xiq0j4gljy8zrcnylf4szl5h0lrsaqj7ya";
+  };
+
+  phases = [ "buildPhase" "installPhase" ];
+
+  buildInputs = [ libX11 ];
+
+  buildPhase = ''
+    gcc -Wall -lX11 ${src} -o ${baseName}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv -v ${baseName} $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Select a region with mouse and prints geometry information (x/y/w/h)";
+    homepage    = https://bbs.archlinux.org/viewtopic.php?pid=660837;
+    maintainers = with maintainers; [ obadz ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix
index c3c9c70fe927..35342035c9d5 100644
--- a/pkgs/tools/X11/xtrace/default.nix
+++ b/pkgs/tools/X11/xtrace/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "git://git.debian.org/xtrace/xtrace.git";
     rev = "refs/tags/xtrace-1.3.1";
-    sha256 = "0csjw88ynzzcmx1jlb65c74r2sp9dzxn00airsxxfsipb74049d0";
+    sha256 = "1g26hr6rl7bbb9cwqk606nbbapslq3wnsy8j28azrgi8hgfqhjfi";
   };
 
   buildInputs = [ libX11 makeWrapper autoreconfHook ];
diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix
index 95f351297548..40956f2acc4d 100644
--- a/pkgs/tools/X11/xwinmosaic/default.nix
+++ b/pkgs/tools/X11/xwinmosaic/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://github.com/soulthreads/xwinmosaic/";
     rev = "refs/tags/v0.4.2";
-    sha256 = "0ddriqx4idyp55v8js5xazmhl09jwkmnv5nlfzhs2cpvshcj56ri";
+    sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr";
   };
   meta = {
     inherit version;