From f4d876f73c4cc67f03d1e5529c8db4a6087ab7fe Mon Sep 17 00:00:00 2001 From: "Travis B. Hartwell" Date: Sat, 20 Jun 2015 23:30:09 -0600 Subject: [PATCH] i3-py: init at 0.6.4 Extract i3-py from i3minator so it can be installed on its own. --- pkgs/tools/misc/i3minator/default.nix | 17 ++--------------- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 02b804936549..0c3907b89bfe 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,19 +1,6 @@ { stdenv, fetchurl, buildPythonPackage, pythonPackages, python }: -let - i3-py = buildPythonPackage rec { - version = "0.6.4"; - name = "i3-py-${version}"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz"; - sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y"; - }; - - # no tests in tarball - doCheck = false; - }; -in buildPythonPackage rec { +buildPythonPackage rec { name = "i3minator-${version}"; version = "0.0.4"; @@ -22,7 +9,7 @@ in buildPythonPackage rec { sha256 = "11dn062788kwfs8k2ry4v8zr2gn40r6lsw770s9g2gvhl5n469dw"; }; - propagatedBuildInputs = [ pythonPackages.pyyaml i3-py ]; + propagatedBuildInputs = [ pythonPackages.pyyaml pythonPackages.i3-py ]; meta = with stdenv.lib; { description = "i3 project manager similar to tmuxinator"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e6e9d4ddc24..de5afad6c478 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3410,6 +3410,26 @@ let }; }; + i3-py = buildPythonPackage rec { + version = "0.6.4"; + name = "i3-py-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/i3-py/i3-py-${version}.tar.gz"; + sha256 = "1sgl438jrb4cdyl7hbc3ymwsf7y3zy09g1gh7ynilxpllp37jc8y"; + }; + + # no tests in tarball + doCheck = false; + + meta = { + description = "tools for i3 users and developers"; + homepage = "https://github.com/ziberna/i3-py"; + license = licenses.gpl3; + platforms = platforms.linux; + }; + }; + jsonpatch = buildPythonPackage rec { name = "jsonpatch-1.8";