diff options
| -rw-r--r-- | pkgs/applications/audio/mopidy-gmusic/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pycryptodome/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 21 |
3 files changed, 38 insertions, 12 deletions
diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix index 6984593cd417..850e7abaef00 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; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix new file mode 100644 index 000000000000..04964ab03dd2 --- /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 40b1b9adedfb..71d8c229f63b 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 { }; @@ -7050,18 +7052,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 @@ -7072,6 +7074,7 @@ in { pyopenssl gpsoauth MechanicalSoup + future ]; meta = { @@ -7243,12 +7246,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; [ @@ -7261,7 +7264,7 @@ in { pyopenssl pyasn1 pycparser - pycrypto + pycryptodome requests2 six ]; @@ -14731,11 +14734,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 |