From a59dc61e106fe9e8e528c837887178dbfe37daf5 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 11 Jun 2017 14:04:42 +0200 Subject: [PATCH 1/4] maintainers: add rvolosatovs --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index c4eed05f41c6..328a5d772db3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -479,6 +479,7 @@ rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; rvlander = "Gaëtan André "; + rvolosatovs = "Roman Volosatovs Date: Sun, 11 Jun 2017 14:01:10 +0200 Subject: [PATCH 2/4] pythonPackages.spotipy: init at 2.4.4 --- .../python-modules/spotipy/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/spotipy/default.nix diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix new file mode 100644 index 000000000000..5c51b844151f --- /dev/null +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi, requests2 }: + +buildPythonPackage rec { + pname = "spotipy"; + name = "spotipy-${version}"; + version = "2.4.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab"; + }; + + propagatedBuildInputs = [ requests2 ]; + + meta = with stdenv.lib; { + homepage = "http://spotipy.readthedocs.org/"; + description = "A light weight Python library for the Spotify Web API"; + license = licenses.mit; + maintainers = [ maintainers.rvolosatovs ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 427fac20e41e..0cbcba33981d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30444,6 +30444,8 @@ EOF gensim = callPackage ../development/python-modules/gensim { }; + spotipy = callPackage ../development/python-modules/spotipy { }; + }); in fix' (extends overrides packages) From 4abb292f7558027f3741565b0da8262ec90f39b3 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 24 Jun 2017 23:58:36 +0200 Subject: [PATCH 3/4] pythonPackages.spotipy: requests2 -> requests Seems like this breaks build of #26518 --- pkgs/development/python-modules/spotipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index 5c51b844151f..326975e71558 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests2 }: +{ stdenv, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "spotipy"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "1l8ya0cln936x0mx2j5ngl1xwpc0r89hs3wcvb8x8paw3d4dl1ab"; }; - propagatedBuildInputs = [ requests2 ]; + propagatedBuildInputs = [ requests ]; meta = with stdenv.lib; { homepage = "http://spotipy.readthedocs.org/"; From 5d5dde671e1770b98eb739a68659e2c82b10ce63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 25 Jun 2017 08:16:58 +0100 Subject: [PATCH 4/4] pythonPackages.spotipy: keep alphabetic ordering --- pkgs/top-level/python-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0cbcba33981d..bcca77de47d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23596,6 +23596,8 @@ in { }; }); + spotipy = callPackage ../development/python-modules/spotipy { }; + Pweave = buildPythonPackage (rec { name = "Pweave-0.25"; @@ -23624,8 +23626,6 @@ in { rope = if isPy3k then null else self.rope; }; - - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; SQLAlchemy-ImageAttach = buildPythonPackage rec { @@ -30444,8 +30444,6 @@ EOF gensim = callPackage ../development/python-modules/gensim { }; - spotipy = callPackage ../development/python-modules/spotipy { }; - }); in fix' (extends overrides packages)