Merge pull request #33727 from jluttine/update-salmon

pythonPackages.salmon: bec795cd -> 3.0.0
This commit is contained in:
adisbladis 2018-01-11 09:54:33 +08:00 committed by GitHub
commit f5e39b2c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 30 deletions

View File

@ -0,0 +1,23 @@
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, nose, dnspython
, chardet, lmtpd, pythondaemon, six, jinja2, mock }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "salmon-mail";
version = "3.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "1smggsnkwiqy8zjq604dkm5g0np27pdnj3szsbn8v4ja84nncq18";
};
checkInputs = [ nose jinja2 mock ];
propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
meta = with stdenv.lib; {
homepage = http://salmon-mail.readthedocs.org/;
description = "Pythonic mail application server";
license = licenses.gpl3;
maintainers = with maintainers; [ jluttine ];
};
}

View File

@ -1,29 +0,0 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, nose, dnspython
, chardet, lmtpd, pythondaemon, six, jinja2, mock }:
buildPythonPackage rec {
pname = "salmon";
# NOTE: The latest release version 2 is over 3 years old. So let's use some
# recent commit from master. There will be a new release at some point, then
# one can change this to use PyPI. See:
# https://github.com/moggers87/salmon/issues/52
version = "bec795cdab744be4f103d8e35584dfee622ddab2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "moggers87";
repo = "salmon";
rev = version;
sha256 = "0nx8pyxy7n42nsqqvhd85ycm1i5wlacsi7lwb4rrs9d416bpd300";
};
checkInputs = [ nose jinja2 mock ];
propagatedBuildInputs = [ chardet dnspython lmtpd pythondaemon six ];
meta = with stdenv.lib; {
homepage = http://salmon-mail.readthedocs.org/;
description = "Pythonic mail application server";
license = licenses.gpl3;
maintainers = with maintainers; [ jluttine ];
};
}

View File

@ -362,7 +362,7 @@ in {
rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});
salmon = callPackage ../development/python-modules/salmon { };
salmon-mail = callPackage ../development/python-modules/salmon-mail { };
simpleeval = callPackage ../development/python-modules/simpleeval { };