From 07e723bdfd79fd54cf957f2d3f0a60d263c621e5 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Tue, 16 Jul 2024 08:12:05 -0600 Subject: [PATCH 1/3] raul: unstable-2019-12-09 -> 2.0.0-unstable-2024-07-04 --- .../libraries/audio/raul/default.nix | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index cd8c3d3a70f3..0a246c708b57 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,27 +1,37 @@ -{ lib, stdenv, fetchgit, boost, gtk2, pkg-config, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "raul"; - version = "unstable-2019-12-09"; - name = "${pname}-${version}"; + version = "2.0.0-unstable-2024-07-04"; - src = fetchgit { - url = "https://gitlab.com/drobilla/raul.git"; - fetchSubmodules = true; - rev = "e87bb398f025912fb989a09f1450b838b251aea1"; - sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l"; + src = fetchFromGitLab { + owner = "drobilla"; + repo = "raul"; + rev = "9097952a918f8330a5db9039ad390fc2457f841d"; + hash = "sha256-k+EU3ROVJyjJPAtNxPmRXp9DALpUHzohCLL6Xe3NUxk="; }; - nativeBuildInputs = [ pkg-config wafHook python3 ]; - buildInputs = [ boost gtk2 ]; + nativeBuildInputs = [ + meson + ninja + ]; strictDeps = true; - meta = with lib; { + meta = { description = "C++ utility library primarily aimed at audio/musical applications"; homepage = "http://drobilla.net/software/raul"; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + goibhniu + t4ccer + ]; + platforms = lib.platforms.unix; }; } From 1ab96b3b9b44216d192fc4b526ab74411dd1e897 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Tue, 16 Jul 2024 09:02:06 -0600 Subject: [PATCH 2/3] ganv: unstable-2019-12-30 -> 1.8.2-unstable-2024-07-04 --- pkgs/development/libraries/ganv/default.nix | 57 +++++++++++++++------ 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index 1e4b8436e822..e171ee03250b 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,27 +1,54 @@ -{ lib, stdenv, fetchgit, graphviz, gtk2, gtkmm2, pkg-config, python3, wafHook }: +{ + lib, + stdenv, + fetchFromGitLab, + graphviz, + gtk2, + gtkmm2, + meson, + ninja, + cmake, + pkg-config, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ganv"; - version = "unstable-2019-12-30"; + version = "1.8.2-unstable-2024-07-04"; - src = fetchgit { - url = "https://gitlab.com/drobilla/${pname}.git"; - fetchSubmodules = true; - rev = "90bd022f8909f92cc5290fdcfc76c626749e1186"; - sha256 = "01znnalirbqxpz62fbw2c14c8xn117jc92xv6dhb3hln92k9x37f"; + src = fetchFromGitLab { + owner = "drobilla"; + repo = "ganv"; + rev = "4d2e04dbcabd0b5d715ea7eeeb909f4088055763"; + hash = "sha256-DzODtYI8uwP65ck8Q90QEnjQbvPobepeQVgNZZjF+jk="; }; - nativeBuildInputs = [ pkg-config wafHook python3 gtk2 ]; - buildInputs = [ graphviz gtkmm2 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + cmake + ]; + + buildInputs = [ + gtk2 + gtkmm2 + graphviz + ]; strictDeps = true; - meta = with lib; { + # libintl detection does not work even if provided + mesonAutoFeatures = "disabled"; + + meta = { description = "Interactive Gtk canvas widget for graph-based interfaces"; mainProgram = "ganv_bench"; homepage = "http://drobilla.net"; - license = licenses.gpl3; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ + goibhniu + t4ccer + ]; + platforms = lib.platforms.linux; }; - } +} From b32b6b837ef93b83eacc23f374d06068cb4a1361 Mon Sep 17 00:00:00 2001 From: t4ccer Date: Thu, 18 Jul 2024 00:40:00 -0600 Subject: [PATCH 3/3] ingen: unstable-2019-12-09 -> 0-unstable-2024-07-13 --- pkgs/applications/audio/ingen/default.nix | 73 +++++++++++++++++------ 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index b81201cc83e4..46a4d3b7fff9 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,29 +1,60 @@ -{ lib, stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv -, lv2, pkg-config, python3, raul, serd, sord, sratom -, wafHook -, suil +{ + lib, + stdenv, + fetchFromGitLab, + portaudio, + boost, + ganv, + gtkmm2, + libjack2, + lilv, + pkg-config, + python3, + raul, + sord, + sratom, + suil, + meson, + ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ingen"; - version = "unstable-2019-12-09"; - name = "${pname}-${version}"; + version = "0-unstable-2024-07-13"; - src = fetchgit { - url = "https://gitlab.com/drobilla/ingen.git"; - rev = "e32f32a360f2bf8f017ea347b6d1e568c0beaf68"; - sha256 = "0wjn2i3j7jb0bmxymg079xpk4iplb91q0xqqnvnpvyldrr7gawlb"; - deepClone = true; + src = fetchFromGitLab { + owner = "drobilla"; + repo = "ingen"; + rev = "bbdab98ed282291b6e29a944359c360c9cca127e"; + hash = "sha256-BllWeVmEkHQaZD9Ba7H0JMRlxVROJ8pkIiC2VXYiweA="; }; - nativeBuildInputs = [ pkg-config wafHook python3 python3.pkgs.wrapPython ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + python3.pkgs.wrapPython + ]; + buildInputs = [ - boost ganv glibmm gtkmm2 libjack2 lilv lv2 - python3 raul serd sord sratom suil + boost + ganv + gtkmm2 + libjack2 + lilv + portaudio + raul + sord + sratom + suil ]; strictDeps = true; + # lv2specgen.py is not packaged in lv2 but required to build docs + mesonFlags = [ "-Ddocs=disabled" ]; + pythonPath = [ python3 python3.pkgs.rdflib @@ -31,13 +62,17 @@ stdenv.mkDerivation rec { postInstall = '' wrapPythonProgramsIn "$out/bin" "$out $pythonPath" + wrapProgram "$out/bin/ingen" --set INGEN_UI_PATH "$out/share/ingen/ingen_gui.ui" ''; - meta = with lib; { + meta = { description = "Modular audio processing system using JACK and LV2 or LADSPA plugins"; homepage = "http://drobilla.net/software/ingen"; - license = licenses.agpl3Plus; - maintainers = [ maintainers.goibhniu ]; - platforms = platforms.linux; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + goibhniu + t4ccer + ]; + platforms = lib.platforms.linux; }; }