From 54201ddf245ab821e3aac6a0b8718bf2b0c14a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 Apr 2018 22:42:47 +0200 Subject: [PATCH] python.pkgs.oauth2client: move expression --- .../python-modules/oauth2client/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 18 +--------------- 2 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/python-modules/oauth2client/default.nix diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix new file mode 100644 index 00000000000..1707e9d9944 --- /dev/null +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi +, six, httplib2, pyasn1-modules, rsa }: + +buildPythonPackage rec { + pname = "oauth2client"; + version = "1.4.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; + }; + + propagatedBuildInputs = [ six httplib2 pyasn1-modules rsa ]; + doCheck = false; + + meta = with lib; { + description = "A client library for OAuth 2.0"; + homepage = https://github.com/google/oauth2client/; + license = licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 922dd586d50..d90104423fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9088,23 +9088,7 @@ in { }; }); - oauth2client = buildPythonPackage rec { - name = "oauth2client-1.4.12"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oauth2client/${name}.tar.gz"; - sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl"; - }; - - propagatedBuildInputs = with self; [ six httplib2 pyasn1-modules rsa ]; - doCheck = false; - - meta = { - description = "A client library for OAuth 2.0"; - homepage = https://github.com/google/oauth2client/; - license = licenses.bsd2; - }; - }; + oauth2client = callPackage ../development/python-modules/oauth2client { }; oauthlib = buildPythonPackage rec { version = "2.0.0";