From 38281e723910cc810be0057a99022a67df6114bc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 20:22:51 +0200 Subject: [PATCH 1/2] python312Packages.pyannote-pipeline: remove vendorized versioneer.py --- .../pyannote-pipeline/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix index 00b7eab6344a..7db9f7861d81 100644 --- a/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -1,16 +1,16 @@ { lib , buildPythonPackage +, docopt , fetchFromGitHub -, setuptools -, wheel +, filelock +, optuna , pyannote-core , pyannote-database , pyyaml -, optuna -, tqdm -, docopt -, filelock , scikit-learn +, setuptools +, tqdm +, versioneer }: buildPythonPackage rec { @@ -21,11 +21,21 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pyannote"; repo = "pyannote-pipeline"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-0wSgy6kbKi9Wa5dimOz34IV5/8fSwaHDMUpaBW7tm2Y="; }; - propagatedBuildInputs = [ + postPatch = '' + # Remove vendorized versioeer.py + rm versioneer.py + ''; + + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ pyannote-core pyannote-database pyyaml @@ -36,18 +46,13 @@ buildPythonPackage rec { scikit-learn ]; - nativeBuildInputs = [ - setuptools - wheel - ]; - pythonImportsCheck = [ "pyannote.pipeline" ]; meta = with lib; { description = "Tunable pipelines"; - mainProgram = "pyannote-pipeline"; homepage = "https://github.com/pyannote/pyannote-pipeline"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "pyannote-pipeline"; }; } From d17ed378edcafe028dc6e21ffe3176ab93f0d33c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 12 May 2024 20:23:43 +0200 Subject: [PATCH 2/2] python312Packages.pyannote-pipeline: format with nixfmt --- .../pyannote-pipeline/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix index 7db9f7861d81..0b85c50474d5 100644 --- a/pkgs/development/python-modules/pyannote-pipeline/default.nix +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, docopt -, fetchFromGitHub -, filelock -, optuna -, pyannote-core -, pyannote-database -, pyyaml -, scikit-learn -, setuptools -, tqdm -, versioneer +{ + lib, + buildPythonPackage, + docopt, + fetchFromGitHub, + filelock, + optuna, + pyannote-core, + pyannote-database, + pyyaml, + scikit-learn, + setuptools, + tqdm, + versioneer, }: buildPythonPackage rec { @@ -29,7 +30,7 @@ buildPythonPackage rec { # Remove vendorized versioeer.py rm versioneer.py ''; - + build-system = [ setuptools versioneer