diff options
author | Russell O'Connor <oconnorr@google.com> | 2014-10-23 20:12:57 +0200 |
---|---|---|
committer | Russell O'Connor <oconnorr@google.com> | 2014-10-23 20:12:57 +0200 |
commit | 7c4e1efadc4a210fdabb776bad4f2add03e5c806 (patch) | |
tree | 9ddaad1c5235a454f74df3d267871ef70adb5de5 /pkgs/top-level | |
parent | b91adb64ce6fdf88e5c2c41f2a8cc0cbc36d8395 (diff) | |
download | nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.tar nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.tar.gz nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.tar.bz2 nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.tar.lz nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.tar.xz nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.tar.zst nixlib-7c4e1efadc4a210fdabb776bad4f2add03e5c806.zip |
gsutil (and boto-230) require Python 2.
Move these packages to the Python 2 only section.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/python-packages.nix | 94 |
1 files changed, 46 insertions, 48 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be8cba1a747c..1581475c6af2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1010,21 +1010,6 @@ let }; }; - boto-230 = buildPythonPackage rec { - name = "boto-2.30.0"; - src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/b/boto/boto-2.30.0.tar.gz; - sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh"; - }; - doCheck = false; - meta = { - homepage = https://github.com/boto/boto; - license = licenses.mit; - description = "Python interface to Amazon Web Services"; - }; - }; - - botocore = buildPythonPackage rec { version = "0.33.0"; name = "botocore-${version}"; @@ -2391,20 +2376,6 @@ let }; }; - gcs-oauth2-boto-plugin = buildPythonPackage rec { - name = "gcs-oauth2-boto-plugin-1.8"; - src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; - sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; - }; - propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pkgs.pyopenssl socksipy-branch ]; - meta = { - homepage = https://developers.google.com/storage/docs/gspythonlibrary; - description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; - license = stdenv.lib.licenses.asl20; - }; - }; - gcutil = buildPythonPackage rec { name = "gcutil-1.15.0"; meta.maintainers = [ stdenv.lib.maintainers.phreedom ]; @@ -2431,25 +2402,6 @@ let propagatedBuildInputs = with self; [ pkgs.gnutls ]; }; - gsutil = buildPythonPackage rec { - name = "gsutil-4.6"; - meta = { - homepage = https://developers.google.com/storage/docs/gsutil; - description = "Google Cloud Storage Tool"; - maintainers = [ "Russell O'Connor <oconnorr@google.com>" ]; - license = stdenv.lib.licenses.asl20; - }; - doCheck = false; - - src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/g/gsutil/gsutil-4.6.tar.gz; - sha256 = "1i0clm60162rbk45ljr8nsw4ndkzjnwb7r440shcqjrvw8jq49mn"; - }; - - propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags - retry_decorator pkgs.pyopenssl socksipy-branch ]; - }; - gitdb = buildPythonPackage rec { name = "gitdb-0.5.4"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -11422,6 +11374,52 @@ let with self; { + boto-230 = buildPythonPackage rec { + name = "boto-2.30.0"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/b/boto/boto-2.30.0.tar.gz; + sha256 = "12gl8azmx1vv8dbv9jhnsbhjpc2dd1ng0jlbcg734k6ggwq1h6hh"; + }; + doCheck = false; + meta = { + homepage = https://github.com/boto/boto; + license = licenses.mit; + description = "Python interface to Amazon Web Services"; + }; + }; + + gcs-oauth2-boto-plugin = buildPythonPackage rec { + name = "gcs-oauth2-boto-plugin-1.8"; + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/g/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-1.8.tar.gz; + sha256 = "0jy62y5bmaf1mb735lqwry1s5nx2qqrxvl5sxip9yg4miih3qkyb"; + }; + propagatedBuildInputs = with self; [ boto-230 httplib2 google_api_python_client retry_decorator pkgs.pyopenssl socksipy-branch ]; + meta = { + homepage = https://developers.google.com/storage/docs/gspythonlibrary; + description = "Provides OAuth 2.0 credentials that can be used with Google Cloud Storage"; + license = stdenv.lib.licenses.asl20; + }; + }; + + gsutil = buildPythonPackage rec { + name = "gsutil-4.6"; + meta = { + homepage = https://developers.google.com/storage/docs/gsutil; + description = "Google Cloud Storage Tool"; + maintainers = [ "Russell O'Connor <oconnorr@google.com>" ]; + license = stdenv.lib.licenses.asl20; + }; + doCheck = false; + + src = pkgs.fetchurl { + url = https://pypi.python.org/packages/source/g/gsutil/gsutil-4.6.tar.gz; + sha256 = "1i0clm60162rbk45ljr8nsw4ndkzjnwb7r440shcqjrvw8jq49mn"; + }; + + propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags + retry_decorator pkgs.pyopenssl socksipy-branch ]; + }; pypi2nix = self.buildPythonPackage rec { rev = "04a68d8577acbceb88bdf51b1231a9dbdead7003"; |