git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #51411 from jfrankenau/update-ntfy

ntfy: 2.6.0 -> 2.7.0

commite869896d00d9c7b1485b15e891d21213b4ff97f0 authorRenaud <c0bw3b@users.noreply.github.com> dateMon 3 Dec 2018, 11:31 (8 years ago) parent4cde69adc21737
4 files changed+38−42
pkgs/development/python-modules/ntfy/default.nix−39 pkgs/tools/misc/ntfy/default.nix+37 pkgs/top-level/all-packages.nix+1−1 pkgs/top-level/python-packages.nix−2
pkgs/development/python-modules/ntfy/default.nixdeleted−39
@@ -1,39 +0,0 @@
1−{ stdenv
2−, buildPythonPackage
3−, fetchFromGitHub
4−, appdirs
5−, ruamel_yaml
6−, requests
7−, emoji
8−, sleekxmpp
9−, mock
10−, psutil
11−, python
12−# , dbus-python
13−}:
14−
15−buildPythonPackage rec {
16− version = "2.6.0";
17− pname = "ntfy";
18−
19− src = fetchFromGitHub {
20− owner = "dschep";
21− repo = "ntfy";
22− rev = "v${version}";
23− sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1";
24− };
25−
26− propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ];
27−
28− checkPhase = ''
29− HOME=$(mktemp -d) ${python.interpreter} setup.py test
30− '';
31−
32− meta = with stdenv.lib; {
33− description = "A utility for sending notifications, on demand and when commands finish";
34− homepage = http://ntfy.rtfd.org/;
35− license = licenses.gpl3;
36− maintainers = with maintainers; [ kamilchm ];
37− };
38−
39−}
pkgs/tools/misc/ntfy/default.nixnew file+37
@@ -0,0 +1,37 @@
1+{ stdenv, pythonPackages, fetchFromGitHub }:
2+
3+pythonPackages.buildPythonApplication rec {
4+ pname = "ntfy";
5+ version = "2.7.0";
6+
7+ src = fetchFromGitHub {
8+ owner = "dschep";
9+ repo = "ntfy";
10+ rev = "v${version}";
11+ sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
12+ };
13+
14+ checkInputs = with pythonPackages; [
15+ mock
16+ ];
17+
18+ propagatedBuildInputs = with pythonPackages; [
19+ requests ruamel_yaml appdirs
20+ sleekxmpp dns
21+ emoji
22+ psutil
23+ matrix-client
24+ dbus-python
25+ ];
26+
27+ checkPhase = ''
28+ HOME=$(mktemp -d) ${pythonPackages.python.interpreter} setup.py test
29+ '';
30+
31+ meta = with stdenv.lib; {
32+ description = "A utility for sending notifications, on demand and when commands finish";
33+ homepage = http://ntfy.rtfd.org/;
34+ license = licenses.gpl3;
35+ maintainers = with maintainers; [ jfrankenau kamilchm ];
36+ };
37+}
pkgs/top-level/all-packages.nix+1−1
@@ -4486,7 +4486,7 @@ with pkgs;
44864486 # ntfsprogs are merged into ntfs-3g
44874487 ntfsprogs = pkgs.ntfs3g;
44884488
4489− ntfy = pythonPackages.ntfy;
4489+ ntfy = callPackage ../tools/misc/ntfy {};
44904490
44914491 ntopng = callPackage ../tools/networking/ntopng { };
44924492
pkgs/top-level/python-packages.nix−2
@@ -3123,8 +3123,6 @@ in {
31233123
31243124 emoji = callPackage ../development/python-modules/emoji { };
31253125
3126− ntfy = callPackage ../development/python-modules/ntfy { };
3127−
31283126 ntplib = callPackage ../development/python-modules/ntplib { };
31293127
31303128 numba = callPackage ../development/python-modules/numba { };