From 5d7b0a9499308198194802238f3a4f6618e0f89b Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Nov 2026 09:46:50 +0100 Subject: [PATCH 1/6] rubberband: use fetchFromSourcehut --- pkgs/by-name/ru/rubberband/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index eaae08daf40c..53a18a59ccfe 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromSourcehut, pkg-config, libsamplerate, libsndfile, @@ -18,9 +18,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "rubberband"; version = "4.0.0"; - src = fetchurl { - url = "https://breakfastquay.com/files/releases/rubberband-${finalAttrs.version}.tar.bz2"; - hash = "sha256-rwUDE+5jvBizWy4GTl3OBbJ2qvbRqiuKgs7R/i+AKOk="; + src = fetchFromSourcehut { + vc = "hg"; + owner = "~breakfastquay"; + repo = "rubberband"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TjW+Op750ZzPVD3c/ybyYGM0G65nK5JgMBr/MMsQ8kw="; }; patches = [ From 85bb2e2b4675d543307a5f161b26ca34071cc0da Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Nov 2026 09:51:52 +0100 Subject: [PATCH 2/6] rubberband: run tests --- pkgs/by-name/ru/rubberband/package.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 53a18a59ccfe..7e3b32a8e8b7 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -12,6 +12,7 @@ ladspa-header, meson, ninja, + boost, }: stdenv.mkDerivation (finalAttrs: { @@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ninja jdk_headless ]; + buildInputs = [ libsamplerate libsndfile @@ -46,12 +48,18 @@ stdenv.mkDerivation (finalAttrs: { ladspa-header lv2 ]; + + checkInputs = [ + boost + ]; + + mesonFlags = [ + (lib.mesonEnable "tests" finalAttrs.doCheck) + ]; + makeFlags = [ "AR:=$(AR)" ]; - # TODO: package boost-test, so we can run the test suite. (Currently it fails - # to find libboost_unit_test_framework.a.) - mesonFlags = [ "-Dtests=disabled" ]; - doCheck = false; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = { description = "High quality software library for audio time-stretching and pitch-shifting"; From 17f4e7410832322c7c89196c5aa3a324de76d077 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Nov 2026 10:12:17 +0100 Subject: [PATCH 3/6] rubberband: remove unneeded makeFlags --- pkgs/by-name/ru/rubberband/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 7e3b32a8e8b7..31616656a447 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -57,8 +57,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "tests" finalAttrs.doCheck) ]; - makeFlags = [ "AR:=$(AR)" ]; - doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = { From ae6a867b183a997d09fc27d728bce5fdc811c304 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Nov 2026 10:12:17 +0100 Subject: [PATCH 4/6] rubberband: set mesonFlags --- pkgs/by-name/ru/rubberband/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 31616656a447..bce434dbd3a8 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -54,6 +54,13 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ + (lib.mesonEnable "jni" true) + (lib.mesonEnable "ladspa" true) + (lib.mesonEnable "lv2" true) + (lib.mesonEnable "vamp" true) + (lib.mesonEnable "cmdline" true) + (lib.mesonOption "fft" "fftw") + (lib.mesonOption "resampler" "libsamplerate") (lib.mesonEnable "tests" finalAttrs.doCheck) ]; From 25650757d258d023ba9bac20b76e2292e26ff8ca Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Nov 2026 10:12:17 +0100 Subject: [PATCH 5/6] rubberband: don't build jni on i686 --- pkgs/by-name/ru/rubberband/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index bce434dbd3a8..8ad870d011c4 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config meson ninja + ] + ++ lib.optionals (!stdenv.hostPlatform.isx86_32) [ jdk_headless ]; @@ -54,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonEnable "jni" true) + (lib.mesonEnable "jni" (!stdenv.hostPlatform.isx86_32)) (lib.mesonEnable "ladspa" true) (lib.mesonEnable "lv2" true) (lib.mesonEnable "vamp" true) From 60ed66f2796aa8a25decacdeecc4e7041350e1e6 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 4 Nov 2026 10:19:10 +0100 Subject: [PATCH 6/6] rubberband: adopt by jopejoe1 --- pkgs/by-name/ru/rubberband/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ru/rubberband/package.nix b/pkgs/by-name/ru/rubberband/package.nix index 8ad870d011c4..914d67991640 100644 --- a/pkgs/by-name/ru/rubberband/package.nix +++ b/pkgs/by-name/ru/rubberband/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://breakfastquay.com/rubberband/"; # commercial license available as well, see homepage. You'll get some more optimized routines license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = [ lib.maintainers.jopejoe1 ]; platforms = lib.platforms.all; }; })