From dc21737eddac6494b24bb96e52b2ec42b1f3f8d8 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Fri, 30 Nov 2018 18:57:33 +0100
Subject: [PATCH] ntfy: 2.6.0 -> 2.7.0

---
 .../python-modules/ntfy/default.nix           | 39 -------------------
 pkgs/tools/misc/ntfy/default.nix              | 37 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 38 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/ntfy/default.nix
 create mode 100644 pkgs/tools/misc/ntfy/default.nix

diff --git a/pkgs/development/python-modules/ntfy/default.nix b/pkgs/development/python-modules/ntfy/default.nix
deleted file mode 100644
index efbd1eec35a3..000000000000
--- a/pkgs/development/python-modules/ntfy/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, appdirs
-, ruamel_yaml
-, requests
-, emoji
-, sleekxmpp
-, mock
-, psutil
-, python
-# , dbus-python
-}:
-
-buildPythonPackage rec {
-  version = "2.6.0";
-  pname = "ntfy";
-
-  src = fetchFromGitHub {
-    owner = "dschep";
-    repo = "ntfy";
-    rev = "v${version}";
-    sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1";
-  };
-
-  propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ];
-
-  checkPhase = ''
-    HOME=$(mktemp -d) ${python.interpreter} setup.py test
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A utility for sending notifications, on demand and when commands finish";
-    homepage = http://ntfy.rtfd.org/;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ kamilchm ];
-  };
-
-}
diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix
new file mode 100644
index 000000000000..26517361ae2d
--- /dev/null
+++ b/pkgs/tools/misc/ntfy/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "ntfy";
+  version = "2.7.0";
+
+  src = fetchFromGitHub {
+    owner = "dschep";
+    repo = "ntfy";
+    rev = "v${version}";
+    sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
+  };
+
+  checkInputs = with pythonPackages; [
+    mock
+  ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    requests ruamel_yaml appdirs
+    sleekxmpp dns
+    emoji
+    psutil
+    matrix-client
+    dbus-python
+  ];
+
+  checkPhase = ''
+    HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A utility for sending notifications, on demand and when commands finish";
+    homepage = http://ntfy.rtfd.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jfrankenau kamilchm ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab155865ecb1..93cf16501802 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4472,7 +4472,7 @@ with pkgs;
   # ntfsprogs are merged into ntfs-3g
   ntfsprogs = pkgs.ntfs3g;
 
-  ntfy = pythonPackages.ntfy;
+  ntfy = callPackage ../tools/misc/ntfy {};
 
   ntopng = callPackage ../tools/networking/ntopng { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d5a0d57a2d51..134748260ec3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2995,8 +2995,6 @@ in {
 
   emoji = callPackage ../development/python-modules/emoji { };
 
-  ntfy = callPackage ../development/python-modules/ntfy { };
-
   ntplib = callPackage ../development/python-modules/ntplib { };
 
   numba = callPackage ../development/python-modules/numba { };