Merge pull request #281300 from fabaff/ad-miner-fix

ad-miner: 0.6.0 -> 1.0.0, python311Packages.neo4j: refactor

authored by Fabian Affolter and committed by GitHub 92b0affd ba493285

+36 -3
+6 -2
pkgs/by-name/ad/ad-miner/package.nix
··· 5 6 python3.pkgs.buildPythonApplication rec { 7 pname = "ad-miner"; 8 - version = "0.6.0"; 9 pyproject = true; 10 11 src = fetchFromGitHub { 12 owner = "Mazars-Tech"; 13 repo = "AD_Miner"; 14 rev = "refs/tags/v${version}"; 15 - hash = "sha256-Iwg00vAnCs9FbEAmB54vNDLmxyZeCtZMl/VEFoYeEcM="; 16 }; 17 18 nativeBuildInputs = with python3.pkgs; [ 19 poetry-core 20 ]; 21 22 propagatedBuildInputs = with python3.pkgs; [
··· 5 6 python3.pkgs.buildPythonApplication rec { 7 pname = "ad-miner"; 8 + version = "1.0.0"; 9 pyproject = true; 10 11 src = fetchFromGitHub { 12 owner = "Mazars-Tech"; 13 repo = "AD_Miner"; 14 rev = "refs/tags/v${version}"; 15 + hash = "sha256-HM7PR1i7/L3MuUaTBPcDblflCH40NmEYSCTJUB06Fjg="; 16 }; 17 18 + # ALl requirements are pinned 19 + pythonRelaxDeps = true; 20 + 21 nativeBuildInputs = with python3.pkgs; [ 22 poetry-core 23 + pythonRelaxDepsHook 24 ]; 25 26 propagatedBuildInputs = with python3.pkgs; [
+30 -1
pkgs/development/python-modules/neo4j/default.nix
··· 1 { lib 2 , buildPythonPackage 3 , fetchFromGitHub 4 , pythonOlder 5 , pytz 6 , tomlkit 7 }: 8 9 buildPythonPackage rec { 10 pname = "neo4j"; 11 version = "5.16.0"; 12 - format = "setuptools"; 13 14 disabled = pythonOlder "3.7"; 15 ··· 20 hash = "sha256-ly/R2ufd5gEkUyfajpeMQblTiKipC9HFtxkWkh16zLo="; 21 }; 22 23 propagatedBuildInputs = [ 24 pytz 25 tomlkit 26 ]; 27 28 # Missing dependencies 29 doCheck = false;
··· 1 { lib 2 , buildPythonPackage 3 , fetchFromGitHub 4 + , numpy 5 + , pandas 6 + , pyarrow 7 , pythonOlder 8 , pytz 9 + , setuptools 10 , tomlkit 11 }: 12 13 buildPythonPackage rec { 14 pname = "neo4j"; 15 version = "5.16.0"; 16 + pyproject = true; 17 18 disabled = pythonOlder "3.7"; 19 ··· 24 hash = "sha256-ly/R2ufd5gEkUyfajpeMQblTiKipC9HFtxkWkh16zLo="; 25 }; 26 27 + postPatch = '' 28 + # The dynamic versioning adds a postfix (.dev0) to the version 29 + substituteInPlace pyproject.toml \ 30 + --replace '"tomlkit ~= 0.11.6"' '"tomlkit >= 0.11.6"' \ 31 + --replace 'dynamic = ["version", "readme"]' 'dynamic = ["readme"]' \ 32 + --replace '#readme = "README.rst"' 'version = "${version}"' 33 + ''; 34 + 35 + nativeBuildInputs = [ 36 + setuptools 37 + ]; 38 + 39 propagatedBuildInputs = [ 40 pytz 41 tomlkit 42 ]; 43 + 44 + passthru.optional-dependencies = { 45 + numpy = [ 46 + numpy 47 + ]; 48 + pandas = [ 49 + numpy 50 + pandas 51 + ]; 52 + pyarrow = [ 53 + pyarrow 54 + ]; 55 + }; 56 57 # Missing dependencies 58 doCheck = false;