diff --git a/pkgs/development/python-modules/django-modeltranslation/default.nix b/pkgs/development/python-modules/django-modeltranslation/default.nix index 91ee56a3382d..cb4f79bf0e12 100644 --- a/pkgs/development/python-modules/django-modeltranslation/default.nix +++ b/pkgs/development/python-modules/django-modeltranslation/default.nix @@ -9,7 +9,8 @@ pytest-django, pytestCheckHook, pythonOlder, - setuptools, + hatchling, + hatch-vcs, }: buildPythonPackage rec { @@ -26,7 +27,10 @@ buildPythonPackage rec { hash = "sha256-8A5fIZuUMlXe8bHQR0Ha5HoT9VIQsgqpJVMONB5KqCI="; }; - build-system = [ setuptools ]; + build-system = [ + hatchling + hatch-vcs + ]; dependencies = [ django ]; @@ -40,11 +44,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "modeltranslation" ]; - meta = with lib; { + meta = { description = "Translates Django models using a registration approach"; homepage = "https://github.com/deschler/django-modeltranslation"; changelog = "https://github.com/deschler/django-modeltranslation/blob/v${src.tag}/CHANGELOG.md"; - license = licenses.bsd3; - maintainers = with maintainers; [ augustebaum ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ augustebaum ]; }; } diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index e0ea963e9d4e..e1957ef0cf5c 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -3,7 +3,7 @@ buildPythonPackage, cryptography, cython, - fetchPypi, + fetchFromGitHub, pythonOlder, setuptools, wheel, @@ -14,13 +14,21 @@ buildPythonPackage rec { version = "3.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-6DDTVEoVeClryqVMboyK4QpYx9tGfFKMSyetv5yLTLA="; + src = fetchFromGitHub { + owner = "oracle"; + repo = "python-oracledb"; + tag = "v${version}"; + fetchSubmodules = true; + hash = "sha256-SHIEl4pzuQBJ02KRPmOydFtmVD9qF3LGk9WPiDSpVzQ="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "cython == 3.1" "cython" + ''; + build-system = [ cython setuptools @@ -34,14 +42,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "oracledb" ]; - meta = with lib; { + meta = { description = "Python driver for Oracle Database"; homepage = "https://oracle.github.io/python-oracledb"; changelog = "https://github.com/oracle/python-oracledb/blob/v${version}/doc/src/release_notes.rst"; - license = with licenses; [ + license = with lib.licenses; [ asl20 # and or upl ]; - maintainers = with maintainers; [ harvidsen ]; + maintainers = with lib.maintainers; [ harvidsen ]; }; }