ntfy: use python39 and remove ntfy-webpush from python3Packages
This commit is contained in:
parent
b10d49ee09
commit
418a929ded
|
@ -1,9 +1,21 @@
|
||||||
{ lib, python3Packages, fetchFromGitHub, fetchpatch }:
|
{ lib
|
||||||
|
, python39
|
||||||
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonApplication rec {
|
let
|
||||||
|
python = python39.override {
|
||||||
|
packageOverrides = self: super: {
|
||||||
|
ntfy-webpush = self.callPackage ./webpush.nix { };
|
||||||
|
};
|
||||||
|
};
|
||||||
|
in python.pkgs.buildPythonApplication rec {
|
||||||
pname = "ntfy";
|
pname = "ntfy";
|
||||||
version = "2.7.0";
|
version = "2.7.0";
|
||||||
|
|
||||||
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dschep";
|
owner = "dschep";
|
||||||
repo = "ntfy";
|
repo = "ntfy";
|
||||||
|
@ -11,11 +23,11 @@ python3Packages.buildPythonApplication rec {
|
||||||
sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
|
sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
|
||||||
};
|
};
|
||||||
|
|
||||||
checkInputs = with python3Packages; [
|
checkInputs = with python.pkgs; [
|
||||||
mock
|
mock
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = with python.pkgs; [
|
||||||
requests ruamel-yaml appdirs
|
requests ruamel-yaml appdirs
|
||||||
sleekxmpp dnspython
|
sleekxmpp dnspython
|
||||||
emoji
|
emoji
|
||||||
|
@ -37,7 +49,7 @@ python3Packages.buildPythonApplication rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
HOME=$(mktemp -d) ${python3Packages.python.interpreter} setup.py test
|
HOME=$(mktemp -d) ${python.interpreter} setup.py test
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
{ lib, python3Packages, fetchFromGitHub }:
|
{ lib
|
||||||
|
, buildPythonPackage
|
||||||
|
, fetchFromGitHub
|
||||||
|
, pywebpush
|
||||||
|
, py-vapid
|
||||||
|
}:
|
||||||
|
|
||||||
python3Packages.buildPythonPackage rec {
|
buildPythonPackage rec {
|
||||||
pname = "ntfy-webpush";
|
pname = "ntfy-webpush";
|
||||||
version = "0.1.3";
|
version = "0.1.3";
|
||||||
|
|
||||||
|
@ -17,7 +22,7 @@ python3Packages.buildPythonPackage rec {
|
||||||
--replace "'ntfy', " ""
|
--replace "'ntfy', " ""
|
||||||
'';
|
'';
|
||||||
|
|
||||||
propagatedBuildInputs = with python3Packages; [
|
propagatedBuildInputs = [
|
||||||
pywebpush
|
pywebpush
|
||||||
py-vapid
|
py-vapid
|
||||||
];
|
];
|
|
@ -5912,8 +5912,6 @@ in {
|
||||||
|
|
||||||
nsapi = callPackage ../development/python-modules/nsapi { };
|
nsapi = callPackage ../development/python-modules/nsapi { };
|
||||||
|
|
||||||
ntfy-webpush = callPackage ../tools/misc/ntfy-webpush { };
|
|
||||||
|
|
||||||
ntc-templates = callPackage ../development/python-modules/ntc-templates { };
|
ntc-templates = callPackage ../development/python-modules/ntc-templates { };
|
||||||
|
|
||||||
ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
|
ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
|
||||||
|
|
Loading…
Reference in a new issue