Merge pull request #46687 from mbode/salt_darwin

salt: fix darwin build by specifying dependency on tornado 4
This commit is contained in:
xeji 2018-09-15 12:38:45 +02:00 committed by GitHub
commit b78348d1a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions

View file

@ -8,12 +8,25 @@
, singledispatch
, pythonOlder
, futures
, version ? "5.1"
}:
let
versionMap = {
"4.5.3" = {
sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
};
"5.1" = {
sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
};
};
in
with versionMap.${version};
buildPythonPackage rec {
pname = "tornado";
version = "5.1";
inherit version;
propagatedBuildInputs = [ backports_abc certifi singledispatch ]
++ lib.optional (pythonOlder "3.5") backports_ssl_match_hostname
@ -26,8 +39,7 @@ buildPythonPackage rec {
'';
src = fetchPypi {
inherit pname version;
sha256 = "4f66a2172cb947387193ca4c2c3e19131f1c70fa8be470ddbbd9317fd0801582";
inherit pname sha256 version;
};
meta = {

View file

@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
pyyaml
pyzmq
requests
tornado
tornado_4
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
futures
] ++ extraInputs;

View file

@ -14901,6 +14901,7 @@ EOF
};
tornado = callPackage ../development/python-modules/tornado { };
tornado_4 = callPackage ../development/python-modules/tornado { version = "4.5.3"; };
tokenlib = buildPythonPackage rec {
name = "tokenlib-${version}";