diff options
author | Kamil Chmielewski <kamil.chm@gmail.com> | 2018-05-24 17:23:47 +0200 |
---|---|---|
committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2018-05-24 17:25:14 +0200 |
commit | bd3489e04ab67104c5f9b13d4b2aa64bcdff520d (patch) | |
tree | 7183944490960153904050833661c28d8cbfc7ad /pkgs/applications/window-managers/qtile | |
parent | 5da85431fb1df4fb3ac36730b2591ccc9bdf5c21 (diff) |
qtile: 0.10.7 -> 0.11.1
Diffstat (limited to 'pkgs/applications/window-managers/qtile')
4 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch index 71d3d9cafaa3..219d6dcbe207 100644 --- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch +++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch @@ -23,8 +23,8 @@ index f1133555..3e61204a 100644 def _setup_xcursor_binding(self): try: -- xcursor = ffi.dlopen('libxcb-cursor.so') -+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so') +- xcursor = ffi.dlopen('libxcb-cursor.so.0') ++ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so.0') except OSError: logger.warning("xcb-cursor not found, fallback to font pointer") return False 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 7d184838fbaa..a01f14062f1d 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 @@ -43,13 +43,13 @@ index 5316e0e7..272c6430 100755 from libqtile.scripts import qtile_top qtile_top.main() diff --git a/libqtile/utils.py b/libqtile/utils.py -index 36ed0a58..bca9eab3 100644 +index 550ed02677e..1358a66f3df 100644 --- a/libqtile/utils.py +++ b/libqtile/utils.py -@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None): - pairs.append('%s=%s' % (attr, value)) - - return ', '.join(pairs) +@@ -272,3 +272,11 @@ def safe_import(module_names, class_name, globals_, fallback=None): + logger.debug("%s", traceback.format_exc()) + if fallback: + globals_[class_name] = fallback(module_path, class_name, error) + + +def restore_os_environment(): diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch index c9ae57c8615c..87fd19773794 100644 --- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch +++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch @@ -1,13 +1,13 @@ diff --git a/libqtile/manager.py b/libqtile/manager.py -index 36518a74..9b6bdd02 100644 +index fc198e9bae7..860b97d8db1 100644 --- a/libqtile/manager.py +++ b/libqtile/manager.py -@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject): +@@ -1402,7 +1402,7 @@ class Qtile(command.CommandObject): + logger.error("Unable to pickle qtile state") argv = [s for s in argv if not s.startswith('--with-state')] argv.append('--with-state=' + buf.getvalue().decode()) - -- self.cmd_execute(sys.executable, argv) -+ self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) +- self._restart = (sys.executable, argv) ++ self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:]) + self.stop() def cmd_spawn(self, cmd): - """Run cmd in a shell. diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index f889bf29f71a..ba304ad0c817 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in python27Packages.buildPythonApplication rec { name = "qtile-${version}"; - version = "0.10.7"; + version = "0.11.1"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8"; + sha256 = "1jw6mh9m5yrijhm218lc51sc89lc2ihvyx30jhrkxy2mzllhjgrs"; }; patches = [ |