diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix new file mode 100644 index 00000000000..81c6d3a4bc8 --- /dev/null +++ b/pkgs/applications/misc/loxodo/default.nix @@ -0,0 +1,27 @@ +{ stdenv, python27Packages, fetchgit }: +let + py = python27Packages; + python = py.python; +in +py.buildPythonPackage rec { + name = "loxodo-0.20150124"; + + src = fetchgit { + url = "https://github.com/sommer/loxodo.git"; + rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; + sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2"; + }; + + propagatedBuildInputs = with py; [ wxPython python.modules.readline ]; + + postInstall = '' + mv $out/bin/loxodo.py $out/bin/loxodo + ''; + + meta = with stdenv.lib; { + description = "A Password Safe V3 compatible password vault"; + homepage = http://www.christoph-sommer.de/loxodo/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be12bcfe524..ecf2d68e9fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11674,6 +11674,8 @@ let lmms = callPackage ../applications/audio/lmms { }; + loxodo = callPackage ../applications/misc/loxodo { }; + lrzsz = callPackage ../tools/misc/lrzsz { }; luakit = callPackage ../applications/networking/browsers/luakit { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac800873860..c87928ccf26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6662,27 +6662,6 @@ let propagatedBuildInputs = with self; [ unittest2 six ]; }; - loxodo = buildPythonPackage { - name = "loxodo-0.20150124"; - disabled = isPy3k; - - src = pkgs.fetchgit { - url = "https://github.com/sommer/loxodo.git"; - rev = "6c56efb4511fd6f645ad0f8eb3deafc8071c5795"; - sha256 = "02whmv4am8cz401rplplqzbipkyf0wd69z43sd3yw05rh7f3xbs2"; - }; - - propagatedBuildInputs = with self; [ wxPython modules.readline ]; - postInstall = "mv $out/bin/loxodo.py $out/bin/loxodo"; - - meta = { - description = "A Password Safe V3 compatible password vault"; - homepage = http://www.christoph-sommer.de/loxodo/; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - }; - lxml = buildPythonPackage ( rec { name = "lxml-3.3.6";