From f78d225b92a6ccb817ed8ffe8833f72240c8a401 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Thu, 23 Feb 2023 23:04:57 +0800 Subject: [PATCH 1/2] python3Packages.soundfile: 0.11.0 -> 0.12.1 --- pkgs/development/python-modules/soundfile/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index 91b4e2ec7a42..d91ebddc0058 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , pytestCheckHook , numpy , libsndfile @@ -12,13 +11,13 @@ buildPythonPackage rec { pname = "soundfile"; - version = "0.11.0"; + version = "0.12.1"; # https://github.com/bastibe/python-soundfile/issues/157 disabled = isPyPy || stdenv.isi686; src = fetchPypi { inherit pname version; - sha256 = "sha256-kxc4ock+hoTC0+HVFKxjRAzoJ+x4PqCi0+RzDj3FjBg="; + hash = "sha256-6OEBeyzx3adnrvGdL9nuXr4H4FDUMPd6Cnxmugi4za4="; }; postPatch = '' @@ -29,10 +28,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy libsndfile cffi ]; propagatedNativeBuildInputs = [ cffi ]; - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - export PYSOUNDFILE_ARCHITECTURE=x86_64 - ''; - meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; license = lib.licenses.bsd3; From 163e6c07fdff1251f5135a21d8e2814cab274b65 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Fri, 24 Feb 2023 11:06:14 +0800 Subject: [PATCH 2/2] python3Packages.soundfile: Fix build on aarch64-linux --- .../0001-Fix-build-on-linux-arm64.patch | 25 +++++++++++++++++++ .../python-modules/soundfile/default.nix | 4 +++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch diff --git a/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch b/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch new file mode 100644 index 000000000000..fa656fd2845e --- /dev/null +++ b/pkgs/development/python-modules/soundfile/0001-Fix-build-on-linux-arm64.patch @@ -0,0 +1,25 @@ +From b3eabd314f050a7491e82bc1560e8d8633569a06 Mon Sep 17 00:00:00 2001 +From: Zhong Jianxin +Date: Fri, 24 Feb 2023 11:03:41 +0800 +Subject: [PATCH] Fix build on linux arm64 + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index ef99bcc..81c2dcb 100644 +--- a/setup.py ++++ b/setup.py +@@ -80,7 +80,7 @@ else: + elif platform == 'linux': + # the oldest mainline github runner available is ubuntu 20.04, + # which runs glibc 2.31: +- oses = 'manylinux_2_31_x86_64' ++ oses = 'manylinux_2_31_{}'.format(architecture0) + else: + pythons = 'py2.py3' + oses = 'any' +-- +2.39.1 + diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index d91ebddc0058..a6875d5edca3 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -20,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-6OEBeyzx3adnrvGdL9nuXr4H4FDUMPd6Cnxmugi4za4="; }; + patches = [ + ./0001-Fix-build-on-linux-arm64.patch + ]; + postPatch = '' substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'" '';