Merge commit 'd26027792812fbfad4d0f451b5f47fdabf7fdeb9'

2 files changed, 21 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
index e0118b8b27b4..e4cb70c8f24d 100644
--- a/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
+++ b/nixpkgs/pkgs/tools/X11/wmctrl/default.nix
@@ -1,23 +1,33 @@
-{stdenv, fetchurl, libX11, glib, pkgconfig, libXmu }:
+{ stdenv
+, fetchurl
+, libX11
+, glib
+, pkgconfig
+, libXmu
+}:
 
 stdenv.mkDerivation rec {
-  
-  name = "wmctrl-1.07";
- 
+
+  pname = "wmctrl";
+  version = "1.07";
+
   src = fetchurl {
-    url = "http://tomas.styblo.name/wmctrl/dist/${name}.tar.gz";
+    # NOTE: 2019-04-11: There is also a semi-official mirror: http://tripie.sweb.cz/utils/wmctrl/
+    url = "https://sites.google.com/site/tstyblo/wmctrl/${pname}-${version}.tar.gz";
     sha256 = "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np";
   };
- 
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libX11 libXmu glib ];
 
   patches = [ ./64-bit-data.patch ];
 
   meta = {
-    homepage = http://tomas.styblo.name/wmctrl/;
-    description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager";
+    homepage = https://sites.google.com/site/tstyblo/wmctrl;
+    description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers";
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; all;
+    maintainers = [ stdenv.lib.maintainers.Anton-Latukha ];
   };
+
 }
diff --git a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
index 4dfc06aa4366..e9cd04ecd1c3 100644
--- a/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
+++ b/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
@@ -3,7 +3,7 @@
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";
-  version = "0.6.2";
+  version = "0.7.0";
 
   doCheck = false;
 
@@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec {
     repo = "xidlehook";
     rev = version;
 
-    sha256 = "1ca29rw1w2ldahp9f1v9kfrjycbjwx3mab3m25lr82084kaa6lsh";
+    sha256 = "0dl4rnh4l3rhga5pfxmkc9syn6vx05zxdf8xcv0gw9h60y1smp6v";
   };
 
   cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
-  cargoSha256 = "1sy7q875gg6as98lp6m15x9b3lhdikm9326lmqcs5fv3hhzvdlvy";
+  cargoSha256 = "148p7r9xmc0nc0d4qyxhh29xqcb5axwqwcxcrkgd41f32c3g44dc";
 
   buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkgconfig patchelf ];