3 files changed, 63 insertions, 21 deletions
diff --git a/pkgs/tools/X11/run-scaled/default.nix b/pkgs/tools/X11/run-scaled/default.nix
index 012eedf0779..d62b38bdf28 100644
--- a/pkgs/tools/X11/run-scaled/default.nix
+++ b/pkgs/tools/X11/run-scaled/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, makeWrapper, bc, xorgserver, xpra, xrandr }:
 
 stdenv.mkDerivation {
-  version = "git-2018-06-03";
+  version = "unstable-2018-06-03";
   pname = "run-scaled";
 
   src = fetchFromGitHub {
-    owner  = "kaueraal";
-    repo   = "run_scaled";
-    rev    = "fa71b3c17e627a96ff707ad69f1def5361f2245c";
+    owner = "kaueraal";
+    repo = "run_scaled";
+    rev = "fa71b3c17e627a96ff707ad69f1def5361f2245c";
     sha256 = "1ma4ax7ydq4xvyzrc4zapihmf7v3d9zl9mbi8bgpps7nlgz544ys";
   };
 
diff --git a/pkgs/tools/X11/skippy-xd/default.nix b/pkgs/tools/X11/skippy-xd/default.nix
index 0519f2c4204..255d4c34e58 100644
--- a/pkgs/tools/X11/skippy-xd/default.nix
+++ b/pkgs/tools/X11/skippy-xd/default.nix
@@ -1,14 +1,33 @@
-{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
-, libXext, libXinerama, libjpeg, giflib, pkg-config
+{ lib
+, stdenv
+, fetchgit
+, xorgproto
+, libX11
+, libXft
+, libXcomposite
+, libXdamage
+, libXext
+, libXinerama
+, libjpeg
+, giflib
+, pkg-config
 }:
 let
   buildInputs = [
-    xorgproto libX11 libXft libXcomposite libXdamage libXext
-    libXinerama libjpeg giflib pkg-config
+    xorgproto
+    libX11
+    libXft
+    libXcomposite
+    libXdamage
+    libXext
+    libXinerama
+    libjpeg
+    giflib
+    pkg-config
   ];
 in
 stdenv.mkDerivation rec {
-  version = "git-2015-03-01";
+  version = "unstable-2015-03-01";
   pname = "skippy-xd";
   inherit buildInputs;
   src = fetchgit {
@@ -16,14 +35,14 @@ stdenv.mkDerivation rec {
     rev = "397216ca67";
     sha256 = "0zcjacilmsv69rv85j6nfr6pxy8z36w1sjz0dbjg6s5m4kga1zl8";
   };
-  makeFlags = ["PREFIX=$(out)"];
+  makeFlags = [ "PREFIX=$(out)" ];
   preInstall = ''
     sed -e "s@/etc/xdg@$out&@" -i Makefile
   '';
   meta = {
     description = "Expose-style compositing-based standalone window switcher";
-    license = lib.licenses.gpl2Plus ;
-    maintainers = [lib.maintainers.raskin];
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix
index 61e48de7f5e..fdb3b7c58a5 100644
--- a/pkgs/tools/X11/xprintidle-ng/default.nix
+++ b/pkgs/tools/X11/xprintidle-ng/default.nix
@@ -1,11 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
-  , autoconf, automake, libtool, gettext, pkg-config
-  , git, perl, texinfo, help2man
+{ lib
+, stdenv
+, fetchFromGitHub
+, libX11
+, libXScrnSaver
+, libXext
+, gnulib
+, autoconf
+, automake
+, libtool
+, gettext
+, pkg-config
+, git
+, perl
+, texinfo
+, help2man
 }:
 
 stdenv.mkDerivation rec {
   pname = "xprintidle-ng";
-  version = "git-2015-09-01";
+  version = "unstable-2015-09-01";
 
   src = fetchFromGitHub {
     owner = "taktoa";
@@ -20,8 +33,16 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    autoconf automake gettext git gnulib
-    help2man libtool perl pkg-config texinfo
+    autoconf
+    automake
+    gettext
+    git
+    gnulib
+    help2man
+    libtool
+    perl
+    pkg-config
+    texinfo
   ];
 
   configurePhase = ''
@@ -30,15 +51,17 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    libX11 libXScrnSaver libXext
+    libX11
+    libXScrnSaver
+    libXext
   ];
 
   meta = {
-    inherit  version;
+    inherit version;
     description = "A command-line tool to print idle time from libXss";
     homepage = "http://taktoa.me/xprintidle-ng/";
     license = lib.licenses.gpl2;
-    maintainers = [lib.maintainers.raskin];
+    maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
   };
 }