Merge remote-tracking branch 'upstream/master' into HEAD

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

@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus_glib, dbus_tools, isPyPy
+{ lib, fetchurl, buildPythonPackage, python, pkgconfig, dbus, dbus-glib, dbus_tools, isPyPy
 , ncurses, pygobject3 }:
 
 if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
@@ -15,7 +15,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
   postPatch = "patchShebangs .";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ dbus dbus_glib ]
+  buildInputs = [ dbus dbus-glib ]
     ++ lib.optionals doCheck [ dbus_tools pygobject3 ]
     # My guess why it's sometimes trying to -lncurses.
     # It seems not to retain the dependency anyway.

pkgs/development/python-modules/enum-compat/default.nix

@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, enum34 }:
+
+buildPythonPackage rec {
+  pname = "enum-compat";
+  version = "0.0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k";
+  };
+
+  propagatedBuildInputs = [ enum34 ];
+
+  meta = with lib; {
+    homepage = https://github.com/jstasiak/enum-compat;
+    description = "enum/enum34 compatibility package";
+    license = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/python-modules/flask-assets/default.nix

@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchurl, flask, webassets, flask_script, nose }:
+
+buildPythonPackage rec {
+  name = "Flask-Assets-${version}";
+  version = "0.12";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Assets/${name}.tar.gz";
+    sha256 = "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0";
+  };
+
+  propagatedBuildInputs = [ flask webassets flask_script nose ];
+
+  meta = with lib; {
+    homepage = http://github.com/miracle2k/flask-assets;
+    description = "Asset management for Flask, to compress and merge CSS and Javascript files";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/python-modules/flask-login/default.nix

@@ -1,19 +1,19 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast
-, flask, nose, mock, blinker}:
+, flask, blinker, nose, mock, semantic-version }:
 
 buildPythonPackage rec {
   pname = "Flask-Login";
   name = "${pname}-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "maxcountryman";
     repo = "flask-login";
     rev = version;
-    sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh";
+    sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9";
   };
 
-  buildInputs = [ nose mock ];
+  checkInputs = [ nose mock semantic-version ];
   propagatedBuildInputs = [ flask blinker ];
 
   checkPhase = "nosetests -d";

pkgs/development/python-modules/flask-principal/default.nix

@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchurl, flask, blinker, nose }:
+
+buildPythonPackage rec {
+  name = "Flask-Principal-${version}";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Principal/${name}.tar.gz";
+    sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm";
+  };
+
+  propagatedBuildInputs = [ flask blinker ];
+
+  checkInputs = [ nose ];
+
+  meta = with lib; {
+    homepage = http://packages.python.org/Flask-Principal/;
+    description = "Identity management for flask";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/python-modules/flask-script/default.nix

@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchurl, flask, pytest }:
+
+buildPythonPackage rec {
+  name = "Flask-Script-${version}";
+  version = "2.0.6";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Script/${name}.tar.gz";
+    sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
+  };
+
+  propagatedBuildInputs = [ flask ];
+  checkInputs = [ pytest ];
+
+  meta = with lib; {
+    homepage = http://github.com/smurfix/flask-script;
+    description = "Scripting support for Flask";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -0,0 +1,51 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+# Python bits:
+, buildPythonPackage
+, pytest
+, responses
+, docopt
+, flask
+, markdown
+, path-and-address
+, pygments
+, requests
+, tabulate
+}:
+
+buildPythonPackage rec {
+  pname = "grip";
+  version = "4.4.0";
+
+  src = fetchFromGitHub {
+    owner = "joeyespo";
+    repo = "grip";
+    rev = "v${version}";
+    sha256 = "1768n3w40qg1njkzqjyl5gkva0h31k8h250821v69imj1zimymag";
+  };
+
+  patches = [
+    # Render "front matter", used in our RFC template and elsewhere
+    (fetchpatch {
+      url = https://github.com/joeyespo/grip/pull/249.patch;
+      sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg";
+    })
+  ];
+
+  checkInputs = [ pytest responses ];
+
+  propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ];
+
+  checkPhase = ''
+      export PATH="$PATH:$out/bin"
+      py.test -xm "not assumption"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Preview GitHub Markdown files like Readme locally before committing them";
+    homepage = https://github.com/joeyespo/grip;
+    license = licenses.mit;
+    maintainers = with maintainers; [ koral ];
+  };
+}

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Hidden Markov Models in Python with scikit-learn like API";
-    homepage    = "https://github.com/hmmlearn/hmmlearn";
+    homepage    = https://github.com/hmmlearn/hmmlearn;
     license     = licenses.bsd3;
     maintainers = with maintainers; [ abbradar ];
     platforms   = platforms.unix;

pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, jupyterhub
+, ldap3
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "jupyterhub-ldapauthenticator";
+  version = "1.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19dz3a3122wln8lkixj5jbh9x3cqlrcb3p7a53825cj72cmpcxwz";
+  };
+
+  # No tests implemented
+  doCheck = false;
+   
+  propagatedBuildInputs = [ jupyterhub ldap3 ];
+
+  meta = with lib; {
+    description = "Simple LDAP Authenticator Plugin for JupyterHub";
+    homepage =  https://github.com/jupyterhub/ldapauthenticator;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}

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

@@ -7,13 +7,13 @@ else
 stdenv.mkDerivation rec {
   pname = "libarcus";
   name = "${pname}-${version}";
-  version = "3.0.3";
+  version = "3.2.1";
   
   src = fetchFromGitHub {
     owner = "Ultimaker";
     repo = "libArcus";
     rev = version;
-    sha256 = "05dpd6nx32nws0ghsm365wlsb8hg2s3v9fqcmdk11biwfhnr6rjw";
+    sha256 = "0mln8myvfl7rq2p4g1vadvlykckd8490jijag4xa5hhj3w3p19bk";
   };
   
   propagatedBuildInputs = [ sip protobuf ];

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

@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "libgpuarray";
-  version = "0.6.9";
+  version = "0.7.5";
   name = pname + "-" + version;
 
   src = fetchFromGitHub {
     owner = "Theano";
     repo = "libgpuarray";
     rev = "v${version}";
-    sha256 = "06z47ls42a37gbv0x7f3l1qvils7q0hvy02s95l530klgibp19s0";
+    sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v";
   };
 
   # requires a GPU
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     make -j$NIX_BUILD_CORES
     make install
 
-    ls $out/lib
     export NIX_CFLAGS_COMPILE="-L $out/lib -I $out/include $NIX_CFLAGS_COMPILE"
 
     cd ..

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

@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "NumPy-based text/binary PLY file reader/writer for Python";
-    homepage    = "https://github.com/dranjan/python-plyfile";
+    homepage    = https://github.com/dranjan/python-plyfile;
     maintainers = with maintainers; [ abbradar ];
   };
 

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

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, numpy
+, six
+, nose
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "py_stringmatching";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rjsx7iipn6svki21lmsza7b0dz9vkgmix696zryiv7gkhblqyb4";
+  };
+
+  checkInputs = [ nose ];
+   
+  propagatedBuildInputs = [ numpy six ];
+
+  meta = with lib; {
+    description = "A Python string matching library including string tokenizers and string similarity measures";
+    homepage =  https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}

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

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:
+{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }:
 
 stdenv.mkDerivation rec {
   pname = "pyatspi";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   broken = true;
 
   buildInputs = [
-    at_spi2_core
+    at-spi2-core
     pkgconfig
     pythonPackages.python
     pythonPackages.pygobject3

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

@@ -2,19 +2,19 @@
 
 buildPythonPackage rec {
   pname = "PyChromecast";
-  version = "1.0.3";
+  version = "2.0.0";
   name = pname + "-" + version;
 
   src = fetchurl {
     url    = "mirror://pypi/p/pychromecast/${name}.tar.gz";
-    sha256 = "714a9e03e6a258081e3b6296ed15592e015facbe38bbe60819cca6f04c599f25";
+    sha256 = "1cp1ssfb8zk4sz74nsnf72b7dd5fzkwc4qdgc7rq8nfr4v611w6c";
   };
 
   propagatedBuildInputs = [ requests six zeroconf protobuf ];
 
   meta = with lib; {
     description = "Library for Python 2 and 3 to communicate with the Google Chromecast";
-    homepage    = "https://github.com/balloob/pychromecast";
+    homepage    = https://github.com/balloob/pychromecast;
     license     = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
     platforms   = platforms.linux;

pkgs/development/python-modules/pykde4/kdelibs.nix

@@ -1,6 +1,6 @@
 {
   stdenv, fetchurl,
-  automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared_mime_info,
+  automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared-mime-info,
   attica, docbook_xml_dtd_42, docbook_xsl, giflib,
   libdbusmenu_qt, libjpeg, phonon, qt4
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [
-    automoc4 cmake_2_8 libxslt perl pkgconfig shared_mime_info
+    automoc4 cmake_2_8 libxslt perl pkgconfig shared-mime-info
   ];
   buildInputs = [
     attica giflib libdbusmenu_qt libjpeg

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

@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "pylru-${version}";
+  version = "1.0.9";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pylru/${name}.tar.gz";
+    sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/jlhutch/pylru;
+    description = "A least recently used (LRU) cache implementation";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchurl, pydns }:
+
+buildPythonPackage rec {
+  name = "pyspf-${version}";
+  version = "2.0.12";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/pymilter/pyspf/${name}/${name}.tar.gz";
+    sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
+  };
+
+  propagatedBuildInputs = [ pydns ];
+
+  meta = with lib; {
+    homepage = http://bmsi.com/python/milter.html;
+    description = "Python API for Sendmail Milters (SPF)";
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.gpl2;
+  };
+}

pkgs/development/python-modules/python-axolotl-curve25519/default.nix

@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "python-axolotl-curve25519-${version}";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/python-axolotl-curve25519/${name}.tar.gz";
+    sha256 = "1h1rsdr7m8lvgxwrwng7qv0xxmyc9k0q7g9nbcr6ks2ipyjzcnf5";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/tgalal/python-axolotl-curve25519;
+    description = "Curve25519 with ed25519 signatures";
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.gpl3;
+  };
+}

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

@@ -0,0 +1,22 @@
+{ lib, buildPythonPackage, fetchurl, python-axolotl-curve25519, protobuf, pycrypto }:
+
+buildPythonPackage rec {
+  name = "python-axolotl-${version}";
+  version = "0.1.39";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/python-axolotl/${name}.tar.gz";
+    sha256 = "09bf5gfip9x2wr0ij43p39ac6z2iqzn7kgpi2jjbwpnhs0vwkycs";
+  };
+
+  propagatedBuildInputs = [ python-axolotl-curve25519 protobuf pycrypto ];
+  # IV == 0 in tests is not supported by pycryptodome (our pycrypto drop-in)
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/tgalal/python-axolotl;
+    description = "Python port of libaxolotl-android";
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.gpl3;
+  };
+}

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

