From 6a5edad5442879718981f1cad525aa2ce7e0bde0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 15 Sep 2024 19:33:12 +0200 Subject: [PATCH 1/4] python3Packages.sounddevice: 0.4.7 -> 0.5.0 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index a4140a8a7f8a..34255f9cf51e 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.4.7"; + version = "0.5.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-abOGgY1QotUYYH1LlzRC6NUkdgx81si4vgPYyY/EvOc="; + hash = "sha256-DelSd2VLPUA9nBXe08bO3zB+myfMnOe9mVookdDJVa8="; }; propagatedBuildInputs = [ From c7990fc5958b538204f43af8051c62dded1eeda3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 15 Sep 2024 19:33:28 +0200 Subject: [PATCH 2/4] python3Packages.sounddevice: convert to pyproject --- pkgs/development/python-modules/sounddevice/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 34255f9cf51e..546e8a40bb8e 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchPypi, isPy27, + setuptools, cffi, numpy, portaudio, @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "sounddevice"; version = "0.5.0"; - format = "setuptools"; + pyproject = true; disabled = isPy27; src = fetchPypi { @@ -21,7 +22,9 @@ buildPythonPackage rec { hash = "sha256-DelSd2VLPUA9nBXe08bO3zB+myfMnOe9mVookdDJVa8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cffi numpy portaudio From ff00c002066c863e4f76be09aa51e98e396d4248 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 16 Sep 2024 10:32:51 +0200 Subject: [PATCH 3/4] python3Packages.sounddevice: add cffi for cross compilation Fixes > ModuleNotFoundError: No module named '_cffi_backend' > > ERROR Backend subprocess exited when trying to invoke build_wheel during the build. --- pkgs/development/python-modules/sounddevice/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 546e8a40bb8e..61f1f822020c 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { portaudio ]; + nativeBuildInputs = [ cffi ]; + # No tests included nor upstream available. doCheck = false; From 590380dc9dffa99d64efccb54b7a3a5837624d74 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 28 Oct 2024 13:15:16 +0100 Subject: [PATCH 4/4] python3Packages.sounddevice: 0.5.0 -> 0.5.1 --- .../python-modules/sounddevice/default.nix | 4 ++-- .../fix-portaudio-library-path.patch | 21 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 61f1f822020c..f90e2f7a3064 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-DelSd2VLPUA9nBXe08bO3zB+myfMnOe9mVookdDJVa8="; + hash = "sha256-CcqZHa7ajOS+mskeFamoHI+B76a2laNIyRceoMFssEE="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch index a5761764fdbb..6ec399e25d5f 100644 --- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch +++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch @@ -1,11 +1,11 @@ -diff --git i/sounddevice.py w/sounddevice.py -index c7c1d62..aabcb12 100644 ---- i/sounddevice.py -+++ w/sounddevice.py -@@ -58,29 +58,7 @@ from ctypes.util import find_library as _find_library +diff --git a/sounddevice.py b/sounddevice.py +index 0974289..2d56c28 100644 +--- a/sounddevice.py ++++ b/sounddevice.py +@@ -58,32 +58,7 @@ from ctypes.util import find_library as _find_library from _sounddevice import ffi as _ffi - - + + -try: - for _libname in ( - 'portaudio', # Default name on POSIX systems @@ -22,7 +22,10 @@ index c7c1d62..aabcb12 100644 - if _platform.system() == 'Darwin': - _libname = 'libportaudio.dylib' - elif _platform.system() == 'Windows': -- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll' +- if 'SD_ENABLE_ASIO' in _os.environ: +- _libname = 'libportaudio' + _platform.architecture()[0] + '-asio.dll' +- else: +- _libname = 'libportaudio' + _platform.architecture()[0] + '.dll' - else: - raise - import _sounddevice_data @@ -30,6 +33,6 @@ index c7c1d62..aabcb12 100644 - next(iter(_sounddevice_data.__path__)), 'portaudio-binaries', _libname) - _lib = _ffi.dlopen(_libname) +_lib = _ffi.dlopen('@portaudio@') - + _sampleformats = { 'float32': _lib.paFloat32,