Merge pull request #53352 from Mic92/fix-ceph

ceph: fix dependencies
This commit is contained in:
Jörg Thalheim 2019-01-04 08:59:50 +01:00 committed by GitHub
commit 4f9970fcbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions

View File

@ -5,15 +5,21 @@
, backports_functools_lru_cache, requests_toolbelt , backports_functools_lru_cache, requests_toolbelt
}: }:
buildPythonPackage rec { let
srcInfo = if isPy3k then {
version = "18.0.1";
sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
} else {
version = "17.4.1";
sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
};
in buildPythonPackage rec {
pname = "CherryPy"; pname = "CherryPy";
version = "18.0.1"; inherit (srcInfo) version;
disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname;
sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520"; inherit (srcInfo) version sha256;
}; };
propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ]; propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];

View File

@ -4,6 +4,7 @@
, Babel , Babel
, pytz , pytz
, nine , nine
, nose
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -16,6 +17,7 @@ buildPythonPackage rec {
}; };
propagatedBuildInputs = [ Babel pytz nine ]; propagatedBuildInputs = [ Babel pytz nine ];
checkInputs = [ nose ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Kajiki provides fast well-formed XML templates"; description = "Kajiki provides fast well-formed XML templates";

View File

@ -12,6 +12,7 @@
, gunicorn , gunicorn
, jinja2 , jinja2
, virtualenv , virtualenv
, mock
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -28,6 +29,8 @@ buildPythonPackage rec {
webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
]; ];
checkInputs = [ mock ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Pecan"; description = "Pecan";
homepage = "https://github.com/pecan/pecan"; homepage = "https://github.com/pecan/pecan";