From dcac7eed6c123183613e5be042e050ee9575034c Mon Sep 17 00:00:00 2001
From: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
Date: Thu, 20 Jun 2019 16:28:48 +0200
Subject: [PATCH 1/3] maintainers: add mrmebelman

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c5ab50ba5e3..a2f8208b5d0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3457,6 +3457,11 @@
     github = "mrkkrp";
     name = "Mark Karpov";
   };
+  mrmebelman = {
+    email = "burzakovskij@protonmail.com";
+    github = "MrMebelMan";
+    name = "Vladyslav Burzakovskyy";
+  };
   mrVanDalo = {
     email = "contact@ingolf-wagner.de";
     github = "mrVanDalo";

From 28e804f9d6fa586f535c87990ce301e3abd36052 Mon Sep 17 00:00:00 2001
From: Vladyslav Burzakovskyy <vladislav.burzakovskij@satoshilabs.com>
Date: Wed, 26 Jun 2019 14:34:34 +0200
Subject: [PATCH 2/3] supercollider: 3.9.3 -> 3.10.2

---
 .../interpreters/supercollider/default.nix          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index c16b57dcb9c..62118dd1c2b 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, pkgconfig, alsaLib
 , libjack2, libsndfile, fftw, curl, gcc
-, libXt, qtbase, qttools, qtwebkit, readline
-, useSCEL ? false, emacs
+, libXt, qtbase, qttools, qtwebengine
+, readline, qtwebsockets, useSCEL ? false, emacs
 }:
 
 let optional = stdenv.lib.optional;
@@ -9,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "supercollider-${version}";
-  version = "3.9.3";
+  version = "3.10.2";
 
 
   src = fetchurl {
     url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
-    sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr";
+    sha256 = "0ynz1ydcpsd5h57h1n4a7avm6p1cif5a8rkmz4qpr46pr8z9p6iq";
   };
 
   hardeningDisable = [ "stackprotector" ];
@@ -27,13 +27,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   buildInputs = [
-    gcc libjack2 libsndfile fftw curl libXt qtbase qtwebkit readline ]
+    gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ]
       ++ optional (!stdenv.isDarwin) alsaLib
       ++ optional useSCEL emacs;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language for real time audio synthesis";
     homepage = http://supercollider.sourceforge.net/;
+    maintainers = with maintainers; [ mrmebelman ];
     license = stdenv.lib.licenses.gpl3Plus;
     platforms = [ "x686-linux" "x86_64-linux" ];
   };

From 58a85eb83a60189f9b120cf4496531627c107b49 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 27 Jun 2019 10:28:03 -0400
Subject: [PATCH 3/3] supercollider: change license gpl3Plus -> gpl3

---
 pkgs/development/interpreters/supercollider/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 62118dd1c2b..057375182f5 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Programming language for real time audio synthesis";
     homepage = http://supercollider.sourceforge.net/;
     maintainers = with maintainers; [ mrmebelman ];
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3;
     platforms = [ "x686-linux" "x86_64-linux" ];
   };
 }