From 9404900cc43c2305d6b149986225f4ef906bc9dd Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Wed, 10 Apr 2019 21:00:02 -0400
Subject: [PATCH 1/2] vocal: 2.3.0 -> 2.4.0

Vocal has a new release featuring a number of bug fixes and new
features. See the full changelog at
https://github.com/needle-and-thread/vocal/releases/tag/2.4.0.
---
 pkgs/applications/audio/vocal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index 49e11aee0a12..bbd62a2f9e32 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vocal";
-  version = "2.3.0";
+  version = "2.4.0";
 
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "needle-and-thread";
     repo = pname;
     rev = version;
-    sha256 = "1wkkyai14in4yk3q4qq23wk3l49px2xi8z819y3glna236qsq6qp";
+    sha256 = "09g9692rckdwh1i5krqgfwdx4p67b1q5834cnxahxzpq4p08rf5w";
   };
 
   nativeBuildInputs = [

From 991f77b19f825da5105756255843da34d305eb17 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 11 Apr 2019 00:32:52 -0400
Subject: [PATCH 2/2] vocal: cleanup

---
 pkgs/applications/audio/vocal/default.nix | 36 +++++++++++++++++------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
index bbd62a2f9e32..21522f948736 100644
--- a/pkgs/applications/audio/vocal/default.nix
+++ b/pkgs/applications/audio/vocal/default.nix
@@ -1,12 +1,29 @@
-{ stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, pantheon, gtk3, libxml2, webkitgtk, clutter-gtk
-, clutter-gst, libunity, libnotify, sqlite, gst_all_1, libsoup, json-glib, gnome3, gobject-introspection, wrapGAppsHook }:
+{ stdenv
+, fetchFromGitHub
+, cmake
+, ninja
+, pkgconfig
+, pantheon
+, gtk3
+, glib
+, libxml2
+, webkitgtk
+, clutter-gtk
+, clutter-gst
+, libunity
+, libnotify
+, sqlite
+, gst_all_1
+, libsoup
+, json-glib
+, libgee
+, wrapGAppsHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "vocal";
   version = "2.4.0";
 
-  name = "${pname}-${version}";
-
   src = fetchFromGitHub {
     owner = "needle-and-thread";
     repo = pname;
@@ -16,26 +33,27 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    gobject-introspection
     libxml2
     ninja
-    pkgconfig
     pantheon.vala
+    pkgconfig
     wrapGAppsHook
   ];
 
   buildInputs = with gst_all_1; [
     clutter-gst
     clutter-gtk
-    pantheon.elementary-icon-theme
-    gnome3.libgee
-    pantheon.granite
+    glib
     gst-plugins-base
     gst-plugins-good
     gstreamer
+    gtk3
     json-glib
+    libgee
     libnotify
     libunity
+    pantheon.elementary-icon-theme
+    pantheon.granite
     sqlite
     webkitgtk
   ];