From 6abc915f6c5ba8c217e0e89dccf6479102246987 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 27 Jan 2015 19:10:35 +0100
Subject: [PATCH] # This is a combination of 2 commits. # The first commit's
 message is:

add sooperlooper

# The 2nd commit message will be skipped:

#	add sooperlooper
---
 pkgs/applications/audio/sooperlooper/default.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix                  |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index 9864d5f16d2..b40e2187175 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, liblo, libxml2, jack2, libsndfile, wxGTK, libsigcxx,
-libsamplerate, rubberband, pkgconfig, ncurses
+{ stdenv, fetchurl, liblo, libxml2, jack2, libsndfile, wxGTK, libsigcxx
+,libsamplerate, rubberband, pkgconfig, ncurses
 }:
 
 stdenv.mkDerivation rec {
   name = "sooperlooper-${version}";
   version = "1.7.3";
-
   src = fetchurl {
     url = "http://essej.net/sooperlooper/${name}.tar.gz";
     sha256 = "0n2gdxw1fx8nxxnpzf4sj0kp6k6zi1yq59cbz6qqzcnsnpnvszbs";
@@ -14,7 +13,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
    liblo libxml2 jack2 libsndfile wxGTK libsigcxx
    libsamplerate rubberband pkgconfig ncurses
-
   ];
 
   meta = {
@@ -23,12 +21,13 @@ stdenv.mkDerivation rec {
       It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory.
       The application is a standalone JACK client with an engine controllable via OSC and MIDI.
       It also includes a GUI which communicates with the engine via OSC (even over a network) for user-friendly control on a desktop.
-      However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) 
-      and the engine can be run standalone on a computer without a monitor.'' ;
+      However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc)
+      and the engine can be run standalone on a computer without a monitor.
+    '';
 
     version = "${version}";
     homepage = "http://essej.net/sooperlooper/index.html";
-    license = stdenv.lib.licenses.gpl;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.magnetophon ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c22c6afa19..026874bf168 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11047,6 +11047,8 @@ let
 
   slrn = callPackage ../applications/networking/newsreaders/slrn { };
 
+  sooperlooper = callPackage ../applications/audio/sooperlooper { };
+
   spideroak = callPackage ../applications/networking/spideroak { };
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };
@@ -13015,8 +13017,6 @@ let
       pysqlite = pkgs.pythonPackages.sqlite3;
   };
 
-  sooperlooper = callPackage ../applications/audio/sooperlooper { };
-
   disnix = callPackage ../tools/package-management/disnix { };
 
   dysnomia = callPackage ../tools/package-management/disnix/dysnomia {