diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-05-01 14:26:52 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-05-01 14:26:52 +0200 |
commit | cec6e7362c864813ab21453b3e078728cf7223c7 (patch) | |
tree | b9cb8ab6926ee34b5d73032c113d19c587c66507 /pkgs/applications/audio | |
parent | c480cc28958dd852aa1acb29dee80d5324b3571e (diff) | |
parent | df738d5143b711c87d0c0b9a1ed15475f404d59c (diff) |
Merge branch 'master' into staging-next-2022-04-23
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/cardinal/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faustlive.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/audio/mopidy/mopidy.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/audio/ncspot/default.nix | 6 |
5 files changed, 19 insertions, 31 deletions
diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix index 1e77ade6cdb42..a1db5bb275bbb 100644 --- a/pkgs/applications/audio/cardinal/default.nix +++ b/pkgs/applications/audio/cardinal/default.nix @@ -23,23 +23,14 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.02"; + version = "22.04"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}.tar.xz"; - sha256 = "sha256-IVlAROFGFffTEU00NCmv74w1DRb7dNMp20FeBVoDrdM="; + sha256 = "sha256-7As4CckwByrTynOOpwAXa1R9Bpp/ft537f+PvAgz/BE="; }; - patches = [ - # see https://github.com/DISTRHO/Cardinal/issues/151#issuecomment-1041886260 - (fetchpatch { - url = - "https://github.com/DISTRHO/Cardinal/commit/13e9ef37c5dd35d77a54b1cb006767be7a72ac69.patch"; - sha256 = "sha256-NYUYLbLeBX1WEzjPi0s/T1N+EXQKyi0ifbPxgBYDjRs="; - }) - ]; - prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh ''; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 0309031cf7858..2ad98d3d6d8d8 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.37.3"; + version = "2.40.0"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-Jzauw8+vBjtbK73Bh4huhX1ql1cWmh80EzEET3x03rc="; + sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 46d63c84314b3..38d3bafdea6a5 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -1,37 +1,34 @@ { lib, stdenv, fetchFromGitHub , llvm_10, qt5, qrencode, libmicrohttpd, libjack2, alsa-lib, faust, curl -, bc, coreutils, which, libsndfile, pkg-config, libxcb +, bc, coreutils, which, libsndfile, flac, libogg, libvorbis, libopus, pkg-config, libxcb, cmake, gnutls, libtasn1, p11-kit }: stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.5"; + version = "2.5.8"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "0qbn05nq170ckycwalkk5fppklc4g457mapr7p7ryrhc1hwzffm9"; + sha256 = "sha256-dt5YlvaCZ6JiNGPwVXPrKzVGWxnhdyP4lnKgck7ZSF8="; fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qt5.wrapQtAppsHook cmake ]; buildInputs = [ llvm_10 qt5.qtbase qrencode libmicrohttpd libjack2 alsa-lib faust curl - bc coreutils which libsndfile libxcb + bc coreutils which libsndfile flac libogg libvorbis libopus libxcb gnutls libtasn1 p11-kit ]; makeFlags = [ "PREFIX=$(out)" ]; - postPatch = "cd Build"; - - installPhase = '' - install -d "$out/bin" - install -d "$out/share/applications" - install FaustLive/FaustLive "$out/bin" - install rsrc/FaustLive.desktop "$out/share/applications" + postInstall = '' + wrapProgram $out/bin/FaustLive --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libmicrohttpd libsndfile faust llvm_10 ]}" ''; + postPatch = "cd Build"; + meta = with lib; { description = "A standalone just-in-time Faust compiler"; longDescription = '' diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 5dc6af60c2343..09d5e83567a2c 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; - rev = "v${version}"; - sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-F0fIl9DrludZZdzsrl/xsp7TLMgTPbVGtGvMHyD52Yw="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index f2d912a786147..050c54e168d2e 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-s2rWn6EK+io/yxQiWsWuXpqLOGd0F6ehWqVqgHBGZd0="; + sha256 = "sha256-lrEIFPi55aP9utAaMIFtqocpkbDXRJqS/jlGUtE26kE="; }; - cargoSha256 = "sha256-aorRy5j3VaOIibuHc6gf6HuB3g739T59vzbybehPirc="; + cargoSha256 = "sha256-vkNGQ3SXKJpUqDZ4TfmlSleAPAOQnsEncE8475NLJ4M="; nativeBuildInputs = [ pkg-config ]; |