From 314e4edf59880c138468f5a7c271fdee9a37843f Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 15 Feb 2016 13:15:48 +0100 Subject: [PATCH] qtile: 0.10.2 -> 0.10.4 --- .../qtile/0002-Restore-PATH-and-PYTHONPATH.patch | 14 ++++++-------- .../applications/window-managers/qtile/default.nix | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch index ba408b1f05bb..b620bfb25014 100644 --- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch +++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch @@ -48,13 +48,14 @@ index 84f6a2d..da31b12 100755 import logging import os diff --git a/libqtile/utils.py b/libqtile/utils.py -index d5f975b..0fdb080 100644 +index 284089b..ec3539e 100644 --- a/libqtile/utils.py +++ b/libqtile/utils.py -@@ -208,3 +208,10 @@ def get_cache_dir(): - if not os.path.exists(cache_directory): - os.makedirs(cache_directory) - return cache_directory +@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None): + pairs.append('%s=%s' % (attr, value)) + + return ', '.join(pairs) ++ + +def restore_os_environment(): + pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") @@ -62,6 +63,3 @@ index d5f975b..0fdb080 100644 + path = os.environ.pop("QTILE_SAVED_PATH", None) + if path: + os.environ["PATH"] = path --- -2.6.3 - diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 3f38be669274..0dae8a76c77b 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in buildPythonPackage rec { name = "qtile-${version}"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6"; + sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i"; }; patches = [