Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2021-04-25 13:54:29 +02:00
29 changed files with 204 additions and 181 deletions

View File

@@ -18,15 +18,21 @@ buildPythonPackage rec {
sha256 = "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee";
};
propagatedBuildInputs = [ pbr setuptools six ]
++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
propagatedBuildInputs = [
pbr
setuptools
six
] ++ lib.optionals (pythonOlder "3.8") [
importlib-metadata
];
doCheck = false;
pythonImportsCheck = [ "stevedore" ];
meta = with lib; {
description = "Manage dynamic plugins for Python applications";
homepage = "https://pypi.python.org/pypi/stevedore";
homepage = "https://docs.openstack.org/stevedore/";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View File

@@ -325,6 +325,10 @@ let
addOpenGLRunpath "$lib"
done
'';
requiredSystemFeatures = [
"big-parallel"
];
};
meta = with lib; {