From 95cb828b2797ab06437d07fabd827128e87199e7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 29 Jun 2018 21:37:45 +0200
Subject: [PATCH] python-openid: remove, only keep python3-openid

see discussion on
https://github.com/NixOS/nixpkgs/commit/2e41891e6d595b9acf484d7d349b17a7b35b6923
---
 .../python-modules/django-allauth/default.nix |  4 ++--
 .../python-modules/python-openid/default.nix  | 19 -------------------
 .../python-modules/python3-openid/default.nix |  4 +++-
 pkgs/top-level/python-packages.nix            |  4 +---
 4 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/python-openid/default.nix

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
index e49d8c6ff84..775660b8304 100644
--- a/pkgs/development/python-modules/django-allauth/default.nix
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
-, django, python-openid, mock, coverage }:
+, django, python3-openid, mock, coverage }:
 
 buildPythonPackage rec {
   pname = "django-allauth";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan";
   };
 
-  propagatedBuildInputs = [ requests requests_oauthlib django python-openid ];
+  propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
 
   checkInputs = [ coverage mock ];
 
diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix
deleted file mode 100644
index b70d9a1f082..00000000000
--- a/pkgs/development/python-modules/python-openid/default.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix
index 77181fa4ae5..238c416bc98 100644
--- a/pkgs/development/python-modules/python3-openid/default.nix
+++ b/pkgs/development/python-modules/python3-openid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, defusedxml }:
+{ stdenv, isPy3k, buildPythonPackage, fetchPypi, defusedxml }:
 
 buildPythonPackage rec {
   pname = "python3-openid";
@@ -13,6 +13,8 @@ buildPythonPackage rec {
 
   doCheck = false;
 
+  disabled = !isPy3k;
+
   meta = with stdenv.lib; {
     description = "OpenID support for modern servers and consumers";
     homepage = http://github.com/necaris/python3-openid;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57289008c60..fe12c039676 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -434,9 +434,7 @@ in {
 
   python-hosts = callPackage ../development/python-modules/python-hosts { };
 
-  python-openid = callPackage (if isPy3k
-    then ../development/python-modules/python3-openid
-    else ../development/python-modules/python-openid) { };
+  python3-openid = callPackage ../development/python-modules/python3-openid { };
 
   python-periphery = callPackage ../development/python-modules/python-periphery { };