topydo: really move out of python-packages

NixOS · Sep 22, 2017 · 446f9c9 · 446f9c9
1 parent be53026
commit 446f9c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, arrow, icalendar, mock, freezegun
-, coverage, glibcLocales, isPy3k, green, pylint, prompt_toolkit, urwid, watchdog }:
+{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }:
 
-buildPythonPackage rec {
+with python3Packages;
+
+buildPythonApplication rec {
   pname = "topydo";
   version = "0.13";
   name  = "${pname}-${version}";
-  disabled = (!isPy3k);
 
   src = fetchFromGitHub {
     owner = "bram85";
@@ -22,6 +22,7 @@ buildPythonPackage rec {
     urwid
     watchdog
   ];
+
   checkInputs = [ mock freezegun coverage green pylint ];
 
   LC_ALL="en_US.UTF-8";

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -16522,7 +16522,7 @@ with pkgs;
     quazip = quazip_qt4;
   };
 
-  topydo = (newScope python3Packages) ../applications/misc/topydo {};
+  topydo = callPackage ../applications/misc/topydo {};
 
   torchPackages = recurseIntoAttrs ( callPackage ../applications/science/machine-learning/torch {
     lua = luajit ;

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -25804,7 +25804,7 @@ EOF
     };
   };
 
-  topydo = callPackage ../development/python-modules/topydo {};
+  topydo = builtins.trace "python3Packages.topydo was moved to topydo" pkgs.topydo; # 2017-09-22
 
   w3lib = buildPythonPackage rec {
     name = "w3lib-${version}";