From ed4aff0eaf94af48723e914515f731c4aa512ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Mar 2023 13:58:15 -0700 Subject: [PATCH 1/3] python310Packages.miniaudio: 1.55 -> 1.56 Diff: https://github.com/irmen/pyminiaudio/compare/refs/tags/v1.55...v1.56 Changelog: https://github.com/irmen/pyminiaudio/releases/tag/v1.56 --- pkgs/development/python-modules/miniaudio/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 7c681d849b3a..bd640980f07d 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -11,15 +11,17 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.55"; + version = "1.56"; disabled = pythonOlder "3.6"; + format = "setuptools"; + src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - hash = "sha256-na8pnYIoawICbsVquzlmfYZtIagsVBudFOKJ62jSTGM="; + hash = "sha256-vNh9BupU6T+Gfa8fdt8r3/vqtTtfVDyrxM9GkFUcDcI="; }; buildInputs = lib.optionals stdenv.isDarwin [ From fa0d4b174e8b2ca211959141a5b1f67cd20972aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Mar 2023 14:26:19 -0700 Subject: [PATCH 2/3] python310Packages.miniaudio: unvendor miniaudio --- pkgs/development/python-modules/miniaudio/default.nix | 10 ++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index bd640980f07d..ccfab47ce1d1 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, miniaudio , cffi , pytestCheckHook , AudioToolbox @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-vNh9BupU6T+Gfa8fdt8r3/vqtTtfVDyrxM9GkFUcDcI="; }; + postPatch = '' + rm -r miniaudio + ln -s ${miniaudio} miniaudio + substituteInPlace build_ffi_module.py \ + --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; + substituteInPlace miniaudio.c \ + --replace "miniaudio/stb_vorbis.c" "miniaudio/extras/stb_vorbis.c"; + ''; + buildInputs = lib.optionals stdenv.isDarwin [ AudioToolbox CoreAudio diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2311f6b64082..b9a1842daa32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6021,6 +6021,7 @@ self: super: with self; { minexr = callPackage ../development/python-modules/minexr { }; miniaudio = callPackage ../development/python-modules/miniaudio { + inherit (pkgs) miniaudio; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox CoreAudio; }; From a6f9bcf863fc11e68b74cfb58cf1353be6c552d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 31 Mar 2023 14:27:57 -0700 Subject: [PATCH 3/3] miniaudio: 0.11.11 -> 0.11.14 Diff: https://github.com/mackron/miniaudio/compare/9a7663496fc06f7a9439c752fd7666ca93328c20...0.11.14 Changelog: https://github.com/mackron/miniaudio/blob/9a7663496fc06f7a9439c752fd7666ca93328c20/CHANGES.md --- pkgs/development/libraries/miniaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index b68f90461155..63a76a9752be 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,15 +4,15 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.11"; + version = "0.11.14"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; - rev = "a0dc1037f99a643ff5fad7272cd3d6461f2d63fa"; + rev = "9a7663496fc06f7a9439c752fd7666ca93328c20"; # upstream does not maintain tags: # https://github.com/mackron/miniaudio/issues/273#issuecomment-783861269 - hash = "sha256-jOvDZk76hDvZ1RQ9O34kVeW0n95BT9+BE6fNhdekI5s="; + hash = "sha256-v/Eo4/CYcpB4tbOoy1gPqk6PUvkQIZNWrweG3l5EcMk="; }; installPhase = ''