Merge pull request #9033 from kamilchm/qtile-pkg

qtile: init at 0.10.1

lethalman 5b3c3adc 5b10e4f3

Changed files
+85 -5
lib
pkgs
applications
window-managers
top-level
+1
lib/maintainers.nix
···
jwiegley = "John Wiegley <johnw@newartisans.com>";
jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
jzellner = "Jeff Zellner <jeffz@eml.cc>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
koral = "Koral <koral@mailoo.org>";
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
···
jwiegley = "John Wiegley <johnw@newartisans.com>";
jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
jzellner = "Jeff Zellner <jeffz@eml.cc>";
+
kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
koral = "Koral <koral@mailoo.org>";
kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
+47
pkgs/applications/window-managers/qtile/default.nix
···
···
+
{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }:
+
+
buildPythonPackage rec {
+
name = "qtile-${version}";
+
version = "0.10.1";
+
+
src = fetchFromGitHub {
+
owner = "qtile";
+
repo = "qtile";
+
rev = "v${version}";
+
sha256 = "1g02lvk2cqy6w6y6nw6dnsmy4i9k4fyawyibpkf0a7a1nfrd6a99";
+
};
+
+
patches = [ ./restart_executable.patch ];
+
+
postPatch = ''
+
substituteInPlace libqtile/manager.py --subst-var-by out $out
+
'';
+
+
buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xlibs.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
+
+
cairocffi-xcffib = python27Packages.cairocffi.override {
+
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";
+
pythonPath = [ python27Packages.xcffib ];
+
};
+
+
pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ];
+
+
LD_LIBRARY_PATH = "${pkgs.xlibs.libxcb}/lib:${pkgs.cairo}/lib";
+
+
postInstall = ''
+
wrapProgram $out/bin/qtile \
+
--prefix LD_LIBRARY_PATH : ${pkgs.xlibs.libxcb}/lib \
+
--prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \
+
--prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \
+
--prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib
+
'';
+
+
meta = with stdenv.lib; {
+
homepage = http://www.qtile.org/;
+
license = licenses.mit;
+
description = "A small, flexible, scriptable tiling window manager written in Python";
+
platforms = platforms.linux;
+
maintainers = with maintainers; [ kamilchm ];
+
};
+
}
+
+12
pkgs/applications/window-managers/qtile/restart_executable.patch
···
···
+
diff -ruP a/libqtile/manager.py b/libqtile/manager.py
+
--- a/libqtile/manager.py 2015-07-26 21:26:16.947976520 +0200
+
+++ b/libqtile/manager.py 2015-07-26 21:37:45.581316712 +0200
+
@@ -1262,7 +1262,7 @@
+
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("@out@/bin/qtile", argv[1:])
+
+
def cmd_spawn(self, cmd):
+
"""
+2
pkgs/top-level/all-packages.nix
···
qpdfview = callPackage ../applications/misc/qpdfview {};
qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix {
inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext
composableDerivation lib config python perl tcl ruby qt4;
···
qpdfview = callPackage ../applications/misc/qpdfview {};
+
qtile = callPackage ../applications/window-managers/qtile { };
+
qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix {
inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext
composableDerivation lib config python perl tcl ruby qt4;
+23 -5
pkgs/top-level/python-packages.nix
···
cairocffi = buildPythonPackage rec {
-
name = "cairocffi-0.5.4";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz";
-
md5 = "e3fa4002583bfaa88b156e1af9c75bde";
};
propagatedBuildInputs = with self; [ cffi ];
···
};
cffi = buildPythonPackage rec {
-
name = "cffi-0.8.6";
src = pkgs.fetchurl {
-
url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
-
sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5";
};
propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
···
};
};
}; in pythonPackages
···
cairocffi = buildPythonPackage rec {
+
name = "cairocffi-0.7.1";
src = pkgs.fetchurl {
url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz";
+
md5 = "e26d06a8d8b16c7210414ce15d453636";
};
propagatedBuildInputs = with self; [ cffi ];
···
};
cffi = buildPythonPackage rec {
+
name = "cffi-1.1.2";
src = pkgs.fetchurl {
+
url = "https://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
+
md5 = "ca6e6c45b45caa87aee9adc7c796eaea";
};
propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
···
};
};
+
xcffib = buildPythonPackage rec {
+
version = "0.3.2";
+
name = "xcffib-${version}";
+
+
src = pkgs.fetchurl {
+
url = "https://pypi.python.org/packages/source/x/xcffib/${name}.tar.gz";
+
md5 = "fa13f3fee67c83016a1242982a7c8bda";
+
};
+
+
propagatedBuildInputs = [ self.cffi self.six ];
+
+
meta = {
+
description = "A drop in replacement for xpyb, an XCB python binding";
+
homepage = "https://github.com/tych0/xcffib";
+
license = licenses.asl20;
+
maintainers = with maintainers; [ kamilchm ];
+
};
+
};
}; in pythonPackages