Merge branch 'master' into staging-next

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

@@ -0,0 +1,38 @@
+{ buildPythonPackage, fetchFromGitHub, lib,
+  z3, ply, python-igraph, oset, ordered-set, dictionaries }:
+
+buildPythonPackage {
+  pname = "cozy";
+  version = "2.0a1";
+
+  propagatedBuildInputs = [
+    z3 ply python-igraph oset ordered-set dictionaries
+  ];
+
+  src = fetchFromGitHub {
+    owner = "CozySynthesizer";
+    repo = "cozy";
+    rev = "f553e9b";
+    sha256 = "1jhr5gzihj8dkg0yc5dmi081v2isxharl0ph7v2grqj0bwqzl40j";
+  };
+
+  # Yoink the Z3 dependency name, because our Z3 package doesn't provide it.
+  postPatch = ''
+    sed -i -e '/z3-solver/d' requirements.txt
+  '';
+
+  # Tests are not correctly set up in the source tree.
+  doCheck = false;
+
+  # There is some first-time-run codegen that we will force to happen.
+  postInstall = ''
+    $out/bin/cozy --help
+  '';
+
+  meta = {
+    description = "The collection synthesizer";
+    homepage = https://cozy.uwplse.org/;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.MostAwesomeDude ];
+  };
+}

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

@@ -0,0 +1,19 @@
+{ buildPythonPackage, fetchPypi, lib, six }:
+
+buildPythonPackage rec {
+  pname = "dictionaries";
+  version = "0.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1jx2ph509sk4l7spslz16y8l6xn97d13nspn4ds2lxn5ward9ihy";
+  };
+
+  buildInputs = [ six ];
+
+  meta = {
+    description = "Dict implementations with attribute access";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.MostAwesomeDude ];
+  };
+}

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

@@ -1,21 +1,20 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, hidapi
-, pycrypto, pillow, protobuf, future
-}:
+{ lib, fetchPypi, buildPythonPackage, isPy3k, future }:
 
 buildPythonPackage rec {
   pname = "ECPy";
   version = "0.9.1";
 
-  disabled = !isPy3k;
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "f0df66be67f3de0152dfb3c453f4247bdfa2b4e37aa75b98617a637376032229";
   };
 
-  buildInputs = [ hidapi pycrypto pillow protobuf future ];
+  propagatedBuildInputs = lib.optional (!isPy3k) future;
 
-  meta = with stdenv.lib; {
+  # No tests implemented
+  doCheck = false;
+
+  meta = with lib; {
     description = "Pure Pyhton Elliptic Curve Library";
     homepage = https://github.com/ubinity/ECPy;
     license = licenses.asl20;

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

@@ -22,7 +22,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest numpy nbconvert pandas mock ];
-  propagatedBuildInputs = [ jinja2 branca six requests ];
+  propagatedBuildInputs = [ jinja2 branca six requests numpy ];
 
   # No tests in archive
   doCheck = false;

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

@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pycryptodome
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "httpsig";
+  version = "1.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19ng7y7blp13z081z5a6dxng1p8xlih7g6frmsg3q5ri8lvpybc7";
+  };
+
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ pycryptodome requests ];
+
+  # Jailbreak pycryptodome
+  preBuild = ''
+    substituteInPlace setup.py --replace "==3.4.7" ""
+  '';
+
+  meta = with lib; {
+    description = "Sign HTTP requests with secure signatures";
+    license = licenses.mit;
+    maintainers = with maintainers; [ srhb ];
+    homepage = https://github.com/ahknight/httpsig;
+  };
+}

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

@@ -1,4 +1,4 @@
-{lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas, hostPlatform }:
+{ stdenv, lib, fetchPypi, python, buildPythonPackage, isPyPy, gfortran, pytest, blas }:
 
 buildPythonPackage rec {
   pname = "numpy";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     ./numpy-distutils-C++.patch
   ];
 
-  postPatch = lib.optionalString hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     # Use fenv.h
     sed -i \
       numpy/core/src/npymath/ieee754.c.src \

pkgs/development/python-modules/ordered-set/default.nix

@@ -0,0 +1,26 @@
+{ buildPythonPackage, fetchPypi, lib, pytest }:
+
+buildPythonPackage rec {
+  pname = "ordered-set";
+  version = "3.0.1";
+
+  buildInputs = [ pytest ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0yyfkkfzpwlx4jlfqzb7p1xpzmn2jyzq2qlakqx62pxizfzxfvrx";
+  };
+
+  checkPhase = ''
+    py.test test.py
+  '';
+
+  meta = {
+    description = "A MutableSet that remembers its order, so that every entry has an index.";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.MostAwesomeDude ];
+  };
+}
+
+
+

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

@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage, hostPlatform }:
+{ stdenv, lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "pyserial";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = "python -m unittest discover -s test";
-  doCheck = !hostPlatform.isDarwin; # broken on darwin
+  doCheck = !stdenv.hostPlatform.isDarwin; # broken on darwin
 
   meta = with lib; {
     homepage = "https://github.com/pyserial/pyserial";

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

@@ -0,0 +1,22 @@
+{ buildPythonPackage, fetchPypi, lib,
+  pkgconfig, igraph }:
+
+buildPythonPackage rec {
+  pname = "python-igraph";
+  version = "0.7.1.post6";
+
+  buildInputs = [ pkgconfig igraph ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xp61zz710qlzhmzbfr65d5flvsi8zf2xy78s6rsszh719wl5sm5";
+  };
+
+  meta = {
+    description = "High performance graph data structures and algorithms";
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.MostAwesomeDude ];
+  };
+}
+
+