diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 03df731aef5d..12efbfb64a4c 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 = "unstable-2023-09-12"; src = fetchFromGitHub { owner = "porres"; repo = "pd-cyclone"; - rev = "cyclone${version}"; - sha256 = "192jrq3bdsv626js1ymq10gwp9wwcszjs63ys6ap9ig8xdkbhr3q"; + rev = "7c470fb03db66057a2198843b635ac3f1abde84d"; + hash = "sha256-ixfnmeoRzV0qEOOIxCV1361t3d59fwxjHWhz9uXQ2ps="; }; 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 = 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 fc4c08a63aa3..7bfdb1bd8a8a 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"; + hash = "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 = with maintainers; [ raboof carlthome ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index ebdc0388b965..f8df443f5c78 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -1,30 +1,51 @@ -{ 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"; + version = "0.54-0"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"; + hash = "sha256-6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; }; 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,9 @@ stdenv.mkDerivation rec { audio, video, and graphical processing''; homepage = "http://puredata.info"; license = licenses.bsd3; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ goibhniu carlthome ]; + mainProgram = "pd"; + changelog = "https://msp.puredata.info/Pd_documentation/x5.htm#s1"; }; }