From 18637d877a282e039a05e93681953d2ff984919c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Nov 2016 09:12:23 +0100
Subject: [PATCH] magic-wormhole: move to python-packages

since it is actually a library.
---
 .../python-modules/magic-wormhole/default.nix | 26 +++++++++++++++++++
 pkgs/tools/misc/magic-wormhole/default.nix    | 24 -----------------
 pkgs/top-level/all-packages.nix               |  1 -
 pkgs/top-level/python-packages.nix            |  1 +
 4 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/magic-wormhole/default.nix
 delete mode 100644 pkgs/tools/misc/magic-wormhole/default.nix

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
new file mode 100644
index 00000000000..304476c26a8
--- /dev/null
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -0,0 +1,26 @@
+{ fetchurl, lib, buildPythonPackage, python, autobahn
+, cffi, click, hkdf, pynacl, spake2, tqdm }:
+
+buildPythonPackage rec {
+  name = "magic-wormhole-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz";
+    sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
+  };
+  checkPhase = ''
+    ${python.interpreter} -m wormhole.test.run_trial wormhole
+  '';
+
+  # Several test failures, network related.
+  doCheck = false;
+
+  propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ];
+  meta = {
+    description = "Securely transfer data between computers";
+    homepage = "https://github.com/warner/magic-wormhole";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ asymmetric ];
+  };
+}
diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix
deleted file mode 100644
index c35d3b666ac..00000000000
--- a/pkgs/tools/misc/magic-wormhole/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pythonPackages }:
-
-with stdenv.lib;
-
-pythonPackages.buildPythonApplication rec {
-  name = "magic-wormhole-${version}";
-  version = "0.8.1";
-
-  src = fetchurl {
-    url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz";
-    sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
-  };
-  checkPhase = ''
-    ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole
-  '';
-
-  propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ];
-  meta = {
-    description = "Securely transfer data between computers";
-    homepage = "https://github.com/warner/magic-wormhole";
-    license = licenses.mit;
-    maintainers = with maintainers; [ asymmetric ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8600419a70..ad9ec6de8ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -920,7 +920,6 @@ in
 
   long-shebang = callPackage ../misc/long-shebang {};
 
-  magic-wormhole = callPackage ../tools/misc/magic-wormhole {};
   mathics = pythonPackages.mathics;
 
   meson = callPackage ../development/tools/build-managers/meson { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71d8c229f63..03825f41185 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26273,6 +26273,7 @@ in {
     };
   });
 
+  magic-wormhole = callPackage ../development/python-modules/magic-wormhole {};
 
   wsgiproxy2 = buildPythonPackage rec {
     name = "WSGIProxy2-0.4.2";