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

pkgs/development/python-modules/globus-sdk/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, flake8
+, nose2
+, mock
+, requests
+, pyjwt
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "globus-sdk";
+  version = "1.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nwdhhn9ib5ln56q8h3g42dl93jl67xlxkgl1wqkh7pacg00r4vs";
+  };
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  # No tests in archive
+  doCheck = false;
+  
+  checkInputs = [ flake8 nose2 mock ];
+  
+  propagatedBuildInputs = [ requests pyjwt  ];
+ 
+  meta = with lib; {
+    description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API.";
+    homepage =  https://github.com/globus/globus-sdk-python;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}

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

@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, six
+, pyjwt
+, requests
+, oauthlib
+, requests_oauthlib
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "mwoauth";
+  version = "0.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1krqz755415z37z1znrc77vi4xyp5ys6fnq4zwcwixjjbzddpavj";
+  };
+
+  # package has no tests
+  doCheck = false;
+  
+  propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ];
+
+  meta = with lib; {
+    description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed.";
+    homepage =  https://github.com/mediawiki-utilities/python-mwoauth;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}

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

@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, jupyterhub
+, globus-sdk
+, mwoauth
+, codecov
+, flake8
+, pyjwt
+, pytest
+, pytestcov
+, pytest-tornado
+, requests-mock
+, pythonOlder
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "oauthenticator";
+  version = "0.7.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rlg63ii7sxj1xad2nx6wk1xgv3a8dm0az0q9g2v6hdv9cnc4b55";
+  };
+
+  checkPhase = ''
+    py.test oauthenticator/tests
+  '';
+
+  # No tests in archive
+  doCheck = false;
+   
+  checkInputs = [  globus-sdk mwoauth codecov flake8 pytest
+    pytestcov pytest-tornado requests-mock pyjwt ];
+  
+  propagatedBuildInputs = [ jupyterhub ];
+
+  disabled = pythonOlder "3.4";
+
+  meta = with lib; {
+    description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more.";
+    homepage =  https://github.com/jupyterhub/oauthenticator;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}

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

@@ -1,24 +1,32 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy3k
 , Mako, packaging, pysocks, pygments, ROPGadget
 , capstone, paramiko, pip, psutil
-, pyelftools, pypandoc, pyserial, dateutil
-, requests, tox, pandoc, unicorn, intervaltree }:
+, pyelftools, pyserial, dateutil
+, requests, tox, unicorn, intervaltree, fetchpatch }:
 
 buildPythonPackage rec {
   version = "3.11.0";
   pname = "pwntools";
-  name = pname + "-" + version;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "609b3f0ba47c975f4dbedd3da2af4c5ca1b3a2aa13fb99240531b6a68edb87be";
   };
 
-  propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pypandoc pyserial dateutil requests tox pandoc unicorn intervaltree ];
+  propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ];
 
   disabled = isPy3k;
   doCheck = false; # no setuptools tests for the package
 
+  # Can be removed when 3.12.0 is released
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Gallopsled/pwntools/pull/1098.patch";
+      sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2";
+    })
+  ];
+
+
   meta = with stdenv.lib; {
     homepage = "http://pwntools.com";
     description = "CTF framework and exploit development library";

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

@@ -27,6 +27,6 @@ buildPythonPackage rec {
     description = "Thin wrapper for pandoc";
     homepage = https://github.com/bebraw/pypandoc;
     license = licenses.mit;
-    maintainers = with maintainers; [ bennofs kristoff3r ];
+    maintainers = with maintainers; [ bennofs ];
   };
 }

pkgs/development/python-modules/pytest-aiohttp/default.nix

@@ -11,6 +11,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytest aiohttp ];
 
+  # There are no tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/aio-libs/pytest-aiohttp/;
     description = "Pytest plugin for aiohttp support";

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

@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, pytest
+, tornado
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-tornado";
+  version = "0.4.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0b1r5im7qmbpmxhfvq13a6rp78sjjrrpysfnjkd9hggavgc75dr8";
+  };
+
+  # package has no tests
+  doCheck = false;
+
+  propagatedBuildInputs = [ pytest tornado ];
+
+  meta = with lib; {
+    description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications.";
+    homepage =  https://github.com/eugeniy/pytest-tornado;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}

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

@@ -0,0 +1,38 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy27
+, testfixtures
+, unittest2
+, webtest
+, pyramid
+, sqlalchemy
+, simplejson
+, mozsvc
+, cornice
+, pyramid_hawkauth
+, pymysql
+, pymysqlsa
+, umemcache
+, WSGIProxy
+, requests
+, pybrowserid
+}:
+
+buildPythonPackage rec {
+  name = "serversyncstorage-${version}";
+  version = "1.6.11";
+  disabled = !isPy27;
+
+  src = fetchgit {
+    url = https://github.com/mozilla-services/server-syncstorage.git;
+    rev = "refs/tags/${version}";
+    sha256 = "197gj2jfs2c6nzs20j37kqxwi91wabavxnfm4rqmrjwhgqjwhnm0";
+  };
+
+  buildInputs = [ testfixtures unittest2 webtest ];
+  propagatedBuildInputs = [
+    pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql
+    pymysqlsa umemcache WSGIProxy requests pybrowserid
+  ];
+}

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

@@ -0,0 +1,39 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, isPy27
+, unittest2
+, cornice
+, gunicorn
+, pyramid
+, requests
+, simplejson
+, sqlalchemy
+, mozsvc
+, tokenserver
+, serversyncstorage
+, configparser
+}:
+
+buildPythonPackage rec {
+  name = "syncserver-${version}";
+  version = "1.6.0";
+  disabled = ! isPy27;
+
+  src = fetchgit {
+    url = https://github.com/mozilla-services/syncserver.git;
+    rev = "refs/tags/${version}";
+    sha256 = "1fsiwihgq3z5b5kmssxxil5g2abfvsf6wfikzyvi4sy8hnym77mb";
+  };
+
+  buildInputs = [ unittest2 ];
+  propagatedBuildInputs = [
+    cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver
+    serversyncstorage configparser
+  ];
+
+  meta = {
+    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

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

@@ -0,0 +1,36 @@
+{ stdenv
+, buildPythonPackage
+, fetchgit
+, testfixtures
+, cornice
+, mozsvc
+, pybrowserid
+, tokenlib
+, pymysql
+, umemcache
+, hawkauthlib
+, alembic
+, pymysqlsa
+, paste
+, boto
+}:
+
+buildPythonPackage rec {
+  name = "tokenserver-${version}";
+  version = "1.2.27";
+
+  src = fetchgit {
+    url = https://github.com/mozilla-services/tokenserver.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0il3bgjld495g9gxvvrm56kpan5swaizzg216qz3zxmb6w9ly3fm";
+  };
+
+  doCheck = false;
+  buildInputs = [ testfixtures ];
+  propagatedBuildInputs = [ cornice mozsvc pybrowserid tokenlib
+    pymysql umemcache hawkauthlib alembic pymysqlsa paste boto ];
+
+  meta = {
+    platforms = stdenv.lib.platforms.all;
+  };
+}