Merge branch 'master' into staging

pkgs/development/python-modules/blivet/default.nix

@@ -28,7 +28,6 @@ in buildPythonPackage rec {
     }' blivet/formats/__init__.py
     sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
     sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
-    sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
   '';
 
   propagatedBuildInputs = [

pkgs/development/python-modules/magic-wormhole/default.nix

@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, nettools, glibcLocales, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "magic-wormhole-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz";
+    sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
+  };
+
+  buildInputs = [ nettools glibcLocales ];
+  propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ];
+
+  patchPhase = ''
+    sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
+    sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_scripts.py
+    # XXX: disable one test due to warning:
+    # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
+    sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py
+  '';
+
+  checkPhase = ''
+    export PATH="$PATH:$out/bin"
+    export LANG="en_US.UTF-8"
+    export LC_ALL="en_US.UTF-8"
+    ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Securely transfer data between computers";
+    homepage = "https://github.com/warner/magic-wormhole";
+    license = licenses.mit;
+    maintainers = with maintainers; [ asymmetric ];
+  };
+}

pkgs/development/python-modules/pycryptodome/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
+
+buildPythonPackage rec {
+  version = "3.4.3";
+  name = "pycryptodome-${version}";
+  namePrefix = "";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
+    sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb";
+  };
+
+  meta = {
+    homepage = "https://www.pycryptodome.org/";
+    description = "Python Cryptography Toolkit";
+    platforms = stdenv.lib.platforms.unix;
+  };
+}