From ca79392bbca3b8e8155780e80dae0e94b308c1f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 28 Mar 2022 00:10:27 +0200 Subject: [PATCH 1/2] python39Packages.osc-lib: 2.5.0 -> unstable-2022-03-09 this fixes tests for python 3.10 --- .../python-modules/osc-lib/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 95c5e5d6a328..81ae9df4cbec 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , cliff , oslo-i18n , oslo-utils @@ -13,13 +13,18 @@ buildPythonPackage rec { pname = "osc-lib"; - version = "2.5.0"; + version = "unstable-2022-03-09"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-2PikUPqyoSlOCu+M3JolWhvMW1jhsvYJjjXm2x4T6dE="; + src = fetchFromGitHub { + owner = "openstack"; + repo = "osc-lib"; + rev = "65c73fd5030276e34f3d52c03ddb9d27cd8ec6f5"; + sha256 = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; }; + # fake version to make pbr happy... + PBR_VERSION = "2.5.0"; + nativeBuildInputs = [ pbr ]; From f4182075ff292f9c737fa2281f60ea4f514ace89 Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 28 Mar 2022 00:39:07 +0200 Subject: [PATCH 2/2] Update pkgs/development/python-modules/osc-lib/default.nix --- pkgs/development/python-modules/osc-lib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 81ae9df4cbec..e9a662412b77 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "sha256-CLE9lrMMlvVrihe+N4wvIKe8t9IZ1TpHHVdn2dnvAOI="; }; - # fake version to make pbr happy... + # fake version to make pbr.packaging happy and not reject it... PBR_VERSION = "2.5.0"; nativeBuildInputs = [