diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-11 07:59:53 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-11 07:59:53 +0100 |
commit | 1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba (patch) | |
tree | 12febba59ddea0d1fb3e4f79f8a6ddab34dfc377 /pkgs/applications/audio | |
parent | 2cf319879b8aaf1b982cb84e5ba203500f735791 (diff) | |
parent | 4959c970ee991a5c1b049649ccd392a9c2a2ca79 (diff) | |
download | nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.tar nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.tar.gz nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.tar.bz2 nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.tar.lz nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.tar.xz nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.tar.zst nixlib-1a6c3cb06bbdd8dbd0bafc02f35a113fd50544ba.zip |
Merge staging into staging-next
Diffstat (limited to 'pkgs/applications/audio')
-rw-r--r-- | pkgs/applications/audio/drumkv1/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/audio/sonic-pi/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index b926ff09d22b..d3399315376f 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/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/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index ac72a26b0eec..534ea1358803 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/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; }; } |