Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03bd5ae1bf2a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e78dd20e8690
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 11, 2019

  1. sonic-pi: add midi support

    @c0deaddict
    c0deaddict committed Oct 11, 2019
    Copy the full SHA
    2a79578 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #69199 from c0deaddict/feature/sonic-pi-add-midi-s… 

    …upport

sonic-pi: add midi support
    @matthewbauer
    matthewbauer authored Nov 7, 2019
    Copy the full SHA
    e78dd20 View commit details
Showing with 9 additions and 3 deletions.
  1. +6 −2 pkgs/applications/audio/sonic-pi/default.nix
  2. +3 −1 pkgs/top-level/all-packages.nix
8 changes: 6 additions & 2 deletions pkgs/applications/audio/sonic-pi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
, supercollider
, qscintilla
, qwt
, osmid
}:

let
@@ -59,6 +60,10 @@ mkDerivation rec {
buildPhase = ''
export SONIC_PI_HOME=$TMPDIR
export AUBIO_LIB=${aubio}/lib/libaubio.so
export OSMID_DIR=app/server/native/osmid
mkdir -p $OSMID_DIR
cp ${osmid}/bin/{m2o,o2m} $OSMID_DIR
pushd app/server/ruby/bin
./compile-extensions.rb
@@ -95,11 +100,10 @@ mkDerivation rec {
'';

meta = {
homepage = http://sonic-pi.net/;
homepage = "https://sonic-pi.net/";
description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ Phlogistique kamilchm ];
platforms = lib.platforms.linux;
broken = true;
};
}
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -20932,7 +20932,9 @@ in

wavebox = callPackage ../applications/networking/instant-messengers/wavebox { };

sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi {
ruby = ruby_2_4; # sonic-pi build breaks with ruby 2.5 and 2.6
};

st = callPackage ../applications/misc/st {
conf = config.st.conf or null;