aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/audio
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/audio')
-rw-r--r--nixpkgs/pkgs/applications/audio/MMA/default.nix5
-rw-r--r--nixpkgs/pkgs/applications/audio/ams/default.nix48
-rw-r--r--nixpkgs/pkgs/applications/audio/aucatctl/default.nix37
-rw-r--r--nixpkgs/pkgs/applications/audio/cadence/default.nix41
-rw-r--r--nixpkgs/pkgs/applications/audio/cantata/default.nix6
-rw-r--r--nixpkgs/pkgs/applications/audio/carla/default.nix9
-rw-r--r--nixpkgs/pkgs/applications/audio/clementine/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/cmt/default.nix33
-rw-r--r--nixpkgs/pkgs/applications/audio/deadbeef/default.nix11
-rw-r--r--nixpkgs/pkgs/applications/audio/distrho/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix6
-rw-r--r--nixpkgs/pkgs/applications/audio/drumkv1/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/elisa/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/faust/faust2.nix58
-rw-r--r--nixpkgs/pkgs/applications/audio/faust/faust2jack.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix18
-rw-r--r--nixpkgs/pkgs/applications/audio/fomp/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/ft2-clone/default.nix30
-rw-r--r--nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix7
-rw-r--r--nixpkgs/pkgs/applications/audio/gpodder/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/kid3/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/lmms/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/lollypop/default.nix12
-rw-r--r--nixpkgs/pkgs/applications/audio/milkytracker/default.nix3
-rw-r--r--nixpkgs/pkgs/applications/audio/mopidy/default.nix10
-rw-r--r--nixpkgs/pkgs/applications/audio/mopidy/iris.nix13
-rw-r--r--nixpkgs/pkgs/applications/audio/mopidy/mpd.nix24
-rw-r--r--nixpkgs/pkgs/applications/audio/mopidy/spotify.nix10
-rw-r--r--nixpkgs/pkgs/applications/audio/musescore/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch16
-rw-r--r--nixpkgs/pkgs/applications/audio/ncspot/default.nix6
-rw-r--r--nixpkgs/pkgs/applications/audio/padthv1/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/picard/default.nix6
-rw-r--r--nixpkgs/pkgs/applications/audio/pt2-clone/default.nix30
-rw-r--r--nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix20
-rw-r--r--nixpkgs/pkgs/applications/audio/pulseeffects/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/r128gain/default.nix43
-rw-r--r--nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch31
-rw-r--r--nixpkgs/pkgs/applications/audio/redoflacs/default.nix36
-rw-r--r--nixpkgs/pkgs/applications/audio/rhythmbox/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/samplv1/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/snd/default.nix6
-rw-r--r--nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix38
-rw-r--r--nixpkgs/pkgs/applications/audio/sonic-pi/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix36
-rw-r--r--nixpkgs/pkgs/applications/audio/soundtracker/default.nix51
-rw-r--r--nixpkgs/pkgs/applications/audio/spectmorph/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/spotify-tui/default.nix9
-rw-r--r--nixpkgs/pkgs/applications/audio/spotify/default.nix8
-rw-r--r--nixpkgs/pkgs/applications/audio/spotifyd/default.nix2
-rw-r--r--nixpkgs/pkgs/applications/audio/squeezelite/default.nix52
-rw-r--r--nixpkgs/pkgs/applications/audio/sunvox/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/synthv1/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/yoshimi/default.nix4
-rw-r--r--nixpkgs/pkgs/applications/audio/zam-plugins/default.nix6
57 files changed, 646 insertions, 205 deletions
diff --git a/nixpkgs/pkgs/applications/audio/MMA/default.nix b/nixpkgs/pkgs/applications/audio/MMA/default.nix
index 42f8af99e6f..4304fe59bdf 100644
--- a/nixpkgs/pkgs/applications/audio/MMA/default.nix
+++ b/nixpkgs/pkgs/applications/audio/MMA/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }:
stdenv.mkDerivation rec {
- version = "19.08";
+ version = "20.02";
pname = "mma";
src = fetchurl {
url = "https://www.mellowood.ca/mma/mma-bin-${version}.tar.gz";
- sha256 = "02g2q9f1hbrj1v4mbf7zx2571vqpfla5803hcjpkdkvn8g0dwci0";
+ sha256 = "0i9c3f14j7wy2c86ky83f2vgmg5bihnnwsmpkq13fgqjsaf0qwnv";
};
buildInputs = [ makeWrapper python3 alsaUtils timidity ];
@@ -19,6 +19,7 @@
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec
sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py
find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g'
+ find . -type f | xargs sed -i 's@/usr/bin/python@${python3.interpreter}@g'
'';
installPhase = ''
diff --git a/nixpkgs/pkgs/applications/audio/ams/default.nix b/nixpkgs/pkgs/applications/audio/ams/default.nix
new file mode 100644
index 00000000000..e6c4fbe802e
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/ams/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchgit
+, automake
+, alsaLib
+, ladspaH
+, libjack2
+, fftw
+, zita-alsa-pcmi
+, qt5
+, pkg-config
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+ name = "ams";
+ version = "unstable-2019-04-27";
+
+ src = fetchgit {
+ url = "https://git.code.sf.net/p/alsamodular/ams.git";
+ sha256 = "0qdyz5llpa94f3qx1xi1mz97vl5jyrj1mqff28p5g9i5rxbbk8z9";
+ rev = "3250bbcfea331c4fcb9845305eebded80054973d";
+ };
+
+ nativeBuildInputs = [
+ autoreconfHook
+ pkg-config
+ qt5.wrapQtAppsHook
+ ];
+
+ buildInputs = [
+ alsaLib
+ ladspaH
+ libjack2
+ fftw
+ zita-alsa-pcmi
+ ] ++ (with qt5; [
+ qtbase
+ qttools
+ ]);
+
+ meta = with stdenv.lib; {
+ description = "Realtime modular synthesizer for ALSA";
+ homepage = "http://alsamodular.sourceforge.net";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ sjfloat ];
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/aucatctl/default.nix b/nixpkgs/pkgs/applications/audio/aucatctl/default.nix
new file mode 100644
index 00000000000..4aff3e1f7bf
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/aucatctl/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, sndio, libbsd }:
+
+stdenv.mkDerivation rec {
+ pname = "aucatctl";
+ version = "0.1";
+
+ src = fetchurl {
+ url = "http://www.sndio.org/${pname}-${version}.tar.gz";
+ sha256 = "524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0";
+ };
+
+ buildInputs = [ sndio ]
+ ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD)
+ libbsd;
+
+ outputs = [ "out" "man" ];
+
+ preBuild = ''
+ makeFlagsArray+=("PREFIX=$out")
+ '' + stdenv.lib.optionalString
+ (!stdenv.isDarwin && !stdenv.targetPlatform.isBSD) ''
+ makeFlagsArray+=(LDADD="-lsndio -lbsd")
+
+ # Fix warning about implicit declaration of function 'strlcpy'
+ substituteInPlace aucatctl.c \
+ --replace '#include <string.h>' '#include <bsd/string.h>'
+ '';
+
+ meta = with stdenv.lib; {
+ description =
+ "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes";
+ homepage = "http://www.sndio.org";
+ license = licenses.isc;
+ maintainers = with maintainers; [ sna ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/cadence/default.nix b/nixpkgs/pkgs/applications/audio/cadence/default.nix
index 52f5a6540e8..7aa2872224d 100644
--- a/nixpkgs/pkgs/applications/audio/cadence/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cadence/default.nix
@@ -1,15 +1,23 @@
{ stdenv
-, mkDerivation
+, a2jmidid
+, coreutils
, lib
+, libjack2
, fetchpatch
, fetchzip
+, jack_capture
, pkgconfig
+, pulseaudioFull
, qtbase
, makeWrapper
-, python3Packages
+, mkDerivation
+, python3
}:
+#ladish missing, claudia can't work.
+#pulseaudio needs fixes (patchShebangs .pa ...)
+#desktop needs icons and exec fixing.
- mkDerivation rec {
+mkDerivation rec {
version = "0.9.1";
pname = "cadence";
@@ -26,12 +34,26 @@
})
];
+ postPatch = ''
+ libjackso=$(realpath ${lib.makeLibraryPath [libjack2]}/libjack.so.0);
+ substituteInPlace ./src/jacklib.py --replace libjack.so.0 $libjackso
+ substituteInPlace ./src/cadence.py --replace "/usr/bin/pulseaudio" \
+ "${lib.makeBinPath[pulseaudioFull]}/pulseaudio"
+ substituteInPlace ./c++/jackbridge/JackBridge.cpp --replace libjack.so.0 $libjackso
+ '';
+
nativeBuildInputs = [
pkgconfig
];
buildInputs = [
qtbase
+ jack_capture
+ pulseaudioFull
+ ((python3.withPackages (ps: with ps; [
+ pyqt5
+ dbus-python
+ ])))
];
makeFlags = [
@@ -39,10 +61,6 @@
"SYSCONFDIR=${placeholder "out"}/etc"
];
- propagatedBuildInputs = with python3Packages; [
- pyqt5_with_qtwebkit
- ];
-
dontWrapQtApps = true;
# Replace with our own wrappers. They need to be changed manually since it wouldn't work otherwise.
@@ -65,10 +83,11 @@
};
in lib.mapAttrsToList (script: source: ''
rm -f ${script}
- makeWrapper ${python3Packages.python.interpreter} ${script} \
- --set PYTHONPATH "$PYTHONPATH:${outRef}/share/cadence" \
- ''${qtWrapperArgs[@]} \
- --add-flags "-O ${source}"
+ makeQtWrapper ${source} ${script} \
+ --prefix PATH : "${lib.makeBinPath [
+ jack_capture # cadence-render
+ pulseaudioFull # cadence, cadence-session-start
+ ]}"
'') scriptAndSource;
meta = {
diff --git a/nixpkgs/pkgs/applications/audio/cantata/default.nix b/nixpkgs/pkgs/applications/audio/cantata/default.nix
index 876889416da..cd1783ff685 100644
--- a/nixpkgs/pkgs/applications/audio/cantata/default.nix
+++ b/nixpkgs/pkgs/applications/audio/cantata/default.nix
@@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
- version = "2.3.3";
+ version = "2.4.1";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
@@ -42,7 +42,7 @@ in mkDerivation {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
- sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f";
+ sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c";
};
buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
@@ -77,7 +77,7 @@ in mkDerivation {
];
meta = with lib; {
- homepage = https://github.com/cdrummond/cantata;
+ homepage = "https://github.com/cdrummond/cantata";
description = "A graphical client for MPD";
license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
diff --git a/nixpkgs/pkgs/applications/audio/carla/default.nix b/nixpkgs/pkgs/applications/audio/carla/default.nix
index 98a4ddd29d6..6641e99e491 100644
--- a/nixpkgs/pkgs/applications/audio/carla/default.nix
+++ b/nixpkgs/pkgs/applications/audio/carla/default.nix
@@ -39,12 +39,15 @@ stdenv.mkDerivation rec {
++ optional withGtk2 gtk2
++ optional withGtk3 gtk3;
+ enableParallelBuilding = true;
+
installFlags = [ "PREFIX=$(out)" ];
dontWrapQtApps = true;
postFixup = ''
# Also sets program_PYTHONPATH and program_PATH variables
wrapPythonPrograms
+ wrapPythonProgramsIn "$out/share/carla/resources" "$out $pythonPath"
find "$out/share/carla" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
patchPythonScript "$f"
@@ -56,6 +59,12 @@ stdenv.mkDerivation rec {
--prefix PATH : "$program_PATH:${which}/bin" \
--set PYTHONNOUSERSITE true
done
+
+ find "$out/share/carla/resources" -maxdepth 1 -type f -not -name "*.py" -print0 | while read -d "" f; do
+ wrapQtApp "$f" \
+ --prefix PATH : "$program_PATH:${which}/bin" \
+ --set PYTHONNOUSERSITE true
+ done
'';
meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/applications/audio/clementine/default.nix b/nixpkgs/pkgs/applications/audio/clementine/default.nix
index 3fdf98da325..479f2a16fd8 100644
--- a/nixpkgs/pkgs/applications/audio/clementine/default.nix
+++ b/nixpkgs/pkgs/applications/audio/clementine/default.nix
@@ -125,7 +125,7 @@ let
mkdir -p $out/share
for dir in applications icons kde4; do
- ln -s "$free/share/$dir" "$out/share/$dir"
+ ln -s "${free}/share/$dir" "$out/share/$dir"
done
'';
enableParallelBuilding = true;
diff --git a/nixpkgs/pkgs/applications/audio/cmt/default.nix b/nixpkgs/pkgs/applications/audio/cmt/default.nix
new file mode 100644
index 00000000000..96cc3c57319
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/cmt/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchurl
+, ladspaH
+}:
+
+stdenv.mkDerivation rec {
+ name = "cmt";
+ version = "1.17";
+
+ src = fetchurl {
+ url = "http://www.ladspa.org/download/${name}_${version}.tgz";
+ sha256 = "07xd0xmwpa0j12813jpf87fr9hwzihii5l35mp8ady7xxfmxfmpb";
+ };
+
+ buildInputs = [ ladspaH ];
+
+ preBuild = ''
+ cd src
+ '';
+
+ installFlags = [ "INSTALL_PLUGINS_DIR=${placeholder "out"}/lib/ladspa" ];
+ preInstall = ''
+ mkdir -p $out/lib/ladspa
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Computer Music Toolkit";
+ homepage = "https://www.ladspa.org/cmt";
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ sjfloat ];
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/deadbeef/default.nix b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
index a6ca5b3639d..2df6b9931cf 100644
--- a/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
+++ b/nixpkgs/pkgs/applications/audio/deadbeef/default.nix
@@ -59,22 +59,15 @@ assert remoteSupport -> curl != null;
stdenv.mkDerivation rec {
pname = "deadbeef";
- version = "1.8.0";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "DeaDBeeF-Player";
repo = "deadbeef";
rev = version;
- sha256 = "126i5qlkpv7pvi1mmc9y0jhqs6jjspsj7j615n2ddvsb2jsps81c";
+ sha256 = "016wwnh5jqdcfxn1ff6in5dz73c3gdhh3fva8inq7sc3vzdz5khj";
};
- patches = [
- # Fix broken symbol name
- # https://github.com/NixOS/nixpkgs/pull/59187#issuecomment-480977993
- # will be fixed in deadbeef 1.8.1
- ./fix-wildmidi.patch
- ];
-
buildInputs = with stdenv.lib; [ jansson ]
++ optional gtk2Support gtk2
++ optionals gtk3Support [ gtk3 gsettings-desktop-schemas ]
diff --git a/nixpkgs/pkgs/applications/audio/distrho/default.nix b/nixpkgs/pkgs/applications/audio/distrho/default.nix
index 53d5330fb74..36f7dcc5993 100644
--- a/nixpkgs/pkgs/applications/audio/distrho/default.nix
+++ b/nixpkgs/pkgs/applications/audio/distrho/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
runHook postConfigure
'';
- patchPhase = ''
+ postPatch = ''
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';
diff --git a/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
index da915f3fc3e..1ce7115ad85 100644
--- a/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
+++ b/nixpkgs/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "dragonfly-reverb";
- version = "2.0.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "michaelwillis";
repo = "dragonfly-reverb";
rev = version;
- sha256 = "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72";
+ sha256 = "1z2x33lzpd26dv1p29ca7vy8mjfzkfpin35iq46spwd9k3sqn1ja";
fetchSubmodules = true;
};
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib/lv2/
mkdir -p $out/lib/vst/
cd bin
- for bin in DragonflyHallReverb DragonflyRoomReverb; do
+ for bin in DragonflyEarlyReflections DragonflyPlateReverb DragonflyHallReverb DragonflyRoomReverb; do
cp -a $bin $out/bin/
cp -a $bin-vst.so $out/lib/vst/
cp -a $bin.lv2/ $out/lib/lv2/ ;
diff --git a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
index b926ff09d22..d3399315376 100644
--- a/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "drumkv1";
- version = "0.9.11";
+ version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz";
- sha256 = "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7";
+ sha256 = "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/nixpkgs/pkgs/applications/audio/elisa/default.nix b/nixpkgs/pkgs/applications/audio/elisa/default.nix
index fdfca08c0b0..1d56ce089d9 100644
--- a/nixpkgs/pkgs/applications/audio/elisa/default.nix
+++ b/nixpkgs/pkgs/applications/audio/elisa/default.nix
@@ -7,13 +7,13 @@
mkDerivation rec {
pname = "elisa";
- version = "19.12.0";
+ version = "19.12.3";
src = fetchFromGitHub {
owner = "KDE";
repo = "elisa";
rev = "v${version}";
- sha256 = "1939xwhy1s502pai63vz56hnnsl3qsb6arhrlg5bw6bwsv88blac";
+ sha256 = "0s1sixkrx4czckzg0llkrbp8rp397ljsq1c309z23m277jsmnnb6";
};
buildInputs = [ vlc ];
diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2.nix b/nixpkgs/pkgs/applications/audio/faust/faust2.nix
index 21cd3fbdb25..74a5f4d383d 100644
--- a/nixpkgs/pkgs/applications/audio/faust/faust2.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2.nix
@@ -3,25 +3,30 @@
, fetchFromGitHub
, makeWrapper
, pkgconfig
+, cmake
, llvm
, emscripten
, openssl
, libsndfile
, libmicrohttpd
+, gnutls
+, libtasn1
+, p11-kit
, vim
+, which
}:
with stdenv.lib.strings;
let
- version = "2.5.23";
+ version = "2.20.2";
src = fetchFromGitHub {
owner = "grame-cncm";
repo = "faust";
rev = version;
- sha256 = "1pci8ac6sqrm3mb3yikmmr3iy35g3nj4iihazif1amqkbdz719rc";
+ sha256 = "08hv8gyj6c83128z3si92r1ka5ckf9sdpn5jdnlhrqyzja4mrxsy";
fetchSubmodules = true;
};
@@ -40,8 +45,8 @@ let
inherit src;
- nativeBuildInputs = [ makeWrapper pkgconfig vim ];
- buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd ];
+ nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ];
+ buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ];
passthru = {
@@ -50,39 +55,13 @@ let
preConfigure = ''
- makeFlags="$makeFlags prefix=$out LLVM_CONFIG='${llvm}/bin/llvm-config' world"
-
- # The faust makefiles use 'system ?= $(shell uname -s)' but nix
- # defines 'system' env var, so undefine that so faust detects the
- # correct system.
- unset system
- # sed -e "232s/LLVM_STATIC_LIBS/LLVMLIBS/" -i compiler/Makefile.unix
-
- # The makefile sets LLVM_<version> depending on the current llvm
- # version, but the detection code is quite brittle.
- #
- # Failing to properly detect the llvm version means that the macro
- # LLVM_VERSION ends up being the raw output of `llvm-config --version`, while
- # the code assumes that it's set to a symbol like `LLVM_35`. Two problems result:
- # * <command-line>:0:1: error: macro names must be identifiers.; and
- # * a bunch of undefined reference errors due to conditional definitions relying on
- # LLVM_XY being defined.
- #
- # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION
- # to something the makefile will recognize.
- sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix
+ cd build
'';
- postPatch = ''
- # fix build with llvm 5.0.2 by adding it to the list of known versions
- # TODO: check if still needed on next update
- substituteInPlace compiler/Makefile.unix \
- --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2"
+ cmakeFlags = ''
+ -C ../backends/all.cmake -C ../targets/all.cmake ..
'';
- # Remove most faust2appl scripts since they won't run properly
- # without additional paths setup. See faust.wrap,
- # faust.wrapWithBuildEnv.
postInstall = ''
# syntax error when eval'd directly
pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))"
@@ -90,10 +69,6 @@ let
'';
postFixup = ''
- # Set faustpath explicitly.
- substituteInPlace "$out"/bin/faustpath \
- --replace "/usr/local /usr /opt /opt/local" "$out"
-
# The 'faustoptflags' is 'source'd into other faust scripts and
# not used as an executable, so patch 'uname' usage directly
# rather than use makeWrapper.
@@ -160,8 +135,6 @@ let
# 'faustoptflags' to absolute paths.
for script in "$out"/bin/*; do
substituteInPlace "$script" \
- --replace ". faustpath" ". '${faust}/bin/faustpath'" \
- --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" \
--replace " error " "echo"
done
'';
@@ -200,19 +173,22 @@ let
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
+ libPath = stdenv.lib.makeLibraryPath propagatedBuildInputs;
postFixup = ''
# export parts of the build environment
for script in "$out"/bin/*; do
wrapProgram "$script" \
+ --set FAUSTLDDIR "${faust}/lib" \
--set FAUSTLIB "${faust}/share/faust" \
- --set FAUST_LIB_PATH "${faust}/share/faust" \
--set FAUSTINC "${faust}/include/faust" \
+ --set FAUSTARCH "${faust}/share/faust" \
--prefix PATH : "$PATH" \
--prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \
--set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \
- --set NIX_LDFLAGS "$NIX_LDFLAGS"
+ --set NIX_LDFLAGS "$NIX_LDFLAGS -lpthread" \
+ --prefix LIBRARY_PATH $libPath
done
'';
});
diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
index 7762ca39369..f032f435a35 100644
--- a/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2jack.nix
@@ -1,6 +1,7 @@
{ faust
, gtk2
, jack2Full
+, alsaLib
, opencv
, libsndfile
}:
@@ -18,6 +19,7 @@ faust.wrapWithBuildEnv {
propagatedBuildInputs = [
gtk2
jack2Full
+ alsaLib
opencv
libsndfile
];
diff --git a/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix b/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix
new file mode 100644
index 00000000000..2562237424e
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/faust/faust2jackrust.nix
@@ -0,0 +1,18 @@
+{ stdenv
+, faust
+, libjack2
+, cargo
+, binutils
+, gcc
+, gnumake
+, openssl
+, pkgconfig
+
+}:
+
+faust.wrapWithBuildEnv {
+
+ baseName = "faust2jackrust";
+
+ propagatedBuildInputs = [ libjack2 cargo binutils gcc gnumake openssl pkgconfig ];
+}
diff --git a/nixpkgs/pkgs/applications/audio/fomp/default.nix b/nixpkgs/pkgs/applications/audio/fomp/default.nix
index a92d331baad..9f7f0b09007 100644
--- a/nixpkgs/pkgs/applications/audio/fomp/default.nix
+++ b/nixpkgs/pkgs/applications/audio/fomp/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "fomp";
- version = "1.0.0";
+ version = "1.2.0";
src = fetchurl {
url = "https://download.drobilla.net/${pname}-${version}.tar.bz2";
- sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
+ sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw";
};
nativeBuildInputs = [ pkgconfig wafHook ];
diff --git a/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
new file mode 100644
index 00000000000..5bebf1c667c
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, alsaLib
+, SDL2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "ft2-clone";
+ version = "1.09";
+
+ src = fetchFromGitHub {
+ owner = "8bitbubsy";
+ repo = "ft2-clone";
+ rev = "v${version}";
+ sha256 = "18my7fywaf66rq8phsly8lglxzpglran8rj27fvwgpni8098ic7d";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
+
+ meta = with stdenv.lib; {
+ description = "A highly accurate clone of the classic Fasttracker II software for MS-DOS";
+ homepage = "https://16-bits.org/ft2.php";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
index 7a44ebe6769..47945de7833 100644
--- a/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gnome-podcasts/default.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0vy5i77bv8c22ldhrnr4z6kx22zqnb1lg3s7y8673bqjgd7dppi0";
};
- cargoSha256 = "1h0n8zclb8a1b1ri83viiwwzlj3anm38m4cp38aqyf6q40qga35q";
+ cargoSha256 = "1dlbdxsf9p2jzrsclm43k95y8m3zcd41qd9ajg1ii3fpnahi58kd";
nativeBuildInputs = [
meson
diff --git a/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index b51b72f1c8a..332f2ca2342 100644
--- a/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/nixpkgs/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
+{ stdenv, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
, nss, pango, udev, xorg
}:
let
- version = "4.6.1";
+ version = "4.7.1";
deps = [
alsaLib
atk
+ at-spi2-atk
cairo
cups
dbus
@@ -48,7 +49,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
- sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g";
+ sha256 = "1ljm9c5sv6wa7pa483yq03wq9j1h1jdh8363z5m2imz407yzgm5r";
};
dontBuild = true;
diff --git a/nixpkgs/pkgs/applications/audio/gpodder/default.nix b/nixpkgs/pkgs/applications/audio/gpodder/default.nix
index 1d6bc33cc55..332a633616c 100644
--- a/nixpkgs/pkgs/applications/audio/gpodder/default.nix
+++ b/nixpkgs/pkgs/applications/audio/gpodder/default.nix
@@ -5,14 +5,14 @@
python3Packages.buildPythonApplication rec {
pname = "gpodder";
- version = "3.10.12";
+ version = "3.10.13";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "0q95am079gg01dkivr972mm2k87y8z296a9yf7amzsf9hxfycdra";
+ sha256 = "1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg";
};
patches = [
diff --git a/nixpkgs/pkgs/applications/audio/kid3/default.nix b/nixpkgs/pkgs/applications/audio/kid3/default.nix
index 5571b12f3ef..dcd305abdee 100644
--- a/nixpkgs/pkgs/applications/audio/kid3/default.nix
+++ b/nixpkgs/pkgs/applications/audio/kid3/default.nix
@@ -9,11 +9,11 @@
stdenv.mkDerivation rec {
pname = "kid3";
- version = "3.8.1";
+ version = "3.8.2";
src = fetchurl {
url = "mirror://sourceforge/project/kid3/kid3/${version}/${pname}-${version}.tar.gz";
- sha256 = "1d2lr500dx7gnxw2vrvpbhadpn313ly3zyp178864z26dnfkjv8x";
+ sha256 = "051y77swpi9isx275gwzl4fn3igd2dmixbszv9m3h0h9lqhcjrvr";
};
nativeBuildInputs = [ wrapQtAppsHook ];
diff --git a/nixpkgs/pkgs/applications/audio/lmms/default.nix b/nixpkgs/pkgs/applications/audio/lmms/default.nix
index 99503fc3942..0420a52d89b 100644
--- a/nixpkgs/pkgs/applications/audio/lmms/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lmms/default.nix
@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "lmms";
- version = "1.2.0-rc7";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "LMMS";
repo = "lmms";
rev = "v${version}";
- sha256 = "1hshzf2sbdfw37y9rz1ksgvn81kp2n23dp74lsaasc2n7wzjwdis";
+ sha256 = "08k2nfj0rw9mahr7pr90n79wviqmjmflrgcljc6y3x30v84wbp26";
fetchSubmodules = true;
};
diff --git a/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
index 2d2062696d7..ddb4646ba54 100644
--- a/nixpkgs/pkgs/applications/audio/lollypop/default.nix
+++ b/nixpkgs/pkgs/applications/audio/lollypop/default.nix
@@ -12,6 +12,10 @@
, desktop-file-utils
, totem-pl-parser
, gobject-introspection
+, glib-networking
+, gdk-pixbuf
+, glib
+, pango
, wrapGAppsHook
, lastFMSupport ? true
, youtubeSupport ? true
@@ -19,7 +23,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "lollypop";
- version = "1.2.16";
+ version = "1.2.23";
format = "other";
doCheck = false;
@@ -28,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
url = "https://gitlab.gnome.org/World/lollypop";
rev = "refs/tags/${version}";
fetchSubmodules = true;
- sha256 = "0rl4a5npjh5sm3kih11cs2j7ik894nlygllbw4j5pn9n9v66x51w";
+ sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47";
};
nativeBuildInputs = [
@@ -42,6 +46,9 @@ python3.pkgs.buildPythonApplication rec {
];
buildInputs = with gst_all_1; [
+ gdk-pixbuf
+ glib
+ glib-networking
gst-libav
gst-plugins-bad
gst-plugins-base
@@ -50,6 +57,7 @@ python3.pkgs.buildPythonApplication rec {
gstreamer
gtk3
libsoup
+ pango
totem-pl-parser
] ++ lib.optional lastFMSupport libsecret;
diff --git a/nixpkgs/pkgs/applications/audio/milkytracker/default.nix b/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
index 7f86e2c2071..bc508f92e3b 100644
--- a/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
+++ b/nixpkgs/pkgs/applications/audio/milkytracker/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 alsaLib libjack2 lhasa perl rtmidi zlib zziplib ];
+ # Somehow this does not get set automatically
+ cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
+
meta = with stdenv.lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = http://milkytracker.org;
diff --git a/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/nixpkgs/pkgs/applications/audio/mopidy/default.nix
index 2df54fa7fb4..c1c8bb964e4 100644
--- a/nixpkgs/pkgs/applications/audio/mopidy/default.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook
+{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook
, gst_all_1, glib-networking, gobject-introspection
}:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "mopidy";
- version = "2.3.1";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "mopidy";
repo = "mopidy";
rev = "v${version}";
- sha256 = "1qdflxr0an6l2m3j90h55bzyj7rjlkkwmxx945hwv8xi472rcgdj";
+ sha256 = "0fpjprjw143ixak68iwxjpscdjgyb7rsr1cxj7fsdrw6hc83nq4z";
};
nativeBuildInputs = [ wrapGAppsHook ];
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
glib-networking gobject-introspection
];
- propagatedBuildInputs = with pythonPackages; [
+ propagatedBuildInputs = with python3Packages; [
gst-python pygobject3 pykka tornado_4 requests setuptools
] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python;
diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
index 88cdde2ceb2..000a0bc0bfe 100644
--- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix
@@ -1,18 +1,17 @@
-{ stdenv, pythonPackages, mopidy, mopidy-local-images }:
+{ stdenv, python3Packages, mopidy, mopidy-local-images }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "Mopidy-Iris";
- version = "3.43.0";
+ version = "3.46.0";
- src = pythonPackages.fetchPypi {
+ src = python3Packages.fetchPypi {
inherit pname version;
- sha256 = "1qg9xyjf27dp0810h4kdliyfb8r3kvi37lq8r93d01xwfphdzs05";
+ sha256 = "0c7b6zbcj4bq5qsxvhjwqclrl1k2hs3wb50pfjbw7gs7m3gm2b7d";
};
propagatedBuildInputs = [
mopidy
- mopidy-local-images
- ] ++ (with pythonPackages; [
+ ] ++ (with python3Packages; [
configobj
requests
tornado_4
diff --git a/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix b/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix
new file mode 100644
index 00000000000..4dd32ea3aa3
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/mopidy/mpd.nix
@@ -0,0 +1,24 @@
+{ stdenv, python3Packages, mopidy }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "Mopidy-MPD";
+ version = "3.0.0";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0prjli4352521igcsfcgmk97jmzgbfy4ik8hnli37wgvv252wiac";
+ };
+
+ propagatedBuildInputs = [mopidy];
+
+ # no tests implemented
+ doCheck = false;
+ pythonImportsCheck = [ "mopidy_mpd" ];
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/mopidy/mopidy-mpd";
+ description = "Mopidy extension for controlling playback from MPD clients";
+ license = licenses.asl20;
+ maintainers = [ maintainers.tomahna ];
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix
index 483852455aa..a01bf6c80d3 100644
--- a/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix
+++ b/nixpkgs/pkgs/applications/audio/mopidy/spotify.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pythonPackages, mopidy }:
+{ stdenv, fetchurl, python3Packages, mopidy }:
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
pname = "mopidy-spotify";
- version = "3.1.0";
+ version = "4.0.1";
src = fetchurl {
url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
- sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl";
+ sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f";
};
- propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
+ propagatedBuildInputs = [ mopidy python3Packages.pyspotify ];
doCheck = false;
diff --git a/nixpkgs/pkgs/applications/audio/musescore/default.nix b/nixpkgs/pkgs/applications/audio/musescore/default.nix
index 5368fcb6165..7ef6328c02c 100644
--- a/nixpkgs/pkgs/applications/audio/musescore/default.nix
+++ b/nixpkgs/pkgs/applications/audio/musescore/default.nix
@@ -6,11 +6,11 @@
mkDerivation rec {
pname = "musescore";
- version = "3.2.3";
+ version = "3.4.2";
src = fetchzip {
url = "https://github.com/musescore/MuseScore/releases/download/v${version}/MuseScore-${version}.zip";
- sha256 = "17mr0c8whw6vz86lp1j36rams4h8virc4z68fld0q3rpq6g05szs";
+ sha256 = "1laskvp40dncs12brkgvk7wl0qrvzy52rn7nf3b67ps1vmd130gp";
stripRoot = false;
};
diff --git a/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
index 53a0c90ce46..57a6092d585 100644
--- a/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
+++ b/nixpkgs/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
@@ -1,12 +1,9 @@
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -660,22 +660,6 @@ if (MINGW)
- else (MINGW)
-
- if ( NOT MSVC )
--## install qwebengine core
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -220,16 +219,0 @@ else (MINGW)
+- ## install qwebengine core
- if (NOT APPLE AND USE_WEBENGINE)
-- install(FILES
+- install(PROGRAMS
- ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
- DESTINATION bin
- )
@@ -20,6 +17,3 @@
- )
- endif(NOT APPLE AND USE_WEBENGINE)
-
- target_link_libraries(mscore
- ${ALSA_LIB}
- ${QT_LIBRARIES}
diff --git a/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/nixpkgs/pkgs/applications/audio/ncspot/default.nix
index 136f6fc1427..0d8fd8e2637 100644
--- a/nixpkgs/pkgs/applications/audio/ncspot/default.nix
+++ b/nixpkgs/pkgs/applications/audio/ncspot/default.nix
@@ -12,16 +12,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "ncspot";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
- sha256 = "0ldisr45w6ys1j62qv99ssqfg5q9dwrrzxh2maggyrx1zqdlsk6m";
+ sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k";
};
- cargoSha256 = "0k765hinqxfm30li1z66m1chsv69v6hiz109q2zlkxzg937qbnjh";
+ cargoSha256 = "0081wc3xw11hivz0nwy4my3y4a53ch857bq989dr0pm9p2pirvj1";
cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ];
diff --git a/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/nixpkgs/pkgs/applications/audio/padthv1/default.nix
index 6d97a2da739..0cb0f00844e 100644
--- a/nixpkgs/pkgs/applications/audio/padthv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/padthv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "padthv1";
- version = "0.9.11";
+ version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz";
- sha256 = "02yfwyirjqxa075yqdnci9b9k57kdmkjvn9gnpdbnjp887pds76g";
+ sha256 = "1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
diff --git a/nixpkgs/pkgs/applications/audio/picard/default.nix b/nixpkgs/pkgs/applications/audio/picard/default.nix
index b40ab6d4f7a..b241f750d03 100644
--- a/nixpkgs/pkgs/applications/audio/picard/default.nix
+++ b/nixpkgs/pkgs/applications/audio/picard/default.nix
@@ -4,13 +4,13 @@ let
pythonPackages = python3Packages;
in pythonPackages.buildPythonApplication rec {
pname = "picard";
- version = "2.2.3";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "metabrainz";
repo = pname;
rev = "release-${version}";
- sha256 = "0lb4pzl03mr5hrzrzva99rxqd5yfip62b7sjmlg4j0imw8mxaj16";
+ sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj";
};
nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ];
@@ -33,7 +33,7 @@ in pythonPackages.buildPythonApplication rec {
'';
meta = with stdenv.lib; {
- homepage = http://musicbrainz.org/doc/MusicBrainz_Picard;
+ homepage = "https://picard.musicbrainz.org/";
description = "The official MusicBrainz tagger";
maintainers = with maintainers; [ ehmry ];
license = licenses.gpl2;
diff --git a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix
new file mode 100644
index 00000000000..f659d20f463
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix
@@ -0,0 +1,30 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, alsaLib
+, SDL2
+}:
+
+stdenv.mkDerivation rec {
+ pname = "pt2-clone";
+ version = "1.06";
+
+ src = fetchFromGitHub {
+ owner = "8bitbubsy";
+ repo = "pt2-clone";
+ rev = "v${version}";
+ sha256 = "00zifwiprd3i60z4pf4471jxbc33vh9p30ib0lnzwpgjz5pnxqnr";
+ };
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ SDL2 ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
+
+ meta = with stdenv.lib; {
+ description = "A highly accurate clone of the classic ProTracker 2.3D software for Amiga";
+ homepage = "https://16-bits.org/pt2.php";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ };
+}
+
diff --git a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
index a9f56cca001..75990d593df 100644
--- a/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -16,10 +16,10 @@ assert vorbisSupport -> vorbisTools != null;
let
zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
-
-in pythonPackages.buildPythonApplication {
+in
+pythonPackages.buildPythonApplication {
pname = "pulseaudio-dlna";
- version = "2017-11-01";
+ version = "unstable-2017-11-01";
src = fetchFromGitHub {
owner = "masmu";
@@ -28,12 +28,9 @@ in pythonPackages.buildPythonApplication {
sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
};
- # pulseaudio-dlna has no tests
- doCheck = false;
-
propagatedBuildInputs = with pythonPackages; [
dbus-python docopt requests setproctitle protobuf psutil futures
- chardet notify2 netifaces pyroute2 pygobject2 lxml ]
+ chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ]
++ [ zeroconf ]
++ stdenv.lib.optional mp3Support lame
++ stdenv.lib.optional opusSupport opusTools
@@ -42,12 +39,15 @@ in pythonPackages.buildPythonApplication {
++ stdenv.lib.optional soxSupport sox
++ stdenv.lib.optional vorbisSupport vorbisTools;
+ # upstream has no tests
+ checkPhase = ''
+ $out/bin/pulseaudio-dlna --help > /dev/null
+ '';
+
meta = with stdenv.lib; {
description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux";
- homepage = https://github.com/masmu/pulseaudio-dlna;
-
+ homepage = "https://github.com/masmu/pulseaudio-dlna";
license = licenses.gpl3Plus;
-
maintainers = with maintainers; [ mog ];
platforms = platforms.linux;
};
diff --git a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
index 31e19154862..00c5af4422d 100644
--- a/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
+++ b/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix
@@ -46,13 +46,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "pulseeffects";
- version = "4.7.0";
+ version = "4.7.1";
src = fetchFromGitHub {
owner = "wwmm";
repo = "pulseeffects";
rev = "v${version}";
- sha256 = "1cpiill24c54sy97xm1r0sqqpxj6ar40pnnwb72qs8b9zzci920r";
+ sha256 = "1r1hk5zp2cgrwyqkvp8kg2dkbihdyx3ydzhmirkwya8jag9pwadd";
};
nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/applications/audio/r128gain/default.nix b/nixpkgs/pkgs/applications/audio/r128gain/default.nix
new file mode 100644
index 00000000000..fb2b3063276
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/r128gain/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, fetchFromGitHub
+, substituteAll
+, ffmpeg
+, python3Packages
+, sox
+}:
+
+python3Packages.buildPythonApplication rec {
+ pname = "r128gain";
+ version = "1.0.1";
+
+ src = fetchFromGitHub {
+ owner = "desbma";
+ repo = "r128gain";
+ rev = version;
+ sha256 = "0fnxis2g7mw8mb0cz9bws909lrndli7ml54nnzda49vc2fhbjwxr";
+ };
+
+ patches = [
+ (
+ substituteAll {
+ src = ./ffmpeg-location.patch;
+ inherit ffmpeg;
+ }
+ )
+ ];
+
+ propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ];
+ checkInputs = with python3Packages; [ requests sox ];
+
+ # Testing downloads media files for testing, which requires the
+ # sandbox to be disabled.
+ doCheck = false;
+
+ meta = with lib; {
+ description = "Fast audio loudness scanner & tagger (ReplayGain v2 / R128)";
+ homepage = "https://github.com/desbma/r128gain";
+ license = licenses.lgpl2Plus;
+ maintainers = [ maintainers.AluisioASG ];
+ platforms = platforms.all;
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch
new file mode 100644
index 00000000000..ff118024011
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/r128gain/ffmpeg-location.patch
@@ -0,0 +1,31 @@
+diff --git i/r128gain/__init__.py w/r128gain/__init__.py
+index 53fc3ef..f144e15 100755
+--- i/r128gain/__init__.py
++++ w/r128gain/__init__.py
+@@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None):
+ Example: 0x3040100 for FFmpeg 3.4.1
+ """
+ r = collections.OrderedDict()
+- cmd = (ffmpeg_path or "ffmpeg", "-version")
++ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version")
+ output = subprocess.run(cmd,
+ check=True,
+ stdout=subprocess.PIPE,
+@@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin
+ os.devnull,
+ **additional_ffmpeg_args,
+ f="null"),
+- cmd=ffmpeg_path or "ffmpeg")
++ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg")
+
+ # run
+ logger().debug(cmd_to_string(cmd))
+@@ -740,7 +740,7 @@ def cl_main():
+ help="Maximum number of tracks to scan in parallel. If not specified, autodetect CPU count")
+ arg_parser.add_argument("-f",
+ "--ffmpeg-path",
+- default=shutil.which("ffmpeg"),
++ default="@ffmpeg@/bin/ffmpeg",
+ help="""Full file path of ffmpeg executable (only needed if not in PATH).
+ If not specified, autodetect""")
+ arg_parser.add_argument("-d",
diff --git a/nixpkgs/pkgs/applications/audio/redoflacs/default.nix b/nixpkgs/pkgs/applications/audio/redoflacs/default.nix
index e32fd42af32..140b163e25c 100644
--- a/nixpkgs/pkgs/applications/audio/redoflacs/default.nix
+++ b/nixpkgs/pkgs/applications/audio/redoflacs/default.nix
@@ -1,39 +1,49 @@
-{ stdenv, fetchFromGitHub, makeWrapper
-, flac, sox }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, makeWrapper
+, installShellFiles
+, flac
+, sox
+, withAucdtect ? false
+, aucdtect ? null
+}:
stdenv.mkDerivation rec {
pname = "redoflacs";
- version = "0.30.20150202";
+ version = "0.30.20190903";
src = fetchFromGitHub {
- owner = "sirjaren";
- repo = "redoflacs";
- rev = "86c6f5becca0909dcb2a0cb9ed747a575d7a4735";
- sha256 = "1gzlmh4vnf2fl0x8ig2n1f76082ngldsv85i27dv15y2m1kffw2j";
+ owner = "sirjaren";
+ repo = "redoflacs";
+ rev = "4ca544cbc075d0865884906208cb2b8bc318cf9e";
+ sha256 = "19lcl09d4ngz2zzwd8dnnxx41ddvznhar6ggrlf1xvkr5gd7lafp";
};
dontBuild = true;
- nativeBuildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ installShellFiles makeWrapper ];
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin redoflacs
install -Dm644 -t $out/share/doc/redoflacs LICENSE *.md
+ installManPage redoflacs.1
runHook postInstall
'';
postFixup = ''
wrapProgram $out/bin/redoflacs \
- --prefix PATH : ${stdenv.lib.makeBinPath [ flac sox ]}
+ --prefix PATH : ${stdenv.lib.makeBinPath ([ flac sox ] ++ lib.optional withAucdtect aucdtect)}
'';
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Parallel BASH commandline FLAC compressor, verifier, organizer, analyzer, and retagger";
- homepage = src.meta.homepage;
- license = licenses.gpl2;
- platforms = platforms.all;
+ homepage = src.meta.homepage;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.all;
};
}
diff --git a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
index 24b342a26a9..b6bff79fa03 100644
--- a/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
+++ b/nixpkgs/pkgs/applications/audio/rhythmbox/default.nix
@@ -17,13 +17,13 @@
}:
let
pname = "rhythmbox";
- version = "3.4.3";
+ version = "3.4.4";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
- sha256 = "1yx3n7p9vmv23jsv98fxwq95n78awdxqm8idhyhxx2d6vk4w1hgx";
+ sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf";
};
nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/applications/audio/samplv1/default.nix b/nixpkgs/pkgs/applications/audio/samplv1/default.nix
index 4874969b633..8c8e5407f7a 100644
--- a/nixpkgs/pkgs/applications/audio/samplv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "samplv1";
- version = "0.9.11";
+ version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz";
- sha256 = "17zs8kvvwqv00bm4lxpn09a5hxjlbz7k5mkl3k7jspw7rqn3djf2";
+ sha256 = "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix
index 2ba9d4f50c3..cfe79f4e361 100644
--- a/nixpkgs/pkgs/applications/audio/snd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-19.9";
+ name = "snd-20.1";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "13s8fahpsjygjdrcwmprcrz23ny3klaj2rh2xzdv3bfs69gxvhys";
+ sha256 = "0v7zhavkkbh1bagzy3l08kb235hhdqn28y0m4znkd3k31p4l4dz8";
};
nativeBuildInputs = [ pkgconfig ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Sound editor";
- homepage = http://ccrma.stanford.edu/software/snd;
+ homepage = "http://ccrma.stanford.edu/software/snd";
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [ ];
diff --git a/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix b/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix
new file mode 100644
index 00000000000..4ad9e51b645
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/sonic-lineup/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound
+, libid3tag, liblo, liblrdf, libmad, liboggz, libpulseaudio, libsamplerate
+, libsndfile, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto
+, wrapQtAppsHook, pkgconfig
+}:
+
+stdenv.mkDerivation rec {
+ pname = "sonic-lineup";
+ version = "1.0.1";
+
+ src = fetchurl {
+ url = "https://code.soundsoftware.ac.uk/attachments/download/2610/${pname}-${version}.tar.gz";
+ sha256 = "0w4v5zr81d8fh97y820r0vj1rrbl0kwgvhfkdnyl4hiabs97b1i7";
+ };
+
+ buildInputs =
+ [ alsaLib boost bzip2 fftw fftwFloat libfishsound libid3tag liblo liblrdf
+ libmad liboggz libpulseaudio libsamplerate libsndfile opusfile pkgconfig
+ portaudio rubberband serd sord capnproto
+ ];
+
+ nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
+
+ enableParallelBuilding = true;
+
+ # comment out the tests
+ preConfigure = ''
+ sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Comparative visualisation of related audio recordings";
+ homepage = https://www.sonicvisualiser.org/sonic-lineup/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.vandenoever ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
index ac72a26b0ee..534ea135880 100644
--- a/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix
@@ -105,5 +105,7 @@ mkDerivation rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
platforms = lib.platforms.linux;
+ # sonic-pi depends on ruby 2.4 which we don't support anymore
+ broken = true;
};
}
diff --git a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix
index 6164c1cfe93..d1c981de2d5 100644
--- a/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,21 +2,23 @@
{ stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
, libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
-, qmake, rubberband, serd, sord, vampSDK, fftwFloat
+, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland
+, rubberband, serd, sord, vampSDK, fftwFloat
+, capnproto, liboggz, libfishsound, libid3tag, opusfile
+, wrapQtAppsHook
}:
stdenv.mkDerivation rec {
pname = "sonic-visualiser";
- version = "2.4.1";
+ version = "4.0.1";
src = fetchurl {
- url = "https://code.soundsoftware.ac.uk/attachments/download/1185/${pname}-${version}.tar.gz";
- sha256 = "06nlha70kgrby16nyhngrv5q846xagnxdinv608v7ga7vpywwmyb";
+ url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz";
+ sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6";
};
buildInputs =
- [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband
+ [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 librdf rubberband
libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
serd
sord
@@ -26,23 +28,22 @@ stdenv.mkDerivation rec {
libpulseaudio
libmad
libogg # ?
- # fishsound
+ libfishsound
liblo
libX11
+ capnproto
+ liboggz
+ libid3tag
+ opusfile
];
- nativeBuildInputs = [ pkgconfig qmake ];
+ nativeBuildInputs = [ pkgconfig wrapQtAppsHook ];
- configurePhase = ''
- for i in sonic-visualiser svapp svcore svgui;
- do cd $i && qmake PREFIX=$out && cd ..;
- done
- '';
+ enableParallelBuilding = true;
- installPhase = ''
- mkdir -p $out/{bin,share/sonic-visualiser}
- cp sonic-visualiser $out/bin/
- cp -r samples $out/share/sonic-visualiser/
+ # comment out the tests
+ preConfigure = ''
+ sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro
'';
meta = with stdenv.lib; {
@@ -51,6 +52,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu maintainers.marcweber ];
platforms = platforms.linux;
- broken = true;
};
}
diff --git a/nixpkgs/pkgs/applications/audio/soundtracker/default.nix b/nixpkgs/pkgs/applications/audio/soundtracker/default.nix
new file mode 100644
index 00000000000..ce73203c959
--- /dev/null
+++ b/nixpkgs/pkgs/applications/audio/soundtracker/default.nix
@@ -0,0 +1,51 @@
+{ stdenv
+, fetchurl
+, pkg-config
+, autoconf
+, gtk2
+, alsaLib
+, SDL
+, jack2
+, goocanvas # graphical envelope editing
+}:
+
+stdenv.mkDerivation rec {
+ pname = "soundtracker";
+ version = "1.0.0.1";
+
+ src = fetchurl {
+ # Past releases get moved to the "old releases" directory.
+ # Only the latest release (currently a prerelease) is at the top level.
+ url = "mirror://sourceforge/soundtracker/old%20releases/soundtracker-${version}.tar.bz2";
+ sha256 = "1ggliswz5ngmlnrnyhv3x1arh5w77an0ww9p53cddp9aas5q11jm";
+ };
+
+ nativeBuildInputs = [
+ pkg-config
+ autoconf
+ ];
+ buildInputs = [
+ gtk2
+ SDL
+ jack2
+ goocanvas
+ ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
+
+ meta = with stdenv.lib; {
+ description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker";
+ longDescription = ''
+ SoundTracker is a pattern-oriented music editor (similar to the DOS
+ program 'FastTracker'). Samples are lined up on tracks and patterns
+ which are then arranged to a song. Supported module formats are XM and
+ MOD; the player code is the one from OpenCP. A basic sample recorder
+ and editor is also included.
+ '';
+ homepage = "http://www.soundtracker.org/";
+ downloadPage = "https://sourceforge.net/projects/soundtracker/files/";
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ fgaz ];
+ platforms = platforms.all;
+ # gdk/gdkx.h not found
+ broken = stdenv.isDarwin;
+ };
+}
diff --git a/nixpkgs/pkgs/applications/audio/spectmorph/default.nix b/nixpkgs/pkgs/applications/audio/spectmorph/default.nix
index 7544a3520c7..a4f48aa0c21 100644
--- a/nixpkgs/pkgs/applications/audio/spectmorph/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spectmorph/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "spectmorph";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchurl {
url = "http://spectmorph.org/files/releases/${pname}-${version}.tar.bz2";
- sha256 = "003wznv3sy1b4g55vqii9pr3i3bb3zmj7nqvwrz7vjsfn2xyd1bn";
+ sha256 = "06jrfx5g9c56swxn78lix0gyrjkhi21l9wqs56knp8iqcgfi3m0s";
};
buildInputs = [ libjack2 lv2 glib qt5.qtbase libao cairo libsndfile fftwFloat ];
diff --git a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix
index 6f8fc541ad7..94f08a5f7a8 100644
--- a/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix
@@ -2,25 +2,26 @@
rustPlatform.buildRustPackage rec {
pname = "spotify-tui";
- version = "0.12.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "Rigellute";
repo = "spotify-tui";
rev = "v${version}";
- sha256 = "18ja0a7s6lhz6y8fmpmabv95zkcfazj0qc0dsd9dblfzzjhvmw39";
+ sha256 = "0fmj25zjg12v0kyanic343lrdhxkh290v88qiz6ac47g8bdy3c83";
};
- cargoSha256 = "1364z9jz3mnba3pii5h7imqlwlvbp146pcd5q8w61lsmdr2iyha2";
+ cargoSha256 = "1n8aacy0hapjm10hmgqm07rb5c0ngmzr1s116pspsl7cdszza6xi";
nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
buildInputs = [ openssl ]
- ++ stdenv.lib.optional stdenv.isLinux libxcb
+ ++ stdenv.lib.optional stdenv.isLinux libxcb
++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ];
meta = with stdenv.lib; {
description = "Spotify for the terminal written in Rust";
homepage = https://github.com/Rigellute/spotify-tui;
+ changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ jwijenbergh ];
platforms = platforms.all;
diff --git a/nixpkgs/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix
index b763e6e6122..eb2055ec7c1 100644
--- a/nixpkgs/pkgs/applications/audio/spotify/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotify/default.nix
@@ -10,14 +10,14 @@ let
# If an update breaks things, one of those might have valuable info:
# https://aur.archlinux.org/packages/spotify/
# https://community.spotify.com/t5/Desktop-Linux
- version = "1.1.10.546.ge08ef575-19";
+ version = "1.1.26.501.gbe11e53b-15";
# To get the latest stable revision:
# curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated'
# To get general information:
# curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.'
# More examples of api usage:
# https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py
- rev = "36";
+ rev = "41";
deps = [
@@ -56,6 +56,8 @@ let
xorg.libXScrnSaver
xorg.libXtst
xorg.libxcb
+ xorg.libSM
+ xorg.libICE
zlib
];
@@ -75,7 +77,7 @@ stdenv.mkDerivation {
# https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334
src = fetchurl {
url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap";
- sha512 = "c49f1a86a9b737e64a475bbe62754a36f607669e908eb725a2395f0a0a6b95968e0c8ce27ab2c8b6c92fe8cbacb1ef58de11c79b92dc0f58c2c6d3a140706a1f";
+ sha512 = "41bc8d20388bab39058d0709d99b1c8e324ea37af217620797356b8bc0b24aedbe801eaaa6e00a93e94e26765602e5dc27ad423ce2e777b4bec1b92daf04f81e";
};
buildInputs = [ squashfsTools makeWrapper ];
diff --git a/nixpkgs/pkgs/applications/audio/spotifyd/default.nix b/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
index 30cedfa8bb8..263fe986df3 100644
--- a/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
+++ b/nixpkgs/pkgs/applications/audio/spotifyd/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "08i0zm7kgprixqjpgaxk7xid1njgj6lmi896jf9fsjqzdzlblqk8";
};
- cargoSha256 = "0kl8xl2qhzf8wb25ajw59frgym62lkg7p72d8z0xmkqjjcg2nyib";
+ cargoSha256 = "0200apqbx769ggjnjr0m72g61ikhml2xak5n1il2pvfx1yf5nw0n";
cargoBuildFlags = [
"--no-default-features"
diff --git a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix
index 3184f89ced9..ce0153e9f26 100644
--- a/nixpkgs/pkgs/applications/audio/squeezelite/default.nix
+++ b/nixpkgs/pkgs/applications/audio/squeezelite/default.nix
@@ -1,19 +1,56 @@
-{ stdenv, fetchFromGitHub, alsaLib, faad2, flac, libmad, libvorbis, mpg123 }:
+{ stdenv, fetchFromGitHub
+, alsaLib, flac, libmad, libvorbis, mpg123
+, dsdSupport ? true
+, faad2Support ? true, faad2
+, ffmpegSupport ? true, ffmpeg
+, opusSupport ? true, opusfile
+, resampleSupport ? true, soxr
+, sslSupport ? true, openssl
+}:
-stdenv.mkDerivation {
- name = "squeezelite-git-2018-08-14";
+let
+ concatStringsSep = stdenv.lib.concatStringsSep;
+ optional = stdenv.lib.optional;
+ opts = [ "-DLINKALL" ]
+ ++ optional dsdSupport "-DDSD"
+ ++ optional (!faad2Support) "-DNO_FAAD"
+ ++ optional ffmpegSupport "-DFFMPEG"
+ ++ optional opusSupport "-DOPUS"
+ ++ optional resampleSupport "-DRESAMPLE"
+ ++ optional sslSupport "-DUSE_SSL";
+
+in stdenv.mkDerivation {
+ pname = "squeezelite";
+
+ # versions are specified in `squeezelite.h`
+ # see https://github.com/ralph-irving/squeezelite/issues/29
+ version = "1.9.6.1196";
src = fetchFromGitHub {
owner = "ralph-irving";
repo = "squeezelite";
- rev = "ecb6e3696a42113994640e5345d0b5ca2e77d28b";
- sha256 = "0di3d5qy8fhawijq6bxy524fgffvzl08dprrws0fs2j1a70fs0fh";
+ rev = "2b508464dce2cbdb2a3089c58df2a6fbc36328c0";
+ sha256 = "024ypr1da2r079k3hgiifzd3d3wcfprhbl5zdm40zm0c7frzmr8i";
};
- buildInputs = [ alsaLib faad2 flac libmad libvorbis mpg123 ];
+ buildInputs = [ alsaLib flac libmad libvorbis mpg123 ]
+ ++ optional faad2Support faad2
+ ++ optional ffmpegSupport ffmpeg
+ ++ optional opusSupport opusfile
+ ++ optional resampleSupport soxr
+ ++ optional sslSupport openssl;
enableParallelBuilding = true;
+ postPatch = ''
+ substituteInPlace opus.c \
+ --replace "<opusfile.h>" "<opus/opusfile.h>"
+ '';
+
+ preBuild = ''
+ export OPTS="${concatStringsSep " " opts}"
+ '';
+
installPhase = ''
runHook preInstall
@@ -26,7 +63,8 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Lightweight headless squeezebox client emulator";
homepage = https://github.com/ralph-irving/squeezelite;
- license = licenses.gpl3;
+ license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2;
+ maintainers = with maintainers; [ samdoshi ];
platforms = platforms.linux;
};
}
diff --git a/nixpkgs/pkgs/applications/audio/sunvox/default.nix b/nixpkgs/pkgs/applications/audio/sunvox/default.nix
index 1a3d1a96c85..48ad9bc971c 100644
--- a/nixpkgs/pkgs/applications/audio/sunvox/default.nix
+++ b/nixpkgs/pkgs/applications/audio/sunvox/default.nix
@@ -13,11 +13,11 @@ let
in
stdenv.mkDerivation rec {
pname = "SunVox";
- version = "1.9.4c";
+ version = "1.9.5d";
src = fetchurl {
url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip";
- sha256 = "19c1a4e28459e31e1a19986f219d4caa4eb2cb5bc9f6aa994abdbb2ebf6ac4ac";
+ sha256 = "15pyc3dk4dqlivgzki8sv7xpwg3bbn5xv9338g16a0dbn7s3kich";
};
buildInputs = [ unzip ];
diff --git a/nixpkgs/pkgs/applications/audio/synthv1/default.nix b/nixpkgs/pkgs/applications/audio/synthv1/default.nix
index 349c7acc3db..f58166a5984 100644
--- a/nixpkgs/pkgs/applications/audio/synthv1/default.nix
+++ b/nixpkgs/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
mkDerivation rec {
pname = "synthv1";
- version = "0.9.11";
+ version = "0.9.12";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
- sha256 = "116k2vca9dygvsd684wvxm61p0l1xrrgdph4qrrprlsr6vj0llgm";
+ sha256 = "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731";
};
buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ];
diff --git a/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix
index f815ac02e6e..44d322069fc 100644
--- a/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/nixpkgs/pkgs/applications/audio/vorbis-tools/default.nix
@@ -3,8 +3,8 @@
let
debPatch = fetchzip {
- url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-6.debian.tar.xz";
- sha256 = "1xmmpdvxyr84lazlg23c6ck5ic97ga2rkiqabb1d98ix2zdzyqz5";
+ url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-11.debian.tar.xz";
+ sha256 = "0kvmd5nslyqplkdb7pnmqj47ir3y5lmaxd12wmrnqh679a8jhcyi";
};
in
stdenv.mkDerivation {
diff --git a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
index 0cd512e5093..40691be1a0c 100644
--- a/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
+++ b/nixpkgs/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
pname = "yoshimi";
- version = "1.6.1";
+ version = "1.7.0.1";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${pname}-${version}.tar.bz2";
- sha256 = "044k2pcdsb43znc8q63mc4niggpain7wl9s5c4sgsfmrjh0bjapj";
+ sha256 = "1pkqrrr51vlxh96vy0c0rf5ijjvymys4brsw9rv1bdp1bb8izw6c";
};
buildInputs = [
diff --git a/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix
index a8236b4b60f..b9645fa4d8a 100644
--- a/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix
+++ b/nixpkgs/pkgs/applications/audio/zam-plugins/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "zam-plugins";
- version = "3.11";
+ version = "3.12";
src = fetchgit {
url = "https://github.com/zamaudio/zam-plugins.git";
deepClone = true;
- rev = "af338057e42dd5d07cba1889bfc74eda517c6147";
- sha256 = "1qbskhcvy2k2xv0f32lw13smz5g72v0yy47zv6vnhnaiaqf3f2d5";
+ rev = "87fdee6e87dbee75c1088e2327ea59c1ab1522e4";
+ sha256 = "0kz0xygff3ca1v9nqi0dvrzy9whbzqxrls5b7hydi808d795893n";
};
nativeBuildInputs = [ pkgconfig ];