Merge branch 'master' into staging

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, six}:
+
+buildPythonPackage rec {
+  pname = "bumps";
+  version = "0.7.6";
+
+  propagatedBuildInputs = [six];
+
+  # Bumps does not provide its own tests.py, so the test
+  # always fails
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ahzw8ls9wsz2ks668s15zskyykib52fhi07mg50hp7lw9avqb5k";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.reflectometry.org/danse/software.html;
+    description = "Data fitting with bayesian uncertainty analysis";
+    maintainers = with maintainers; [ rprospero ];
+    license = licenses.publicDomain;
+  };
+}

pkgs/development/python-modules/graph-tool/2.x.x.nix

@@ -1,9 +1,11 @@
 { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
 pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
-gobjectIntrospection, pygobject3, gtk3, matplotlib }:
+gobjectIntrospection, pygobject3, gtk3, matplotlib, ncurses,
+buildPythonPackage }:
 
-stdenv.mkDerivation rec {
-  version = "2.16";
+buildPythonPackage rec {
+  format = "other";
+  version = "2.26";
   name = "${python.libPrefix}-graph-tool-${version}";
 
   meta = with stdenv.lib; {
@@ -16,16 +18,19 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    sha256 = "03b1pmh2gvsgyq491gvskx8fwgqy9k942faymdnhwpbbbfhx911p";
+    sha256 = "0w7pd2h8ayr88kjl82c8fdshnk6f3xslc77gy7ma09zkbvf76qnz";
   };
 
   configureFlags = [
     "--with-python-module-path=$(out)/${python.sitePackages}"
+    "--with-boost-libdir=${boost}/lib"
+    "--with-expat=${expat}"
+    "--with-cgal=${cgal}"
     "--enable-openmp"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ ];
+  buildInputs = [ ncurses ];
 
   propagatedBuildInputs = [
     boost

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

@@ -0,0 +1,20 @@
+{lib, fetchPypi, buildPythonPackage, numpy, pyparsing}:
+
+buildPythonPackage rec{
+  pname = "periodictable";
+  version = "1.5.0";
+
+  propagatedBuildInputs = [numpy pyparsing];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1cjk6aqcz41nxm4fpriz01vqdafd6g57cjk0wh1iklk5cx6c085h";
+  };
+
+  meta = {
+    homepage = http://www.reflectometry.org/danse/software.html;
+    description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments";
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ rprospero ];
+  };
+}

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

@@ -0,0 +1,40 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, pkgconfig
+, systemd, libyaml, openzwave, cython
+, six, pydispatcher, urwid }:
+
+buildPythonPackage rec {
+  pname = "python_openzwave";
+  version = "0.4.4";
+
+  disabled = !isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17wdgwg212agj1gxb2kih4cvhjb5bprir4x446s8qwx0mz03azk2";
+    extension = "zip";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ systemd libyaml openzwave cython ];
+  propagatedBuildInputs = [ six urwid pydispatcher ];
+
+  # primary location for the .xml files is in /etc/openzwave so we override the
+  # /usr/local/etc lookup instead as that allows us to dump new .xml files into
+  # /etc/openzwave if needed
+  postPatch = ''
+    substituteInPlace src-lib/libopenzwave/libopenzwave.pyx \
+      --replace /usr/local/etc/openzwave ${openzwave}/etc/openzwave
+  '';
+
+  # no tests available
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python wrapper for the OpenZWave C++ library";
+    homepage = https://github.com/OpenZWave/python-openzwave;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ etu ];
+    inherit (openzwave.meta) platforms;
+  };
+}

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

@@ -0,0 +1,24 @@
+{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}:
+
+buildPythonPackage rec {
+  pname = "sasmodels";
+  version = "0.96";
+
+  buildInputs = [pytest];
+  propagatedBuildInputs = [docutils matplotlib numpy scipy];
+
+  preCheck = ''export HOME=$(mktemp -d)'';
+
+  src = fetchgit {
+    url = "https://github.com/SasView/sasmodels.git";
+    rev = "v${version}";
+    sha256 = "11qaaqdc23qzb75zs48fkypksmcb332vl0pkjqr5bijxxymgm7nw";
+  };
+
+  meta = {
+    description = "Library of small angle scattering models";
+    homepage = http://sasview.org;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ rprospero ];
+  };
+}

pkgs/development/python-modules/unittest-xml-reporting/default.nix

@@ -0,0 +1,23 @@
+{lib, fetchPypi, buildPythonPackage, six}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "unittest-xml-reporting";
+  version = "2.1.1";
+
+  propagatedBuildInputs = [six];
+
+  # The tarball from Pypi doesn't actually contain the unit tests
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1jwkqx5gfphkymp3xwqvlb94ng22gpbqh36vbbnsrpk1a0mammm6";
+  };
+  meta = with lib; {
+    homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/;
+    description = "A unittest runner that can save test results to XML files";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ rprospero ];
+  };
+}