From 99e6b63199e3dcafdb2bea76aef72ecf4dc86d1d Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Thu, 24 Nov 2016 14:35:41 -0800
Subject: [PATCH 1/5] pycryptodome: init at 3.4.3

---
 .../python-modules/pycryptodome/default.nix    | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycryptodome/default.nix

diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
new file mode 100644
index 00000000000..04964ab03dd
--- /dev/null
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+
+buildPythonPackage rec {
+  version = "3.4.3";
+  name = "pycryptodome-${version}";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
+    sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb";
+  };
+
+  meta = {
+    homepage = "https://www.pycryptodome.org/";
+    description = "Python Cryptography Toolkit";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dac77f70979..c38f6aafaaf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -218,6 +218,8 @@ in {
 
   pycrypto = callPackage ../development/python-modules/pycrypto { };
 
+  pycryptodome = callPackage ../development/python-modules/pycryptodome { };
+
   pyexiv2 = if (!isPy3k) then callPackage ../development/python-modules/pyexiv2 {} else throw "pyexiv2 not supported for interpreter ${python.executable}";
 
   pygame = callPackage ../development/python-modules/pygame { };

From 555928c228634b4c372f38e6ea5c320c1662711b Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Thu, 24 Nov 2016 14:40:09 -0800
Subject: [PATCH 2/5] mutagen: 1.32 -> 1.34

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c38f6aafaaf..d9c6c023780 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14761,11 +14761,11 @@ in {
   };
 
   mutagen = buildPythonPackage (rec {
-    name = "mutagen-1.32";
+    name = "mutagen-1.34";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/m/mutagen/${name}.tar.gz";
-      sha256 = "1d9sxl442xjj7pdyjj5h0dsjyd7d3wqswr8icqqgqdmg9k8dw8bp";
+      sha256 = "06anfzpjajwwh25n3afavwafrix3abahgwfr2zinrhqh2w98kw5s";
     };
 
     # Needed for tests only

From 8602f821695238612c34d2a6864b38c2d8c6f4d7 Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Thu, 24 Nov 2016 14:41:09 -0800
Subject: [PATCH 3/5] gpsoauth: 0.0.4 -> 0.2.0

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9c6c023780..16785dee336 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7271,12 +7271,12 @@ in {
   };
 
   gpsoauth = buildPythonPackage rec {
-    version = "0.0.4";
+    version = "0.2.0";
     name = "gpsoauth-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/gpsoauth/${name}.tar.gz";
-      sha256 = "1mhd2lkl1f4fmia1cwxwik8gvqr5q16scjip7kfwzadh9a11n9kw";
+      sha256 = "01zxw8rhml8xfwda7ba8983890bzwkfa55ijd6qf8qrdy6ja1ncn";
     };
 
     propagatedBuildInputs = with self; [
@@ -7289,7 +7289,7 @@ in {
       pyopenssl
       pyasn1
       pycparser
-      pycrypto
+      pycryptodome
       requests2
       six
     ];

From 5d62f80bb7971a15398a9c18cc5786c127c77d7a Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Thu, 24 Nov 2016 14:41:43 -0800
Subject: [PATCH 4/5] gmusicapi: 7.0.0 -> 10.1.0

---
 pkgs/top-level/python-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 16785dee336..1facf70c007 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7078,18 +7078,18 @@ in {
   };
 
   gmusicapi = with pkgs; buildPythonPackage rec {
-    name = "gmusicapi-7.0.0";
+    name = "gmusicapi-10.1.0";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gmusicapi/gmusicapi-7.0.0.tar.gz";
-      sha256 = "1zji4cgylyzz97cz69lywkbsn5nvvzrhk7iaqnpqpfvj9gwdchwn";
+      url = "mirror://pypi/g/gmusicapi/gmusicapi-10.1.0.tar.gz";
+      sha256 = "0smlrafh1bjzrcjzl7im8pf8f04gcnx92lf3g5qr7yzgq8k20xa2";
     };
 
     propagatedBuildInputs = with self; [
       validictory
       decorator
       mutagen
-      protobuf
+      protobuf3_0
       setuptools
       requests2
       dateutil
@@ -7100,6 +7100,7 @@ in {
       pyopenssl
       gpsoauth
       MechanicalSoup
+      future
     ];
 
     meta = {

From 97b35a057352476e1ad33f4774e0345cbc15cbf0 Mon Sep 17 00:00:00 2001
From: Carl Sverre <accounts@carlsverre.com>
Date: Thu, 24 Nov 2016 14:42:27 -0800
Subject: [PATCH 5/5] mopidy-gmusic: 1.0.0 -> 2.0.0

---
 pkgs/applications/audio/mopidy-gmusic/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix
index 6984593cd41..850e7abaef0 100644
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@@ -2,14 +2,19 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-gmusic-${version}";
-  version = "1.0.0";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-gmusic/archive/v${version}.tar.gz";
-    sha256 = "0yfilzfamy1bxnmgb1xk56jrk4sz0i7vcnc0a8klrm9sc7agnm9i";
+    sha256 = "1xryw2aixfza3brxlgjdlg0lghlb17g7kay9zy56mlzp0jr7m87j";
   };
 
-  propagatedBuildInputs = [ mopidy pythonPackages.requests2 pythonPackages.gmusicapi ];
+  propagatedBuildInputs = [
+    mopidy
+    pythonPackages.requests2
+    pythonPackages.gmusicapi
+    pythonPackages.cachetools
+  ];
 
   doCheck = false;