@@ -15,9 +15,9 @@ buildPythonPackage rec {
 
   meta = {
     description = "Alternative regular expression module, to replace re";
-    homepage = "https://bitbucket.org/mrabarnett/mrab-regex";
+    homepage = https://bitbucket.org/mrabarnett/mrab-regex;
     license = lib.licenses.psfl;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ abbradar ];
   };
-}
+}

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

@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "sarge-${version}";
+  version = "0.1.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sarge/${name}.tar.gz";
+    sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar";
+  };
+
+  meta = with lib; {
+    homepage = http://sarge.readthedocs.org/;
+    description = "A wrapper for subprocess which provides command pipeline functionality";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "scandir-${version}";
+  version = "1.7";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/scandir/${name}.tar.gz";
+    sha256 ="0gbnhjzg42rj87ljv9kb648rfxph69ly3c8r9841dxy4d7l5pmdj";
+  };
+
+  meta = with lib; {
+    description = "A better directory iterator and faster os.walk()";
+    homepage = https://github.com/benhoyt/scandir;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

pkgs/development/python-modules/sockjs-tornado/default.nix

@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchurl, tornado }:
+
+buildPythonPackage rec {
+  name = "sockjs-tornado-${version}";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
+    sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
+  };
+
+  propagatedBuildInputs = [ tornado ];
+
+  meta = with lib; {
+    homepage = http://github.com/mrjoes/sockjs-tornado/;
+    description = "SockJS python server implementation on top of Tornado framework";
+    license = licenses.mit;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Numpy-based NIST SPH audio-file reader";
-    homepage    = "https://github.com/mcfletch/sphfile";
+    homepage    = https://github.com/mcfletch/sphfile;
     license     = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
     platforms   = platforms.unix;

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

@@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "3.1.0";
+  version = "3.2.1";
   pname = "uranium";
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1wz2nk973g8227r9v6j7gry3m0b0ikirkws8sfhysvgj0vgak9yk";
+    sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz";
   };
 
   buildInputs = [ python gettext ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A Python framework for building Desktop applications";
-    homepage = "https://github.com/Ultimaker/Uranium";
+    homepage = https://github.com/Ultimaker/Uranium;
     license = licenses.agpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ abbradar ];

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

@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }:
+
+buildPythonPackage rec {
+  name = "virtkey-${version}";
+  majorVersion = "0.63";
+  version = "${majorVersion}.0";
+
+  src = fetchurl {
+    url = "https://launchpad.net/virtkey/${majorVersion}/${version}/+download/virtkey-${version}.tar.gz";
+    sha256 = "0hd99hrxn6bh3rxcrdnad5cqjsphrn1s6fzx91q07d44k6cg6qcr";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ];
+
+  meta = with lib; {
+    description = "Extension to emulate keypresses and to get the layout information from the X server";
+    homepage = https://launchpad.net/virtkey;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

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

@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchurl, pyyaml, nose, jinja2, mock, pytest }:
+
+buildPythonPackage rec {
+  name = "webassets-${version}";
+  version = "0.12.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/w/webassets/${name}.tar.gz";
+    sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7";
+  };
+
+  propagatedBuildInputs = [ pyyaml ];
+  checkInputs = [ nose jinja2 mock pytest ];
+
+  # Needs Babel CLI tool
+  doCheck = false;
+  checkPhase = "py.test";
+
+  meta = with lib; {
+    description = "Media asset management for Python, with glue code for various web frameworks";
+    homepage = http://github.com/miracle2k/webassets/;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}