diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 81a9bd5b8e4b0..342cf229365ef 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -2,34 +2,42 @@ lib, stdenv, buildPythonPackage, - fetchPypi, - eventlet, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies oslo-config, oslo-context, oslo-serialization, oslo-utils, - oslotest, pbr, - pyinotify, python-dateutil, + pyinotify, + + # tests + eventlet, + oslotest, pytestCheckHook, - pythonOlder, - setuptools, }: buildPythonPackage rec { pname = "oslo-log"; - version = "6.1.2"; + version = "6.2.0"; pyproject = true; - disabled = pythonOlder "3.8"; - - src = fetchPypi { - pname = "oslo.log"; - inherit version; - hash = "sha256-92gEffnXBsSE3WZl3LvqKJAh1Iy3zlq/eh9poJSR9f4="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "oslo.log"; + rev = "refs/tags/${version}"; + hash = "sha256-IEhIhGE95zZiWp602rFc+NLco/Oyx9XEL5e2RExNBMs="; }; + # Manually set version because prb wants to get it from the git upstream repository (and we are + # installing from tarball instead) + PBR_VERSION = version; + build-system = [ setuptools ]; dependencies = [ @@ -56,11 +64,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "oslo_log" ]; - meta = with lib; { + __darwinAllowLocalNetworking = true; + + meta = { description = "oslo.log library"; mainProgram = "convert-json"; homepage = "https://github.com/openstack/oslo.log"; - license = licenses.asl20; - maintainers = teams.openstack.members; + license = lib.licenses.asl20; + maintainers = lib.teams.openstack.members; }; }