diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:00:32 +0100 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2020-10-28 03:03:27 +0100 |
commit | db0fe5c3eb1d680fb8c635f8e327c412528eba90 (patch) | |
tree | eb73686ee894bbc2d528824803dacf5bc914f28f /pkgs/applications | |
parent | 5d03fe6ac4b2e5e4132bb6f893380544ae2cf008 (diff) | |
parent | c127653b72574199463a73a56e1809223eaec0df (diff) |
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
Diffstat (limited to 'pkgs/applications')
112 files changed, 318 insertions, 351 deletions
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 998535a8eb0b..610085a137aa 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -12,11 +12,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.9.6"; + version = "2.9.7"; pname = "asunder"; src = fetchurl { url = "http://littlesvr.ca/asunder/releases/${pname}-${version}.tar.bz2"; - sha256 = "1ycnd82lh7qy1pcbngd4b41s16j9hnm2kyfrncg4cwr3bfk7yg7a"; + sha256 = "1x3l308ss0iqhz90qyjb94gyd8b4piyrm2nzjmg5kf049k9prjf1"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index 13c48fc12af3..adb6f6b74274 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib audiofile libjack2 liblo liboil libsamplerate libsndfile lilv lv2 ]; meta = { - description = "Ecasound is a software package designed for multitrack audio processing"; + description = "Software package designed for multitrack audio processing"; license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; homepage = "http://nosignal.fi/ecasound/"; }; diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index f9a579512cab..30a35501771b 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://eflite.sourceforge.net"; - description = "EFlite is a speech server for screen readers"; + description = "Speech server for screen readers"; longDescription = '' EFlite is a speech server for Emacspeak and other screen readers that allows them to interface with Festival Lite, diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index e32bef008d99..0da00d319720 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson, libjack2, lv2, libX11, cairo }: +{ stdenv, fetchFromGitLab, cmake, pkg-config, redkite, libsndfile, rapidjson +, libjack2, lv2, libX11, cairo }: stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.3.8"; + version = "2.4.0"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910"; + sha256 = "1ibsfyzkvzijv929p91db56gaxm582b7nikbn10wbbjvv4f46mmj"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -16,13 +17,16 @@ stdenv.mkDerivation rec { buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; # https://github.com/iurie-sw/geonkick/issues/120 - cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ]; + cmakeFlags = [ + "-DGKICK_REDKITE_SDK_PATH=${redkite}" + "-DCMAKE_INSTALL_LIBDIR=lib" + ]; - meta = { + meta = with stdenv.lib; { |