From 32d226f7977027debb8de9ae5dfa1cb5e1953b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sun, 7 May 2023 22:07:37 +0200 Subject: [PATCH 1/8] puredata: add darwin support --- pkgs/applications/audio/puredata/default.nix | 42 +++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index ebdc0388b965..3e39f18202d2 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,8 +1,17 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gettext, makeWrapper -, alsa-lib, libjack2, tk, fftw +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gettext +, makeWrapper +, alsa-lib +, libjack2 +, tk +, fftw +, portaudio }: -stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "puredata"; version = "0.50-2"; @@ -13,18 +22,30 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; - buildInputs = [ alsa-lib libjack2 fftw ]; + buildInputs = [ + fftw + libjack2 + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ] ++ lib.optionals stdenv.isDarwin [ + portaudio + ]; configureFlags = [ - "--enable-alsa" - "--enable-jack" + "--enable-universal" "--enable-fftw" - "--disable-portaudio" - "--disable-oss" + "--enable-jack" + ] ++ lib.optionals stdenv.isLinux [ + "--enable-alsa" + ] ++ lib.optionals stdenv.isDarwin [ + "--enable-portaudio" + "--without-local-portaudio" + "--disable-jack-framework" + "--with-wish=${tk}/bin/wish8.6" ]; postInstall = '' - wrapProgram $out/bin/pd --prefix PATH : ${tk}/bin + wrapProgram $out/bin/pd --prefix PATH : ${lib.makeBinPath [ tk ]} ''; meta = with lib; { @@ -32,7 +53,8 @@ stdenv.mkDerivation rec { audio, video, and graphical processing''; homepage = "http://puredata.info"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.goibhniu ]; + mainProgram = "pd"; }; } From a23abab1427a84149e001db2f6a0a56005ecc906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sun, 7 May 2023 22:09:35 +0200 Subject: [PATCH 2/8] puredata: 0.50-2 -> 0.53-2 --- pkgs/applications/audio/puredata/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 3e39f18202d2..dcea00413de0 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "puredata"; - version = "0.50-2"; + version = "0.53-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"; + sha256 = "sha256-Z/QAHq+22cuoxwkAUN2EuBTgAMrorSosrW0ST2Mt5ok="; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.goibhniu ]; mainProgram = "pd"; + changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; }; } From 6ef4223c631541269ceb6fa2000ea1821c7012c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sat, 12 Aug 2023 15:03:35 +0200 Subject: [PATCH 3/8] cyclone: 0.3beta-2 -> 0.7-0 --- .../audio/pd-plugins/cyclone/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 03df731aef5d..3db6f176bf01 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cyclone"; - version = "0.3beta-2"; + version = "0.7-0"; src = fetchFromGitHub { owner = "porres"; repo = "pd-cyclone"; - rev = "cyclone${version}"; - sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q"; + rev = "cyclone_${version}"; + sha256 = "C+zs+xNyv6bV1LIZT2E7Yg0fyHADcHze3VpmmW/YJWg="; }; buildInputs = [ puredata ]; @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { rm -rf $out/lib ''; - meta = { + meta = with lib; { description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; - license = lib.licenses.tcltk; - maintainers = [ lib.maintainers.magnetophon ]; - platforms = lib.platforms.linux; + license = licenses.tcltk; + maintainers = [ maintainers.magnetophon maintainers.carlthome ]; + platforms = platforms.linux ++ platforms.darwin; }; } From 2be1815baf80a56b5a1cd99b5391997f2c8a56f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sat, 12 Aug 2023 15:03:54 +0200 Subject: [PATCH 4/8] puredata: 0.53-2 -> 0.54-0 --- pkgs/applications/audio/puredata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index dcea00413de0..b1c64617bff5 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "puredata"; - version = "0.53-2"; + version = "0.54-0"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "sha256-Z/QAHq+22cuoxwkAUN2EuBTgAMrorSosrW0ST2Mt5ok="; + sha256 = "6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.goibhniu ]; + maintainers = [ maintainers.goibhniu maintainers.carlthome ]; mainProgram = "pd"; changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; }; From e6832908ad8d83788d33ad97dbd5c8f6e4d72051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sat, 12 Aug 2023 15:21:44 +0200 Subject: [PATCH 5/8] gem: 2020-09-22 -> 2023-07-28 --- .../audio/pd-plugins/gem/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index fc4c08a63aa3..070cb02dc3b1 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook , pkg-config @@ -10,17 +11,18 @@ , libv4l , libX11 , file - }: +}: stdenv.mkDerivation rec { pname = "gem-unstable"; - version = "2020-09-22"; + version = "2023-07-28"; src = fetchFromGitHub { + owner = "umlaeute"; repo = "Gem"; - rev = "2edfde4f0587e72ef325e7f53681936dcc19655b"; - sha256 = "0k5sq128wxi2qhaidspkw310pdgysxs47agv09pkjgvch2n4d5dq"; + rev = "4ec12eef8716822c68f7c02a5a94668d2427037d"; + sha256 = "Y/Z7oJdKGd7+aSk8eAN9qu4ss+BOvzaXWpWGjfJqGJ8="; }; nativeBuildInputs = [ @@ -39,11 +41,11 @@ stdenv.mkDerivation rec { libX11 ]; - meta = { + meta = with lib; { description = "Graphics Environment for Multimedia"; homepage = "http://puredata.info/downloads/gem"; - license = lib.licenses.gpl2Plus; - maintainers = [ lib.maintainers.raboof ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.raboof maintainers.carlthome ]; + platforms = platforms.linux; }; } From c5a5c7d0adfa4aae1b8d142182d9f947c6b9ecc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sun, 13 Aug 2023 22:57:32 +0200 Subject: [PATCH 6/8] cyclone: mark broken --- pkgs/applications/audio/pd-plugins/cyclone/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 3db6f176bf01..da4563bad3d2 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -24,10 +24,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + broken = true; description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; license = licenses.tcltk; maintainers = [ maintainers.magnetophon maintainers.carlthome ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } From 02925a263f5a6e56aa9956998663d54c880bc4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Wed, 13 Sep 2023 11:34:51 +0200 Subject: [PATCH 7/8] cyclone: 0.7-0 -> unstable-2023-09-12 --- pkgs/applications/audio/pd-plugins/cyclone/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index da4563bad3d2..bc099b9f3ea5 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cyclone"; - version = "0.7-0"; + version = "unstable-2023-09-12"; src = fetchFromGitHub { owner = "porres"; repo = "pd-cyclone"; - rev = "cyclone_${version}"; - sha256 = "C+zs+xNyv6bV1LIZT2E7Yg0fyHADcHze3VpmmW/YJWg="; + rev = "7c470fb03db66057a2198843b635ac3f1abde84d"; + sha256 = "ixfnmeoRzV0qEOOIxCV1361t3d59fwxjHWhz9uXQ2ps="; }; buildInputs = [ puredata ]; @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = true; description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; license = licenses.tcltk; From 6e8611a7bc9fdd7d60f4052b01dc3c2790c84228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20Thom=C3=A9?= Date: Sat, 14 Oct 2023 22:56:34 +0200 Subject: [PATCH 8/8] puredata: refactor Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/applications/audio/pd-plugins/cyclone/default.nix | 4 ++-- pkgs/applications/audio/pd-plugins/gem/default.nix | 4 ++-- pkgs/applications/audio/puredata/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index bc099b9f3ea5..12efbfb64a4c 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "porres"; repo = "pd-cyclone"; rev = "7c470fb03db66057a2198843b635ac3f1abde84d"; - sha256 = "ixfnmeoRzV0qEOOIxCV1361t3d59fwxjHWhz9uXQ2ps="; + hash = "sha256-ixfnmeoRzV0qEOOIxCV1361t3d59fwxjHWhz9uXQ2ps="; }; buildInputs = [ puredata ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A library of PureData classes, bringing some level of compatibility between Max/MSP and Pd environments"; homepage = "http://puredata.info/downloads/cyclone"; license = licenses.tcltk; - maintainers = [ maintainers.magnetophon maintainers.carlthome ]; + maintainers = with maintainers; [ magnetophon carlthome ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 070cb02dc3b1..7bfdb1bd8a8a 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "umlaeute"; repo = "Gem"; rev = "4ec12eef8716822c68f7c02a5a94668d2427037d"; - sha256 = "Y/Z7oJdKGd7+aSk8eAN9qu4ss+BOvzaXWpWGjfJqGJ8="; + hash = "sha256-Y/Z7oJdKGd7+aSk8eAN9qu4ss+BOvzaXWpWGjfJqGJ8="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Graphics Environment for Multimedia"; homepage = "http://puredata.info/downloads/gem"; license = licenses.gpl2Plus; - maintainers = [ maintainers.raboof maintainers.carlthome ]; + maintainers = with maintainers; [ raboof carlthome ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index b1c64617bff5..f8df443f5c78 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; + hash = "sha256-6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.goibhniu maintainers.carlthome ]; + maintainers = with maintainers; [ goibhniu carlthome ]; mainProgram = "pd"; changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; };