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 a2da88459649..2d4989e2ba45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4486,7 +4486,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 be0cfdb6ce3c..76fda7c140f5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3123,8 +3123,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 { };