diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 65bb683be2b8..f976e3fedba3 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -3,17 +3,21 @@ , fetchFromGitHub , karton-core , mwdblib +, pythonOlder }: buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.0.1"; + version = "unstable-2022-02-22"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "0jrn5c83nhcjny4bc879wrsgcr7mbazm51jzdkxmxyqf543cc841"; + rev = "1afa32251b4826eac4386596b4a20f295699faec"; + hash = "sha256-dbtIjWSNIRMccrGJspZMOBUD2EzuvW7xESlEwiOhKfQ="; }; propagatedBuildInputs = [ @@ -21,14 +25,12 @@ buildPythonPackage rec { mwdblib ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "mwdblib==3.4.0" "mwdblib" - ''; - # Project has no tests doCheck = false; - pythonImportsCheck = [ "karton.mwdb_reporter" ]; + + pythonImportsCheck = [ + "karton.mwdb_reporter" + ]; meta = with lib; { description = "Karton service that uploads analyzed artifacts and metadata to MWDB Core"; diff --git a/pkgs/development/python-modules/mwdblib/default.nix b/pkgs/development/python-modules/mwdblib/default.nix index 53ca11459efe..96c3f193396e 100644 --- a/pkgs/development/python-modules/mwdblib/default.nix +++ b/pkgs/development/python-modules/mwdblib/default.nix @@ -8,18 +8,22 @@ , keyring , python , python-dateutil +, pythonOlder , requests }: buildPythonPackage rec { pname = "mwdblib"; - version = "3.4.1"; + version = "4.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jCtK3Fk725EaA26GG6j6xqEMFH4Qq92QWrJ7sxcWRaY="; + sha256 = "sha256-afqE6zL1uwsLNAuy5XY7OduP1e3W2ueteOOVaFJg3b0="; }; propagatedBuildInputs = [ @@ -38,7 +42,9 @@ buildPythonPackage rec { runHook postCheck ''; - pythonImportsCheck = [ "mwdblib" ]; + pythonImportsCheck = [ + "mwdblib" + ]; meta = with lib; { description = "Python client library for the mwdb service";