From 7bb0ca24b8121261a478c9bd86bc8ce8ff455f6e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 12 Feb 2020 04:07:54 -0800
Subject: [PATCH 1/2] pythonPackages.stem: 1.7.1 -> 1.8.0

(cherry picked from commit f539a47dabe6fd614179ee7df12d596bdab1dff9)
---
 pkgs/development/python-modules/stem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index fbecbf58875e..c5402616a709 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.7.1";
+  version = "1.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18lc95pmc7i089nlsb06dsxyjl5wbhxfqgdxbjcia35ndh8z7sn9";
+    sha256 = "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50";
   };
 
   postPatch = ''

From e349f5ccbaaa28ccd907164d6d44cae48a3f3d73 Mon Sep 17 00:00:00 2001
From: ryneeverett <ryneeverett@gmail.com>
Date: Mon, 20 Apr 2020 18:55:28 +0000
Subject: [PATCH 2/2] pythonPackages.stem: remove marked as broken

A third attempt after #85642 which I hadn't recognized as a backport
of #81679.

The bug is just with the test suite on python 3.8 which was fixed in 1.8.0.
See bug report: https://trac.torproject.org/projects/tor/ticket/30847.

(cherry picked from commit 618cdd24731c49ef62d2d4f4de46162eb5f3e5bb)
---
 pkgs/development/python-modules/stem/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index c5402616a709..4d4e75d5326d 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -26,6 +26,5 @@ buildPythonPackage rec {
     homepage = https://stem.torproject.org/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ phreedom ];
-    broken = true;
   };
 }