diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:57:58 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-03-08 09:58:19 +0100 |
commit | 09af15654f0c8091f1b9e0bbb2e523cdee194442 (patch) | |
tree | e648edef1ce4c64c533f2593aa22b8015cf0e506 /pkgs/applications/window-managers/qtile | |
parent | f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (diff) | |
parent | 0ee75214f336474e127c2e3546c0406a0c4d5fa7 (diff) |
Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
Diffstat (limited to 'pkgs/applications/window-managers/qtile')
-rw-r--r-- | pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch | 14 | ||||
-rw-r--r-- | pkgs/applications/window-managers/qtile/default.nix | 8 |
2 files changed, 10 insertions, 12 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 8af46f52354a..4060b9887f79 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,19 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }: +{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }: let cairocffi-xcffib = python27Packages.cairocffi.override { pythonPath = [ python27Packages.xcffib ]; }; in -buildPythonPackage rec { +buildPythonApplication 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 = [ |