summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRichard Larocque <richard.larocque@gmail.com>2015-06-03 23:43:00 -0700
committerRichard Larocque <richard.larocque@gmail.com>2015-06-03 23:43:00 -0700
commit472642ebfffa0dca0284ae8b522e843025f555c2 (patch)
treecb1e6bc169480fbb70006ed2e2b20b514c594721 /pkgs/top-level
parenta714ddcbd588432906497347b9613b6a32fca920 (diff)
downloadnixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.tar
nixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.tar.gz
nixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.tar.bz2
nixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.tar.lz
nixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.tar.xz
nixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.tar.zst
nixpkgs-472642ebfffa0dca0284ae8b522e843025f555c2.zip
Make Loxodo into a real package
There's no reason to keep it hidden in python27Packages hierarchy.
Promote it to be a top-level package.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix21
2 files changed, 2 insertions, 21 deletions
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";