public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python-openid: remove, only keep python3-openid

Browse Source 
see discussion on
2e41891e6d
This commit is contained in:
Robin Gloster 2018-06-29 21:37:45 +02:00
parent 9037f608ae
commit 95cb828b27
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
4 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/django-allauth/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib { stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
, django, python-openid, mock, coverage }: , django, python3-openid, mock, coverage }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-allauth"; pname = "django-allauth";
@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan"; sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan";
}; };
propagatedBuildInputs = [ requests requests_oauthlib django python-openid ]; propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
checkInputs = [ coverage mock ]; checkInputs = [ coverage mock ];

19
pkgs/development/python-modules/python-openid/default.nix
View File

@ -1,19 +0,0 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "python-openid";
version = "2.2.5";
src = fetchPypi {
inherit pname version;
sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
};
doCheck = false;
meta = with stdenv.lib; {
description = "OpenID support for modern servers and consumers";
homepage = https://github.com/openid/python-openid;
license = licenses.asl20;
};
}

4
pkgs/development/python-modules/python3-openid/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildPythonPackage, fetchPypi, defusedxml }: { stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "python3-openid"; pname = "python3-openid";
@ -13,6 +13,8 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
disabled = !isPy3k;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "OpenID support for modern servers and consumers"; description = "OpenID support for modern servers and consumers";
homepage = http://github.com/necaris/python3-openid; homepage = http://github.com/necaris/python3-openid;

4
pkgs/top-level/python-packages.nix
View File

@ -434,9 +434,7 @@ in {
python-hosts = callPackage ../development/python-modules/python-hosts { }; python-hosts = callPackage ../development/python-modules/python-hosts { };
python-openid = callPackage (if isPy3k python3-openid = callPackage ../development/python-modules/python3-openid { };
then ../development/python-modules/python3-openid
else ../development/python-modules/python-openid) { };
python-periphery = callPackage ../development/python-modules/python-periphery { }; python-periphery = callPackage ../development/python-modules/python-periphery { };