From 3cb4a79fcc23b7c8ad91b97112242da070477b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6tzsch?= <git@johannesloetzsch.de>
Date: Fri, 3 Jul 2020 01:49:47 +0200
Subject: [PATCH] pythonPackages.blockdiag: 1.5.3 -> 2.0.1

---
 .../python-modules/blockdiag/default.nix      | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix
index ceaa31874ec..ff53884ef37 100644
--- a/pkgs/development/python-modules/blockdiag/default.nix
+++ b/pkgs/development/python-modules/blockdiag/default.nix
@@ -1,23 +1,21 @@
-{ stdenv, fetchurl, buildPythonPackage, pep8, nose, unittest2, docutils
-, pillow, webcolors, funcparserlib
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, setuptools, funcparserlib, pillow, webcolors, reportlab, docutils
 }:
 
 buildPythonPackage rec {
   pname = "blockdiag";
-  version = "1.5.3";
+  version = "2.0.1";
 
-  src = fetchurl {
-    url = "https://bitbucket.org/blockdiag/blockdiag/get/${version}.tar.bz2";
-    sha256 = "0r0qbmv0ijnqidsgm2rqs162y9aixmnkmzgnzgk52hiy7ydm4k8f";
+  src = fetchFromGitHub {
+    owner = "blockdiag";
+    repo = "blockdiag";
+    rev = version;
+    sha256 = "1cvcl66kf4wdh2n4fdk37zk59lp58wd2fhf84n7pbn0lilyksk5x";
   };
 
-  buildInputs = [ pep8 nose unittest2 docutils ];
+  propagatedBuildInputs = [ setuptools funcparserlib pillow webcolors reportlab docutils ];
 
-  propagatedBuildInputs = [ pillow webcolors funcparserlib ];
-
-  # One test fails:
-  #   ...
-  #   FAIL: test_auto_font_detection (blockdiag.tests.test_boot_params.TestBootParams)
+  # require network and fail
   doCheck = false;
 
   meta = with stdenv.lib; {
@@ -25,6 +23,6 @@ buildPythonPackage rec {
     homepage = "http://blockdiag.com/";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ bjornfor ];
+    maintainers = with maintainers; [ bjornfor SuperSandro2000 ];
   };
 }