about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2018-12-03 11:31:53 +0100
committerGitHub <noreply@github.com>2018-12-03 11:31:53 +0100
commite869896d00d9c7b1485b15e891d21213b4ff97f0 (patch)
treeb7caf4f9802b08261dc2ffac9f28f8413de9678e /pkgs/top-level
parent4cde69ad9a162e414c064a0d17c63f88f991d00c (diff)
parentdc21737eddac6494b24bb96e52b2ec42b1f3f8d8 (diff)
downloadnixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.tar
nixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.tar.gz
nixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.tar.bz2
nixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.tar.lz
nixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.tar.xz
nixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.tar.zst
nixlib-e869896d00d9c7b1485b15e891d21213b4ff97f0.zip
Merge pull request #51411 from jfrankenau/update-ntfy
ntfy: 2.6.0 -> 2.7.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
2 files changed, 1 insertions, 3 deletions
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 { };