From 49dbb875369e35b370a18601e8e1d09a9782e1da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 18 Feb 2018 19:19:04 +0100
Subject: [PATCH] pythonPackages.pymacaroons-pynacl: move expression

Tests are now explicitly disabled to fix the build for Python 3.
---
 .../pymacaroons-pynacl/default.nix            | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 +---------
 2 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/python-modules/pymacaroons-pynacl/default.nix

diff --git a/pkgs/development/python-modules/pymacaroons-pynacl/default.nix b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix
new file mode 100644
index 00000000000..8bc644252c0
--- /dev/null
+++ b/pkgs/development/python-modules/pymacaroons-pynacl/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pynacl, six }:
+
+buildPythonPackage rec {
+  pname = "pymacaroons-pynacl";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "matrix-org";
+    repo = "pymacaroons";
+    rev = "v${version}";
+    sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii";
+  };
+
+  propagatedBuildInputs = [ pynacl six ];
+
+  # Tests require an old version of hypothesis
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Macaroon library for Python";
+    homepage = https://github.com/matrix-org/pymacaroons;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa0e0d02517..0eebd578c3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19946,18 +19946,7 @@ EOF
     propagatedBuildInputs = with self; [];
   };
 
-  pymacaroons-pynacl = buildPythonPackage rec {
-    name = "pymacaroons-pynacl-${version}";
-    version = "0.9.3";
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/matrix-org/pymacaroons.git";
-      rev = "refs/tags/v${version}";
-      sha256 = "0bykjk01zdndp6gjr30x46blsn0cvxa7j0zh5g8raxwaawchjhii";
-    };
-
-    propagatedBuildInputs = with self; [ pynacl six ];
-  };
+  pymacaroons-pynacl = callPackage ../development/python-modules/pymacaroons-pynacl { };
 
   pynacl = callPackage ../development/python-modules/pynacl { };