From be530263bc0bb2888ccec4d3194832076420392d Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Thu, 21 Sep 2017 17:16:35 -0400
Subject: [PATCH 1/2] topydo: 0.9 -> 0.13

---
 pkgs/applications/misc/topydo/default.nix | 34 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 pkgs/top-level/python-packages.nix        | 24 +---------------
 3 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/applications/misc/topydo/default.nix

diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
new file mode 100644
index 000000000000..f115c7b22f01
--- /dev/null
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, arrow, icalendar, mock, freezegun
+, coverage, glibcLocales, isPy3k, green, pylint, prompt_toolkit, urwid, watchdog }:
+
+buildPythonPackage rec {
+  pname = "topydo";
+  version = "0.13";
+  name  = "${pname}-${version}";
+  disabled = (!isPy3k);
+
+  src = fetchFromGitHub {
+    owner = "bram85";
+    repo = pname;
+    rev = version;
+    sha256 = "0b3dz137lpbvpjvfy42ibqvj3yk526x4bpn819fd11lagn77w69r";
+  };
+
+  propagatedBuildInputs = [
+    arrow
+    icalendar
+    glibcLocales
+    prompt_toolkit
+    urwid
+    watchdog
+  ];
+  checkInputs = [ mock freezegun coverage green pylint ];
+
+  LC_ALL="en_US.UTF-8";
+
+  meta = with stdenv.lib; {
+    description = "A cli todo application compatible with the todo.txt format";
+    homepage = "https://github.com/bram85/topydo";
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 068fa3230d63..2e326c8be1a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16522,6 +16522,8 @@ with pkgs;
     quazip = quazip_qt4;
   };
 
+  topydo = (newScope python3Packages) ../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
index 2584b6f2810b..13df3a6fc0ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25804,29 +25804,7 @@ EOF
     };
   };
 
-  topydo = buildPythonPackage rec {
-    name = "topydo-${version}";
-    version = "0.9";
-    disabled = (!isPy3k);
-
-    src = pkgs.fetchFromGitHub {
-      owner = "bram85";
-      repo = "topydo";
-      rev = version;
-      sha256 = "0vmfr2cxn3r5zc0c4q3a94xy1r0cv177b9zrm9hkkjcmhgq42s3h";
-    };
-
-    propagatedBuildInputs = with self; [ arrow icalendar ];
-    buildInputs = with self; [ mock freezegun coverage pkgs.glibcLocales ];
-
-    LC_ALL="en_US.UTF-8";
-
-    meta = {
-      description = "A cli todo application compatible with the todo.txt format";
-      homepage = "https://github.com/bram85/topydo";
-      license = licenses.gpl3;
-    };
-  };
+  topydo = callPackage ../development/python-modules/topydo {};
 
   w3lib = buildPythonPackage rec {
     name = "w3lib-${version}";

From 446f9c96f548cab37984aa6cd510ae7e16c3791d Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Fri, 22 Sep 2017 08:44:04 +0100
Subject: [PATCH 2/2] topydo: really move out of python-packages

---
 pkgs/applications/misc/topydo/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix           | 2 +-
 pkgs/top-level/python-packages.nix        | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
index f115c7b22f01..34952b9c0f4d 100644
--- 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
index 2e326c8be1a1..2a4f43a4353b 100644
--- 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
index 13df3a6fc0ba..aa432650c3d5 100644
--- 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}";