diff options
author | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:01 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2019-07-25 09:23:21 +0000 |
commit | 32fbbc6f9bb1bbda436bbcc4e7bc613c9148221b (patch) | |
tree | fcc3746d350ac20ff693adb7c40f945274e4d2f6 /pkgs/applications/audio | |
parent | aabb651b23969ea4c901914db6ca34eb2897f7a0 (diff) | |
parent | b5d1d50aa90e0780c57fb4b323203ea5056be857 (diff) |
Merge master into staging
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/audio/drumkv1/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/helio-workstation/default.nix | 46 | ||||
-rw-r--r-- | pkgs/applications/audio/klystrack/default.nix | 52 | ||||
-rw-r--r-- | pkgs/applications/audio/reaper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/snd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/spotifyd/default.nix | 40 | ||||
-rw-r--r-- | pkgs/applications/audio/tree-from-tags/Gemfile | 3 | ||||
-rw-r--r-- | pkgs/applications/audio/tree-from-tags/Gemfile.lock | 13 | ||||
-rw-r--r-- | pkgs/applications/audio/tree-from-tags/default.nix | 37 | ||||
-rw-r--r-- | pkgs/applications/audio/tree-from-tags/gemset.nix | 10 |
11 files changed, 223 insertions, 6 deletions
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix new file mode 100644 index 0000000000000..45054764a10e1 --- /dev/null +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -0,0 +1,16 @@ +{ fetchurl, bitwig-studio1, + pulseaudio }: + +bitwig-studio1.overrideAttrs (oldAttrs: rec { + name = "bitwig-studio-${version}"; + version = "3.0"; + + src = fetchurl { + url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; + sha256 = "0p7wi1srfzalb0rl94vqppfbnxdfwqzgg5blkdwkf4sx977aihpv"; + }; + + runtimeDependencies = [ + pulseaudio + ]; +}) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 22613da7cabb4..f8e1db4814ccc 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "drumkv1-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${name}.tar.gz"; - sha256 = "010p8nwnmqgj5mw324psig3hxi1g2gylxrigd6sj6sgcpy3kdm23"; + sha256 = "02sa29fdjgwcf7izly685gxvga3bxyyqvskvfiisgm2xg3h9r983"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix new file mode 100644 index 0000000000000..bfd211316a7c9 --- /dev/null +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, pkgconfig, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "helio-workstation"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "helio-fm"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "16iwj4mjs1nm8dlk70q97svp3vkcgs7hdj9hfda9h67acn4a8vvk"; + }; + + buildInputs = [ + alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + ]; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + preBuild = "cd Projects/LinuxMakefile"; + buildFlags = [ "CONFIG=Release64" ]; + + installPhase = '' + mkdir -p $out/bin + install -Dm755 build/Helio $out/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + + mkdir -p $out/share + cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share + substituteInPlace $out/share/applications/Helio.desktop \ + --replace "/usr/bin/helio" "$out/bin/Helio" + ''; + + meta = with stdenv.lib; { + description = "One music sequencer for all major platforms, both desktop and mobile"; + homepage = https://helio.fm/; + license = licenses.gpl3; + maintainers = [ maintainers.suhr ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix new file mode 100644 index 0000000000000..5e8dc060c28c9 --- /dev/null +++ b/pkgs/applications/audio/klystrack/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchFromGitHub, fetchpatch +, SDL2, SDL2_image +, pkgconfig +}: + +stdenv.mkDerivation rec { + pname = "klystrack"; + version = "1.7.6"; + + src = fetchFromGitHub { + owner = "kometbomb"; + repo = pname; + rev = version; + fetchSubmodules = true; + sha256 = "1h99sm2ddaq483hhk2s3z4bjbgn0d2h7qna7l7qq98wvhqix8iyz"; + }; + + buildInputs = [ + SDL2 SDL2_image + ]; + nativeBuildInputs = [ pkgconfig ]; + + patches = [ + (fetchpatch { + url = "https://github.com/kometbomb/klystrack/commit/bb537595d02140176831c4a1b8e9121978b32d22.patch"; + sha256 = "06gl9q0jwg039kpxb13lg9x0k59s11968qn4lybgkadvzmhxkgmi"; + }) + ]; + + buildFlags = [ "PREFIX=${placeholder "out"}" "CFG=release" ]; + + installPhase = '' + install -Dm755 bin.release/klystrack $out/bin/klystrack + + mkdir -p $out/lib/klystrack + cp -R res $out/lib/klystrack + cp -R key $out/lib/klystrack + + install -DT icon/256x256.png $out/share/icons/hicolor/256x256/apps/klystrack.png + mkdir -p $out/share/applications + substitute linux/klystrack.desktop $out/share/applications/klystrack.desktop \ + --replace "klystrack %f" "$out/bin/klystrack %f" + ''; + + meta = with stdenv.lib; { + description = "A chiptune tracker"; + homepage = "https://kometbomb.github.io/klystrack"; + license = licenses.mit; + maintainers = with maintainers; [ suhr ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 0c1d91254da13..2e4658a68c987 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "reaper-${version}"; - version = "5.979"; + version = "5.980"; src = fetchurl { url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "0v9i7wgl68clwlw5k6rwligk3b3bl6c8xxabklglbxnx5i6iw5ia"; + sha256 = "0ij5cx43gf05q0d57p4slsp7wkq2cdb3ymh2n5iqgqjl9rf26h1q"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 9627e35454eef..a8896f3945b13 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.4"; + name = "snd-19.5"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1g96r1js9rfxxczpaa1ggrz7i1zsj4px4fyz64kbqawzsn9xapg9"; + sha256 = "0sk6iyykwi2mm3f1g4r0iqbsrwk3zmyagp6jjqkh8njbq42cjr1y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix new file mode 100644 index 0000000000000..5f064cf4e8855 --- /dev/null +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl +, withALSA ? true, alsaLib ? null +, withPulseAudio ? false, libpulseaudio ? null +, withPortAudio ? false, portaudio ? null +}: + +rustPlatform.buildRustPackage rec { + pname = "spotifyd"; + version = "0.2.11"; + + src = fetchFromGitHub { + owner = "Spotifyd"; + repo = "spotifyd"; + rev = "${version}"; + sha256 = "1iybk9xrrvhrcl2xl5r2xhyn1ydhrgwnnb8ldhsw5c16b32z03q1"; + }; + + cargoSha256 = "0879p1h32259schmy8j3xnwpw3sw80f8mrj8s6b5aihi3yyzz521"; + + cargoBuildFlags = [ + "--no-default-features" + "--features" + "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}" + ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optional withALSA alsaLib + ++ stdenv.lib.optional withPulseAudio libpulseaudio + ++ stdenv.lib.optional withPortAudio portaudio; + + meta = with stdenv.lib; { + description = "An open source Spotify client running as a UNIX daemon"; + homepage = "https://github.com/Spotifyd/spotifyd"; + license = with licenses; [ gpl3 ]; + maintainers = [ maintainers.anderslundstedt ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile b/pkgs/applications/audio/tree-from-tags/Gemfile new file mode 100644 index 0000000000000..24f308f3f4233 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/Gemfile @@ -0,0 +1,3 @@ +source "https://rubygems.org" + +gem "taglib-ruby" diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/applications/audio/tree-from-tags/Gemfile.lock new file mode 100644 index 0000000000000..2ef77caa6f69e --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + taglib-ruby (0.7.1) + +PLATFORMS + ruby + +DEPENDENCIES + taglib-ruby + +BUNDLED WITH + 1.16.3 diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix new file mode 100644 index 0000000000000..cdee979768cf5 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -0,0 +1,37 @@ +{ stdenv, bundlerEnv, ruby, fetchFromGitHub }: +let + version = "1.1"; + gems = bundlerEnv { + name = "tree-from-tags-${version}-gems"; + inherit ruby; + gemdir = ./.; + }; +in stdenv.mkDerivation { + name = "tree-from-tags-${version}"; + src = fetchFromGitHub { + owner = "dbrock"; + repo = "bongo"; + rev = version; + sha256 = "1nszph9mn98flyhn1jq3y6mdh6jymjkvj5ng36ql016dj92apvhv"; + }; + buildInputs = [ gems ruby ]; + installPhase = '' + mkdir -p $out/{bin,share} + cp tree-from-tags.rb $out/share/ + bin=$out/bin/tree-from-tags +# we are using bundle exec to start in the bundled environment + cat > $bin <<EOF +#!/bin/sh -e +exec ${gems}/bin/bundle exec ${ruby}/bin/ruby "$out"/share/tree-from-tags.rb "\$@" +EOF + chmod +x $bin + ''; + + meta = with stdenv.lib; { + description = "Create file hierarchies from media tags"; + homepage = https://www.emacswiki.org/emacs/Bongo; + platforms = ruby.meta.platforms; + maintainers = [ maintainers.livnev maintainers.dbrock ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/audio/tree-from-tags/gemset.nix b/pkgs/applications/audio/tree-from-tags/gemset.nix new file mode 100644 index 0000000000000..20e10e9d93b04 --- /dev/null +++ b/pkgs/applications/audio/tree-from-tags/gemset.nix @@ -0,0 +1,10 @@ +{ + taglib-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r8g7zdncc6243d000jn0grc1n70rn9mx16vggy3q7c4wgsa37xi"; + type = "gem"; + }; + version = "0.7.1"; + }; +} \ No newline at end of file |