diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index d8134263c5f773..549704be72f607 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -5,18 +5,22 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "0.6.0"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-Iwg00vAnCs9FbEAmB54vNDLmxyZeCtZMl/VEFoYeEcM="; + hash = "sha256-HM7PR1i7/L3MuUaTBPcDblflCH40NmEYSCTJUB06Fjg="; }; + # ALl requirements are pinned + pythonRelaxDeps = true; + nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index d79bf9587c5382..5215da38339c6a 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -1,15 +1,19 @@ { lib , buildPythonPackage , fetchFromGitHub +, numpy +, pandas +, pyarrow , pythonOlder , pytz +, setuptools , tomlkit }: buildPythonPackage rec { pname = "neo4j"; version = "5.16.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +24,36 @@ buildPythonPackage rec { hash = "sha256-ly/R2ufd5gEkUyfajpeMQblTiKipC9HFtxkWkh16zLo="; }; + postPatch = '' + # The dynamic versioning adds a postfix (.dev0) to the version + substituteInPlace pyproject.toml \ + --replace '"tomlkit ~= 0.11.6"' '"tomlkit >= 0.11.6"' \ + --replace 'dynamic = ["version", "readme"]' 'dynamic = ["readme"]' \ + --replace '#readme = "README.rst"' 'version = "${version}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pytz tomlkit ]; + passthru.optional-dependencies = { + numpy = [ + numpy + ]; + pandas = [ + numpy + pandas + ]; + pyarrow = [ + pyarrow + ]; + }; + # Missing dependencies doCheck = false;