From 3de1c0516f8b6f30fb1533dbab08eb1111c0cd12 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 12 Dec 2020 14:13:49 +0100 Subject: open-music-kontrollers: init --- pkgs/applications/audio/eteroj.lv2/default.nix | 23 ----------- pkgs/applications/audio/lv2lint/default.nix | 22 +++++++++++ .../audio/open-music-kontrollers/eteroj.nix | 10 +++++ .../audio/open-music-kontrollers/generic.nix | 37 ++++++++++++++++++ .../audio/open-music-kontrollers/jit.nix | 12 ++++++ .../audio/open-music-kontrollers/mephisto.nix | 17 ++++++++ .../audio/open-music-kontrollers/midi_matrix.nix | 10 +++++ .../audio/open-music-kontrollers/moony.nix | 13 +++++++ .../audio/open-music-kontrollers/orbit.nix | 12 ++++++ .../audio/open-music-kontrollers/patchmatrix.nix | 13 +++++++ .../audio/open-music-kontrollers/router.nix | 11 ++++++ .../audio/open-music-kontrollers/sherlock.nix | 12 ++++++ .../audio/open-music-kontrollers/synthpod.nix | 13 +++++++ .../audio/open-music-kontrollers/vm.nix | 10 +++++ pkgs/applications/audio/patchmatrix/default.nix | 45 ---------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 20 ++++++++-- 17 files changed, 210 insertions(+), 72 deletions(-) delete mode 100644 pkgs/applications/audio/eteroj.lv2/default.nix create mode 100644 pkgs/applications/audio/lv2lint/default.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/eteroj.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/generic.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/jit.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/mephisto.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/moony.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/orbit.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/router.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/sherlock.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/synthpod.nix create mode 100644 pkgs/applications/audio/open-music-kontrollers/vm.nix delete mode 100644 pkgs/applications/audio/patchmatrix/default.nix diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix deleted file mode 100644 index ee95ce43ff5..00000000000 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuv, lv2 }: - -stdenv.mkDerivation rec { - pname = "eteroj.lv2"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "OpenMusicKontrollers"; - repo = pname; - rev = version; - sha256 = "0lzdk7hlz3vqgshrfpj0izjad1fmsnzk2vxqrry70xgz8xglvnmn"; - }; - - buildInputs = [ libuv lv2 ]; - nativeBuildInputs = [ cmake pkg-config ]; - - meta = with lib; { - description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; - homepage = "https://open-music-kontrollers.ch/lv2/eteroj"; - license = licenses.artistic2; - maintainers = with maintainers; [ magnetophon ]; - }; -} diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/applications/audio/lv2lint/default.nix new file mode 100644 index 00000000000..ada996866c8 --- /dev/null +++ b/pkgs/applications/audio/lv2lint/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, lilv, curl, libelf }: + +stdenv.mkDerivation rec { + pname = "lv2lint"; + version = "0.14.0"; + + src = fetchurl { + url = "https://git.open-music-kontrollers.ch/lv2/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-yPKM7RToLNBT+AXSjfxxpncESmv89/wcGCt//pnEGqI="; + }; + + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ lv2 lilv curl libelf ]; + + meta = with lib; { + description = "Check whether a given LV2 plugin is up to the specification"; + homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/open-music-kontrollers/eteroj.nix b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix new file mode 100644 index 00000000000..60de97ca3d0 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/eteroj.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "eteroj"; + version = "0.10.0"; + + sha256 = "18iv1sdwm0g6b53shsylj6bf3svmvvy5xadhfsgb4xg39qr07djz"; + + description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/generic.nix b/pkgs/applications/audio/open-music-kontrollers/generic.nix new file mode 100644 index 00000000000..a5ed7c41eb7 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/generic.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchurl, pkg-config, meson, ninja, libGLU, lv2, serd, sord, libX11, libXext, glew, lv2lint +, pname, version, sha256, description +, url ? "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-${version}.tar.xz" +, additionalBuildInputs ? [] +, postPatch ? "" +, ... +}: + +stdenv.mkDerivation { + inherit pname; + + inherit version; + + inherit postPatch; + + src = fetchurl { + url = url; + sha256 = sha256; + }; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + lv2 + sord + libX11 + libXext + glew + lv2lint + ] ++ additionalBuildInputs; + + meta = with lib; { + description = description; + homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/open-music-kontrollers/jit.nix b/pkgs/applications/audio/open-music-kontrollers/jit.nix new file mode 100644 index 00000000000..937a6446a8d --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/jit.nix @@ -0,0 +1,12 @@ +{ callPackage, lv2, fontconfig, libvterm-neovim, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "jit"; + version = "unstable-2021-08-15"; + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-1f5d6935049fc0dd5a4dc257b84b36d2048f2d83.tar.xz"; + sha256 = "sha256-XGICowVb0JgLJpn2h9GtViobYTdmo1LJ7/JFEyVsIqU="; + + additionalBuildInputs = [ lv2 fontconfig libvterm-neovim ]; + + description = "A Just-in-Time C/Rust compiler embedded in an LV2 plugin"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix new file mode 100644 index 00000000000..de707edd3d9 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix @@ -0,0 +1,17 @@ +{ callPackage, faust, fontconfig, cmake, libvterm-neovim, libevdev, libglvnd, fira-code, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "mephisto"; + version = "0.16.0"; + + sha256 = "0vgr3rsvdj4w0xpc5iqpvyqilk42wr9zs8bg26sfv3f2wi4hb6gx"; + + additionalBuildInputs = [ faust fontconfig cmake libvterm-neovim libevdev libglvnd fira-code ]; + + # see: https://github.com/OpenMusicKontrollers/mephisto.lv2/issues/6 + postPatch = '' + sed -i 's/llvm-c-dsp/llvm-dsp-c/g' mephisto.c + ''; + + description = "A Just-in-time FAUST embedded in an LV2 plugin"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix new file mode 100644 index 00000000000..cd431d1a1d3 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/midi_matrix.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "midi_matrix"; + version = "0.30.0"; + + sha256 = "1nwmfxdzk4pvbwcgi3d7v4flqc10bmi2fxhrhrpfa7cafqs40ib6"; + + description = "An LV2 MIDI channel matrix patcher"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/moony.nix b/pkgs/applications/audio/open-music-kontrollers/moony.nix new file mode 100644 index 00000000000..6087e055376 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/moony.nix @@ -0,0 +1,13 @@ +{ callPackage, cairo, libvterm-neovim, robodoc, cmake, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "moony"; + version = "0.40.0"; + + sha256 = "sha256-9a3gR3lV8xFFTDZD+fJPCALVztgmggzyIpsPZCOw/uY="; + + additionalBuildInputs = [ cairo libvterm-neovim robodoc cmake ]; + + description = "Realtime Lua as programmable glue in LV2"; + +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/orbit.nix b/pkgs/applications/audio/open-music-kontrollers/orbit.nix new file mode 100644 index 00000000000..930fc17760f --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/orbit.nix @@ -0,0 +1,12 @@ +{ callPackage, zlib, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "orbit"; + version = "unstable-2021-04-13"; + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-f4aa620fc8d77418856581a6a955192af15b3860.tar.xz"; + sha256 = "0z8d8h2w8fb2zx84n697jvy32dc0vf60jyiyh4gm22prgr2dvgkc"; + + additionalBuildInputs = [ zlib ]; + + description = "An LV2 time event manipulation plugin bundle"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix b/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix new file mode 100644 index 00000000000..cc343e0330c --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/patchmatrix.nix @@ -0,0 +1,13 @@ +{ callPackage, libjack2, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "patchmatrix"; + version = "0.26.0"; + + url = "https://git.open-music-kontrollers.ch/lad/${pname}/snapshot/${pname}-${version}.tar.xz"; + sha256 = "sha256-cqPHCnrAhHB6a0xmPUYOAsZfLsqnGpXEuGR1W6i6W7I="; + + additionalBuildInputs = [ libjack2 ]; + + description = "A JACK patchbay in flow matrix style"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/router.nix b/pkgs/applications/audio/open-music-kontrollers/router.nix new file mode 100644 index 00000000000..40d3a5e6fbc --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/router.nix @@ -0,0 +1,11 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "router"; + version = "unstable-2021-04-13"; + + url = "https://git.open-music-kontrollers.ch/lv2/${pname}.lv2/snapshot/${pname}.lv2-7d754dd64c540d40b828166401617715dc235ca3.tar.xz"; + sha256 = "sha256-LjaW5Xdxfjzd6IJ2ptHzmHt7fhU1HQo7ubZ4USVqRE8="; + + description = "An atom/audio/CV router LV2 plugin bundle"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/sherlock.nix b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix new file mode 100644 index 00000000000..c8ae0afd09a --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/sherlock.nix @@ -0,0 +1,12 @@ +{ callPackage, sratom, flex, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "sherlock"; + version = "0.28.0"; + + sha256 = "07zj88s1593fpw2s0r3ix7cj2icfd9zyirsyhr2i8l6d30b6n6fb"; + + additionalBuildInputs = [ sratom flex ]; + + description = "Plugins for visualizing LV2 atom, MIDI and OSC events"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix new file mode 100644 index 00000000000..4aad8aa7685 --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix @@ -0,0 +1,13 @@ +{ callPackage, lilv, libjack2, alsa-lib, zita-alsa-pcmi, libxcb, xcbutilxrm, sratom, gtk2, qt5, libvterm-neovim, robodoc, cmake,... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "synthpod"; + version = "unstable-2021-10-22"; + + url = "https://git.open-music-kontrollers.ch/lv2/synthpod/snapshot/synthpod-6f284bdad882037a522c120af92b96d8abf2de60.tar.xz"; + sha256 = "sha256-59WBlOKum5Pcmq2CfFfRHCNEa8uPCoBk0kSjFlIcypw="; + + additionalBuildInputs = [ lilv libjack2 alsa-lib zita-alsa-pcmi libxcb xcbutilxrm sratom gtk2 qt5.qtbase qt5.wrapQtAppsHook libvterm-neovim robodoc cmake ]; + + description = "Lightweight Nonlinear LV2 Plugin Container"; +}) diff --git a/pkgs/applications/audio/open-music-kontrollers/vm.nix b/pkgs/applications/audio/open-music-kontrollers/vm.nix new file mode 100644 index 00000000000..8d432d356cf --- /dev/null +++ b/pkgs/applications/audio/open-music-kontrollers/vm.nix @@ -0,0 +1,10 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + pname = "vm"; + version = "0.14.0"; + + sha256 = "013gq7jn556nkk1nq6zzh9nmp3fb36jd7ndzvyq3qryw7khzkagc"; + + description = "A programmable virtual machine LV2 plugin"; +}) diff --git a/pkgs/applications/audio/patchmatrix/default.nix b/pkgs/applications/audio/patchmatrix/default.nix deleted file mode 100644 index a5d135ce9d4..00000000000 --- a/pkgs/applications/audio/patchmatrix/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, libjack2 -, lv2 -, meson -, ninja -, pkg-config -, glew -, xorg -}: - -stdenv.mkDerivation rec { - pname = "patchmatrix"; - version = "0.26.0"; - - src = fetchFromGitHub { - owner = "OpenMusicKontrollers"; - repo = pname; - rev = version; - hash = "sha256-rR3y5rGzmib//caPmhthvMelAdHRvV0lMRfvcj9kcCg="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - glew - libjack2 - lv2 - xorg.libX11 - xorg.libXext - ]; - - meta = with lib; { - description = "A JACK patchbay in flow matrix style"; - homepage = "https://github.com/OpenMusicKontrollers/patchmatrix"; - license = licenses.artistic2; - maintainers = with maintainers; [ pennae ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c30baaac945..02a5e25ac0f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -308,6 +308,7 @@ mapAliases ({ epoxy = libepoxy; # Added 2021-11-11 esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12 etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22 + eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09 euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2"; # Added 2022-01-01 evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed"; # Added 2022-01-14 evolution_data_server = throw "'evolution_data_server' has been renamed to/replaced by 'evolution-data-server'"; # Converted to throw 2022-02-22 @@ -854,6 +855,7 @@ mapAliases ({ parity = openethereum; # Added 2020-08-01 parity-ui = throw "parity-ui was removed because it was broken and unmaintained by upstream"; # Added 2022-01-10 parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22 + patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09 pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d30f5aa539a..85229a0a30f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25503,8 +25503,6 @@ with pkgs; espeakedit = callPackage ../applications/audio/espeak/edit.nix { }; - eteroj.lv2 = libsForQt5.callPackage ../applications/audio/eteroj.lv2 { }; - etebase-server = with python3Packages; toPythonApplication etebase-server; etesync-dav = callPackage ../applications/misc/etesync-dav {}; @@ -27377,6 +27375,8 @@ with pkgs; lv2bm = callPackage ../applications/audio/lv2bm { }; + lv2lint = callPackage ../applications/audio/lv2lint/default.nix { }; + lv2-cpp-tools = callPackage ../applications/audio/lv2-cpp-tools { }; lxi-tools = callPackage ../tools/networking/lxi-tools { }; @@ -28187,6 +28187,20 @@ with pkgs; openjump = callPackage ../applications/misc/openjump { }; + open-music-kontrollers = lib.recurseIntoAttrs { + eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { }; + jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { }; + mephisto = callPackage ../applications/audio/open-music-kontrollers/mephisto.nix { }; + midi_matrix = callPackage ../applications/audio/open-music-kontrollers/midi_matrix.nix { }; + moony = callPackage ../applications/audio/open-music-kontrollers/moony.nix { }; + orbit = callPackage ../applications/audio/open-music-kontrollers/orbit.nix { }; + patchmatrix = callPackage ../applications/audio/open-music-kontrollers/patchmatrix.nix { }; + router = callPackage ../applications/audio/open-music-kontrollers/router.nix { }; + sherlock = callPackage ../applications/audio/open-music-kontrollers/sherlock.nix { }; + synthpod = callPackage ../applications/audio/open-music-kontrollers/synthpod.nix { }; + vm = callPackage ../applications/audio/open-music-kontrollers/vm.nix { }; + }; + openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; @@ -28288,8 +28302,6 @@ with pkgs; capture = callPackage ../tools/misc/capture {}; - patchmatrix = callPackage ../applications/audio/patchmatrix { }; - pbrt = callPackage ../applications/graphics/pbrt { }; pcloud = callPackage ../applications/networking/pcloud { }; -- cgit 1.4.1 From 1282a971ebb7841b5f4d30d96b22b1c4ac5f27c8 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 20 Mar 2022 19:55:01 +0100 Subject: Update pkgs/applications/audio/open-music-kontrollers/synthpod.nix --- pkgs/applications/audio/open-music-kontrollers/synthpod.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix index 4aad8aa7685..9b7964e839b 100644 --- a/pkgs/applications/audio/open-music-kontrollers/synthpod.nix +++ b/pkgs/applications/audio/open-music-kontrollers/synthpod.nix @@ -7,7 +7,7 @@ callPackage ./generic.nix (args // rec { url = "https://git.open-music-kontrollers.ch/lv2/synthpod/snapshot/synthpod-6f284bdad882037a522c120af92b96d8abf2de60.tar.xz"; sha256 = "sha256-59WBlOKum5Pcmq2CfFfRHCNEa8uPCoBk0kSjFlIcypw="; - additionalBuildInputs = [ lilv libjack2 alsa-lib zita-alsa-pcmi libxcb xcbutilxrm sratom gtk2 qt5.qtbase qt5.wrapQtAppsHook libvterm-neovim robodoc cmake ]; + additionalBuildInputs = [ lilv libjack2 alsa-lib zita-alsa-pcmi libxcb xcbutilxrm sratom gtk2 qt5.qtbase qt5.wrapQtAppsHook libvterm-neovim robodoc cmake ]; description = "Lightweight Nonlinear LV2 Plugin Container"; }) -- cgit 1.4.1