diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2022-07-09 22:40:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-09 22:40:12 -0500 |
commit | d603763bcda8db13a568d5c38ae492f6c73f0e4f (patch) | |
tree | 624b6735f933455bb87f2b7f9b53c330e1546814 | |
parent | 0f234e382c6f3dedf686910c6424ea20ef4234d7 (diff) | |
parent | aa2c8f202652ec02db8477b7bc1db9ca01abdc67 (diff) |
Merge pull request #180130 from magnetophon/faust
Faust: faust: 2.40.0 -> 2.41.1 faustlive: 2.5.10 -> 2.5.11 Closes #180601
-rw-r--r-- | pkgs/applications/audio/faust/faust2.nix | 11 | ||||
-rw-r--r-- | pkgs/applications/audio/faust/faustlive.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 2ad98d3d6d8d8..32bcbee2e6cd2 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.40.0"; + version = "2.41.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A="; + sha256 = "sha256-x0nBWyILrNJijs7CIvRrgYG6vgB3UlxLj9i7E4cHr9I="; fetchSubmodules = true; }; @@ -58,9 +58,10 @@ let cd build ''; - cmakeFlags = '' - -C ../backends/all.cmake -C ../targets/all.cmake .. - ''; + cmakeFlags = [ + "-C../backends/all.cmake" + "-C../targets/all.cmake" + ]; postInstall = '' # syntax error when eval'd directly diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 67ff0a828573b..4ee5ab82e6e46 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.10"; + version = "2.5.11"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-yLpIJr6A+NIX9RSGfQXT0O0USuRr0Ni9aUA+mbk31/o="; + sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk="; fetchSubmodules = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c05be75831147..1c384a14b817f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34465,9 +34465,7 @@ with pkgs; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_10; - }; + faust2 = callPackage ../applications/audio/faust/faust2.nix { }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; |