public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13007 from kamilchm/qtile 

qtile: 0.10.2 -> 0.10.4
This commit is contained in:
zimbatm 2016-02-15 16:50:54 +00:00
parent 15500eae75 314e4edf59
commit 22bcfc6e91
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
View File

@ -48,13 +48,14 @@ index 84f6a2d..da31b12 100755
import logging import logging
import os import os
diff --git a/libqtile/utils.py b/libqtile/utils.py diff --git a/libqtile/utils.py b/libqtile/utils.py
index d5f975b..0fdb080 100644 index 284089b..ec3539e 100644
--- a/libqtile/utils.py --- a/libqtile/utils.py
+++ b/libqtile/utils.py +++ b/libqtile/utils.py
@@ -208,3 +208,10 @@ def get_cache_dir(): @@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None):
if not os.path.exists(cache_directory): pairs.append('%s=%s' % (attr, value))
os.makedirs(cache_directory)
return cache_directory return ', '.join(pairs)
+
+ +
+def restore_os_environment(): +def restore_os_environment():
+ pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "") + pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "")
@ -62,6 +63,3 @@ index d5f975b..0fdb080 100644
+ path = os.environ.pop("QTILE_SAVED_PATH", None) + path = os.environ.pop("QTILE_SAVED_PATH", None)
+ if path: + if path:
+ os.environ["PATH"] = path + os.environ["PATH"] = path
--
2.6.3

4
pkgs/applications/window-managers/qtile/default.nix
View File

@ -7,13 +7,13 @@ in
buildPythonPackage rec { buildPythonPackage rec {
name = "qtile-${version}"; name = "qtile-${version}";
version = "0.10.3"; version = "0.10.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "qtile"; owner = "qtile";
repo = "qtile"; repo = "qtile";
rev = "v${version}"; rev = "v${version}";
sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6"; sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i";
}; };
patches = [ patches = [