diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index cbe4b8518763f..2229a094ec2ad 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -2,9 +2,8 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, - fetchpatch2, - setuptools, + fetchFromGitHub, + hatchling, packaging, tomli, pyyaml, @@ -13,27 +12,21 @@ buildPythonPackage rec { pname = "dparse"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg="; + src = fetchFromGitHub { + owner = "pyupio"; + repo = "dparse"; + tag = version; + hash = "sha256-LnsmJtWLjV3xoSjacfR9sUwPlOjQTRBWirJVtIJSE8A="; }; - patches = [ - (fetchpatch2 { - name = "fix-configparser-deprecation-warning.patch"; - url = "https://github.com/pyupio/dparse/pull/69.patch"; - hash = "sha256-RolD6xDJpI8/UHgAdcsXoyxOGLok7AogLMOTl1ZPKvw="; - }) - ]; - - nativeBuildInputs = [ setuptools ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; optional-dependencies = { # FIXME pipenv = [ pipenv ]; diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix index 40e22736088d2..6c1c42086b023 100644 --- a/pkgs/development/python-modules/safety-schemas/default.nix +++ b/pkgs/development/python-modules/safety-schemas/default.nix @@ -12,19 +12,17 @@ buildPythonPackage rec { pname = "safety-schemas"; - version = "0.0.5"; + version = "0.0.10"; pyproject = true; src = fetchPypi { pname = "safety_schemas"; inherit version; - hash = "sha256-DeX8mlPUQjZEqM6aF6LkdHFKon5X81BhRulaQXEP8QQ="; + hash = "sha256-Xsg7sZ4XADdI0qSxHkPh8rRHHJQ0Mp6aDYDRBplmuWw="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ "dparse" ]; - dependencies = [ dparse packaging diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 911ddc0d89363..84e7ea1230842 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.9"; + version = "3.2.11"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pyupio"; repo = "safety"; rev = "refs/tags/${version}"; - hash = "sha256-etA/S/i87w4ihsqQo5JJjt6hWC7Jt9/q8vhqyo+DTek="; + hash = "sha256-ekJ0o+KWS8Fih1M/scboGEjETX0/2Uh6h/zne4h+3wI="; }; postPatch = '' @@ -54,7 +54,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; pythonRelaxDeps = [ - "dparse" "filelock" ];