Merge remote-tracking branch 'NixOS/master' into staging

2019-04-23 22:00:42 -04:00
parent dc552fd2ff 6088a4793f
commit 84d00355e8
395 changed files with 10057 additions and 5223 deletions
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -59,7 +59,7 @@ in buildPythonPackage rec {

  meta = {
    description = "An optimising static compiler for both the Python programming language and the extended Cython programming language";
-    homepage = http://cython.org;
+    homepage = https://cython.org;
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ fridh ];
  };
--- a/pkgs/development/python-modules/Flask-PyMongo/default.nix
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ flask pymongo vcversioner ];

  meta = {
-    homepage = "http://flask-pymongo.readthedocs.org/";
+    homepage = "https://flask-pymongo.readthedocs.org/";
    description = "PyMongo support for Flask applications";
    license = lib.licenses.bsd2;
  };
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,6 +30,8 @@
 , toml
 , notebook
 , ruamel_yaml
+, aiohttp
+, watchdog
 }:

 buildPythonPackage rec {
@@ -48,7 +50,7 @@ buildPythonPackage rec {
    doit pygments pillow dateutil docutils Mako markdown unidecode
    lxml Yapsy PyRSS2Gen Logbook blinker natsort requests piexif Babel
    # requirements-extras.txt
-    phpserialize jinja2 toml notebook ruamel_yaml
+    phpserialize jinja2 toml notebook ruamel_yaml aiohttp watchdog
  ];

  src = fetchPypi {
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -1,12 +1,14 @@
-{ lib, buildPythonPackage, fetchPypi, attrs, protobuf, zeroconf }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, attrs, protobuf, zeroconf }:

 buildPythonPackage rec {
  pname = "aioesphomeapi";
-  version = "1.8.0";
+  version = "2.0.1";
+
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "16ywa7yggmsx8m2r9azdq7w9fxjh736g1vd1aibgh24g7srhwwhj";
+    sha256 = "db09e34dfc148279f303481c7da94b84c9b1442a41794f039c31253e81a58ffb";
  };

  propagatedBuildInputs = [ attrs protobuf zeroconf ];
@@ -19,5 +21,9 @@ buildPythonPackage rec {
    homepage = https://github.com/esphome/aioesphomeapi;
    license = licenses.mit;
    maintainers = with maintainers; [ dotlambda ];
+
+    # Home Assistant should pin protobuf to the correct version. Can be tested using
+    #     nix-build -E "with import ./. {}; home-assistant.override { extraPackages = ps: [ ps.aioesphomeapi ]; }"
+    broken = !lib.hasPrefix "3.6.1" protobuf.version;
  };
 }
--- a/pkgs/development/python-modules/aioeventlet/default.nix
+++ b/pkgs/development/python-modules/aioeventlet/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "aioeventlet implements the asyncio API (PEP 3156) on top of eventlet. It makes";
-    homepage = http://aioeventlet.readthedocs.org/;
+    homepage = https://aioeventlet.readthedocs.org/;
    license = licenses.asl20;
  };

--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {

  meta = {
    description = "Runtime for ANTLR";
-    homepage = "http://www.antlr.org/";
+    homepage = "https://www.antlr.org/";
    license = stdenv.lib.licenses.bsd3;
  };
 }
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {

  meta = {
    description = "Astronomy/Astrophysics library for Python";
-    homepage = http://www.astropy.org;
+    homepage = https://www.astropy.org;
    license = lib.licenses.bsd3;
    platforms = lib.platforms.all;
    maintainers = with lib.maintainers; [ kentjames ];
--- a/pkgs/development/python-modules/cement/default.nix
+++ b/pkgs/development/python-modules/cement/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
  disabled = !isPy3k;

  meta = with stdenv.lib; {
-    homepage = http://builtoncement.com/;
+    homepage = https://builtoncement.com/;
    description = "A CLI Application Framework for Python.";
    maintainers = with maintainers; [ eqyiel ];
    license = licenses.bsd3;
--- a/pkgs/development/python-modules/construct/default.nix
+++ b/pkgs/development/python-modules/construct/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Powerful declarative parser (and builder) for binary data";
-    homepage = http://construct.readthedocs.org/;
+    homepage = https://construct.readthedocs.org/;
    license = licenses.mit;
    maintainers = with maintainers; [ bjornfor ];
  };
--- a/pkgs/development/python-modules/contextlib2/default.nix
+++ b/pkgs/development/python-modules/contextlib2/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {

  meta = {
    description = "Backports and enhancements for the contextlib module";
-    homepage = http://contextlib2.readthedocs.org/;
+    homepage = https://contextlib2.readthedocs.org/;
    license = lib.licenses.psfl;
  };
 }
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {

    meta = with stdenv.lib; {
      description = "Read DBF Files with Python";
-      homepage    = http://dbfread.readthedocs.org/;
+      homepage    = https://dbfread.readthedocs.org/;
      license     = with licenses; [ mit ];
      maintainers = with maintainers; [ vrthra ];
    };
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -9,7 +9,7 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
  outputs = [ "out" "dev" "doc" ];

  src = fetchurl {
-    url = "http://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz";
+    url = "https://dbus.freedesktop.org/releases/dbus-python/${pname}-${version}.tar.gz";
    sha256 = "1k7rnaqrk7mdkg0k6n2jn3d1mxsl7s3i07g5a8va5yvl3y3xdwg2";
  };

--- a/pkgs/development/python-modules/dendropy/default.nix
+++ b/pkgs/development/python-modules/dendropy/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
  '';

  meta = {
-    homepage = http://dendropy.org/;
+    homepage = https://dendropy.org/;
    description = "A Python library for phylogenetic computing";
    maintainers = with lib.maintainers; [ unode ];
    license = lib.licenses.bsd3;
--- a/pkgs/development/python-modules/django_appconf/default.nix
+++ b/pkgs/development/python-modules/django_appconf/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "A helper class for handling configuration defaults of packaged apps gracefully";
-    homepage = http://django-appconf.readthedocs.org/;
+    homepage = https://django-appconf.readthedocs.org/;
    license = licenses.bsd2;
    maintainers = with maintainers; [ desiderius ];
  };
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {

    meta = with stdenv.lib; {
      description = "Compresses linked and inline JavaScript or CSS into single cached files";
-      homepage = http://django-compressor.readthedocs.org/en/latest/;
+      homepage = https://django-compressor.readthedocs.org/en/latest/;
      license = licenses.mit;
      maintainers = with maintainers; [ desiderius ];
    };
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Web APIs for Django, made easy";
-    homepage = http://www.django-rest-framework.org/;
+    homepage = https://www.django-rest-framework.org/;
    maintainers = with maintainers; [ desiderius ];
    license = licenses.bsd2;
  };
--- a/pkgs/development/python-modules/dyn/default.nix
+++ b/pkgs/development/python-modules/dyn/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Dynect dns lib";
-    homepage = "http://dyn.readthedocs.org/en/latest/intro.html";
+    homepage = "https://dyn.readthedocs.org/en/latest/intro.html";
    license = licenses.bsd3;
  };
 }
--- a/pkgs/development/python-modules/evdev/default.nix
+++ b/pkgs/development/python-modules/evdev/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Provides bindings to the generic input event interface in Linux";
-    homepage = http://pythonhosted.org/evdev;
+    homepage = https://pythonhosted.org/evdev;
    license = licenses.bsd3;
    maintainers = with maintainers; [ goibhniu ];
    platforms = platforms.linux;
--- a/pkgs/development/python-modules/events/default.nix
+++ b/pkgs/development/python-modules/events/default.nix
@@ -10,7 +10,7 @@ buildPythonPackage rec {
  };

  meta = with lib; {
-    homepage = http://events.readthedocs.org;
+    homepage = https://events.readthedocs.org;
    description = "Bringing the elegance of C# EventHanlder to Python";
    license = licenses.bsd3;
  };
--- a/pkgs/development/python-modules/flexmock/default.nix
+++ b/pkgs/development/python-modules/flexmock/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes.";
-    homepage = http://flexmock.readthedocs.org;
+    homepage = https://flexmock.readthedocs.org;
    license = licenses.bsdOriginal;
  };
 }
--- a/pkgs/development/python-modules/forbiddenfruit/default.nix
+++ b/pkgs/development/python-modules/forbiddenfruit/default.nix
@@ -5,23 +5,21 @@
 }:

 buildPythonPackage rec {
-  version = "0.1.2";
+  version = "0.1.3";
  pname = "forbiddenfruit";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "09ee1959fa34936c15417defa28bfd09cf88ad54c15454bc863d465ed42b8922";
+    sha256 = "1188a07cc24a9bd2c529dad06490b80a6fc88cde968af4d7861da81686b2cc8c";
  };

  checkInputs = [ nose ];

  checkPhase = ''
+    find ./build -name '*.so' -exec mv {} tests/unit \;
    nosetests
  '';

-  # tests directory missing in PyPI tarball
-  doCheck = false;
-
  meta = with stdenv.lib; {
    description = "Patch python built-in objects";
    homepage = https://pypi.python.org/pypi/forbiddenfruit;
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Collection of fancy functional tools focused on practicality";
-    homepage = "http://funcy.readthedocs.org/";
+    homepage = "https://funcy.readthedocs.org/";
    license = licenses.bsd3;
  };

--- a/pkgs/development/python-modules/genzshcomp/default.nix
+++ b/pkgs/development/python-modules/genzshcomp/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Automatically generated zsh completion function for Python's option parser modules";
-    homepage = http://bitbucket.org/hhatto/genzshcomp/;
+    homepage = https://bitbucket.org/hhatto/genzshcomp/;
    license = licenses.bsd0;
  };

--- a/pkgs/development/python-modules/github3_py/default.nix
+++ b/pkgs/development/python-modules/github3_py/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = with lib; {
-    homepage = http://github3py.readthedocs.org/en/master/;
+    homepage = https://github3py.readthedocs.org/en/master/;
    description = "A wrapper for the GitHub API written in python";
    license = licenses.bsd3;
    maintainers = with maintainers; [ pSub ];
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , isPyPy
 , gmp
 , mpfr
@@ -24,6 +25,17 @@ buildPythonPackage {
    sha256 = "1wg4w4q2l7n26ksrdh4rwqmifgfm32n7x29cgdvmmbv5lmilb5hz";
  };

+  patches = [
+    # Backport of two bugfixes (including a segfault):
+    # https://github.com/aleaxit/gmpy/pull/217
+    # https://github.com/aleaxit/gmpy/pull/218
+    (fetchpatch {
+      name = "bugfixes.patch";
+      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/gmpy2/patches/PR217_PR218_conversion_methods.patch?id=b7fbb9a4dac5d6882f6b83a57447dd79ecafb84c";
+      sha256 = "1x3gwvqac36k4ypclxq37fcvi6p790k4xdpm2bj2b3xsvjb80ycz";
+    })
+  ];
+
  buildInputs = [ gmp mpfr libmpc ];

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -3,7 +3,7 @@
 , doCheck ? true, pytest, pytest_xdist, flaky, mock
 }:
 buildPythonPackage rec {
-  # http://hypothesis.readthedocs.org/en/latest/packaging.html
+  # https://hypothesis.readthedocs.org/en/latest/packaging.html

  # Hypothesis has optional dependencies on the following libraries
  # pytz fake_factory django numpy pytest
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "A parser/generator of iCalendar files";
-    homepage = "http://icalendar.readthedocs.org/";
+    homepage = "https://icalendar.readthedocs.org/";
    license = licenses.bsd2;
    maintainers = with maintainers; [ olcai ];
  };
--- a/pkgs/development/python-modules/imapclient/default.nix
+++ b/pkgs/development/python-modules/imapclient/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
  disabled = isPy34 || isPy35;

  src = fetchurl {
-    url = "http://freshfoo.com/projects/IMAPClient/${pname}-${version}.tar.gz";
+    url = "https://freshfoo.com/projects/IMAPClient/${pname}-${version}.tar.gz";
    sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is";
  };

@@ -24,7 +24,7 @@ buildPythonPackage rec {
  '';

  meta = with stdenv.lib; {
-    homepage = http://imapclient.freshfoo.com/;
+    homepage = https://imapclient.readthedocs.io/en/2.1.0/;
    description = "Easy-to-use, Pythonic and complete IMAP client library";
    license = licenses.bsd3;
  };
--- a/pkgs/development/python-modules/jq/jq-py-setup.patch
+++ b/pkgs/development/python-modules/jq/jq-py-setup.patch
@@ -113,7 +113,7 @@ index 77933f2..2b71e25 100644
 
 setup(
@@ -107,7 +30,6 @@ setup(
-     url='http://github.com/mwilliamson/jq.py',
+     url='https://github.com/mwilliamson/jq.py',
     license='BSD 2-Clause',
     ext_modules = [jq_extension],
 -    cmdclass={"build_ext": jq_build_ext},
--- a/pkgs/development/python-modules/jupyter/default.nix
+++ b/pkgs/development/python-modules/jupyter/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Installs all the Jupyter components in one go";
-    homepage = "http://jupyter.org/";
+    homepage = "https://jupyter.org/";
    license = licenses.bsd3;
    platforms = platforms.all;
    priority = 100; # This is a metapackage which is unimportant
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@@ -35,7 +35,7 @@ buildPythonPackage rec {

  meta = {
    description = "Jupyter protocol implementation and client libraries";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ fridh ];
  };
--- a/pkgs/development/python-modules/jupyter_console/5.nix
+++ b/pkgs/development/python-modules/jupyter_console/5.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {

  meta = {
    description = "Jupyter terminal console";
-    homepage = "http://jupyter.org/";
+    homepage = "https://jupyter.org/";
    license = lib.licenses.bsd3;
  };
 }
--- a/pkgs/development/python-modules/jupyter_console/default.nix
+++ b/pkgs/development/python-modules/jupyter_console/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {

  meta = {
    description = "Jupyter terminal console";
-    homepage = "http://jupyter.org/";
+    homepage = "https://jupyter.org/";
    license = lib.licenses.bsd3;
  };
 }
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Jupyter core package. A base package on which Jupyter projects rely";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = licenses.bsd3;
    maintainers = with maintainers; [ fridh globin ];
  };
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -116,7 +116,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Serves multiple Jupyter notebook instances";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = licenses.bsd3;
    maintainers = with maintainers; [ ixxie cstrahan ];
  };
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Jupyter lab environment notebook server extension.";
    license = with licenses; [ bsd3 ];
-    homepage = "http://jupyter.org/";
+    homepage = "https://jupyter.org/";
    maintainers = with maintainers; [ zimbatm costrouc ];
  };
 }
--- a/pkgs/development/python-modules/jupyterlab_launcher/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_launcher/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "This package is used to launch an application built using JupyterLab";
    license = with licenses; [ bsd3 ];
-    homepage = "http://jupyter.org/";
+    homepage = "https://jupyter.org/";
    maintainers = with maintainers; [ zimbatm ];
  };
 }
--- a/pkgs/development/python-modules/jupyterlab_server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab_server/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "JupyterLab Server";
-    homepage = http://jupyter.org;
+    homepage = https://jupyter.org;
    license = licenses.bsdOriginal;
    maintainers = [ maintainers.costrouc ];
  };
--- a/pkgs/development/python-modules/kaptan/default.nix
+++ b/pkgs/development/python-modules/kaptan/default.nix
@@ -2,27 +2,25 @@
 , buildPythonPackage
 , fetchPypi
 , pyyaml
+, pytest
 }:

 buildPythonPackage rec {
  pname = "kaptan";
-  version = "0.5.11";
+  version = "0.5.12";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "8403d6e48200c3f49cb6d6b3dcb5898aa5ab9d820831655bf9a2403e00cd4207";
+    sha256 = "1abd1f56731422fce5af1acc28801677a51e56f5d3c3e8636db761ed143c3dd2";
  };

-  # https://github.com/emre/kaptan/pull/151
  postPatch = ''
-    substituteInPlace requirements/base.txt \
-      --replace "PyYAML>=3.13,<4" "PyYAML>=3.13"
+    sed -i "s/==.*//g" requirements/test.txt
  '';

  propagatedBuildInputs = [ pyyaml ];

-  # No tests in archive
-  doCheck = false;
+  checkInputs = [ pytest ];

  meta = with stdenv.lib; {
    description = "Configuration manager for python applications";
--- a/pkgs/development/python-modules/macfsevents/default.nix
+++ b/pkgs/development/python-modules/macfsevents/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, CoreFoundation, CoreServices }:
+
+buildPythonPackage rec {
+  pname = "MacFSEvents";
+  version = "0.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1324b66b356051de662ba87d84f73ada062acd42b047ed1246e60a449f833e10";
+  };
+
+  buildInputs = [ CoreFoundation CoreServices ];
+
+  # Some tests fail under nix build directory
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = https://github.com/malthe/macfsevents;
+    description = "Thread-based interface to file system observation primitives";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.marsam ];
+    platforms = platforms.darwin;
+  };
+}
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {

  meta = {
    description = "Converting Jupyter Notebooks";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ fridh globin ];
  };
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -31,7 +31,7 @@ buildPythonPackage rec {

  meta = {
    description = "The Jupyter Notebook format";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ fridh globin ];
  };
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
  '';

  meta = with lib; {
-    homepage = http://nipy.org/nibabel/;
+    homepage = https://nipy.org/nibabel/;
    description = "Access a multitude of neuroimaging data formats";
    license = licenses.mit;
    maintainers = with maintainers; [ ashgillman ];
--- a/pkgs/development/python-modules/nipy/default.nix
+++ b/pkgs/development/python-modules/nipy/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = with stdenv.lib; {
-    homepage = http://nipy.org/nipy/;
+    homepage = https://nipy.org/nipy/;
    description = "Software for structural and functional neuroimaging analysis";
    license = licenses.bsd3;
  };
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -97,7 +97,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = with stdenv.lib; {
-    homepage = http://nipy.org/nipype/;
+    homepage = https://nipy.org/nipype/;
    description = "Neuroimaging in Python: Pipelines and Interfaces";
    license = licenses.bsd3;
    maintainers = with maintainers; [ ashgillman ];
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -66,7 +66,7 @@ buildPythonPackage rec {

  meta = {
    description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ fridh globin ];
  };
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
  disabled = isPy3k;

  src = fetchgit {
-    url = "http://github.com/Eelviny/nxt-python";
+    url = "https://github.com/Eelviny/nxt-python";
    rev = "479e20b7491b28567035f4cee294c4a2af629297";
    sha256 = "0mcsajhgm2wy4iy2lhmyi3xibgmbixbchanzmlhsxk6qyjccn9r9";
    branchName= "pyusb";
--- a/pkgs/development/python-modules/pep8/default.nix
+++ b/pkgs/development/python-modules/pep8/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = with stdenv.lib; {
-    homepage = "http://pep8.readthedocs.org/";
+    homepage = "https://pep8.readthedocs.org/";
    description = "Python style guide checker";
    license = licenses.mit;
    maintainers = with maintainers; [ garbas ];
--- a/pkgs/development/python-modules/pgsanity/default.nix
+++ b/pkgs/development/python-modules/pgsanity/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ postgresql ];

  meta = with stdenv.lib; {
-    homepage = "http://github.com/markdrago/pgsanity";
+    homepage = "https://github.com/markdrago/pgsanity";
    description = "Checks the syntax of Postgresql SQL files";
    longDescription = ''
      PgSanity checks the syntax of Postgresql SQL files by
--- a/pkgs/development/python-modules/praw/default.nix
+++ b/pkgs/development/python-modules/praw/default.nix
@@ -40,7 +40,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Python Reddit API wrapper";
-    homepage = http://praw.readthedocs.org/;
+    homepage = https://praw.readthedocs.org/;
    license = licenses.gpl3;
    platforms = platforms.all;
    maintainers = with maintainers; [ ];
--- a/pkgs/development/python-modules/prawcore/default.nix
+++ b/pkgs/development/python-modules/prawcore/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Low-level communication layer for PRAW";
-    homepage = http://praw.readthedocs.org/;
+    homepage = https://praw.readthedocs.org/;
    license = licenses.gpl3;
    platforms = platforms.all;
    maintainers = with maintainers; [ ];
--- a/pkgs/development/python-modules/py/default.nix
+++ b/pkgs/development/python-modules/py/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Library with cross-python path, ini-parsing, io, code, log facilities";
-    homepage = http://pylib.readthedocs.org/;
+    homepage = https://pylib.readthedocs.org/;
    license = licenses.mit;
  };
 }
--- a/pkgs/development/python-modules/pyscss/default.nix
+++ b/pkgs/development/python-modules/pyscss/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "A Scss compiler for Python";
-    homepage = http://pyscss.readthedocs.org/en/latest/;
+    homepage = https://pyscss.readthedocs.org/en/latest/;
    license = licenses.mit;
  };

--- a/pkgs/development/python-modules/pysensors/default.nix
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
  meta = with stdenv.lib; {
    maintainers = with maintainers; [ guibou ];
    description = "Easy hardware health monitoring in Python for Linux systems";
-    homepage = http://pysensors.readthedocs.org;
+    homepage = https://pysensors.readthedocs.org;
    license = licenses.bsd2;
    platforms = platforms.linux;
  };
--- a/pkgs/development/python-modules/pysolr/default.nix
+++ b/pkgs/development/python-modules/pysolr/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "Lightweight Python wrapper for Apache Solr";
-    homepage = "http://github.com/toastdriven/pysolr/";
+    homepage = "https://github.com/toastdriven/pysolr/";
    license = licenses.bsd3;
  };
 }
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "py.test plugin for testing of Django applications";
-    homepage = http://pytest-django.readthedocs.org/en/latest/;
+    homepage = https://pytest-django.readthedocs.org/en/latest/;
    license = licenses.bsd3;
  };
 }
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -60,7 +60,7 @@ in buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Python bindings for Mapnik";
-    homepage = http://mapnik.org;
+    homepage = https://mapnik.org;
    license  = licenses.lgpl21;
  };

--- a/pkgs/development/python-modules/pytz/default.nix
+++ b/pkgs/development/python-modules/pytz/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "World timezone definitions, modern and historical";
-    homepage = "http://pythonhosted.org/pytz";
+    homepage = "https://pythonhosted.org/pytz";
    license = licenses.mit;
    maintainers = with maintainers; [ dotlambda ];
  };
--- a/pkgs/development/python-modules/pyudev/default.nix
+++ b/pkgs/development/python-modules/pyudev/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = {
-    homepage = http://pyudev.readthedocs.org/;
+    homepage = https://pyudev.readthedocs.org/;
    description = "Pure Python libudev binding";
    license = lib.licenses.lgpl21Plus;
  };
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {

  meta = {
    description = "Jupyter Qt console";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = lib.licenses.bsd3;
    platforms = lib.platforms.unix;
    maintainers = with lib.maintainers; [ fridh ];
--- a/pkgs/development/python-modules/rpyc/default.nix
+++ b/pkgs/development/python-modules/rpyc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Remote Python Call (RPyC), a transparent and symmetric RPC library";
-    homepage = http://rpyc.readthedocs.org;
+    homepage = https://rpyc.readthedocs.org;
    license = licenses.mit;
  };

--- a/pkgs/development/python-modules/salmon-mail/default.nix
+++ b/pkgs/development/python-modules/salmon-mail/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
  '';

  meta = with stdenv.lib; {
-    homepage = http://salmon-mail.readthedocs.org/;
+    homepage = https://salmon-mail.readthedocs.org/;
    description = "Pythonic mail application server";
    license = licenses.gpl3;
    maintainers = with maintainers; [ jluttine ];
--- a/pkgs/development/python-modules/sarge/default.nix
+++ b/pkgs/development/python-modules/sarge/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = with lib; {
-    homepage = http://sarge.readthedocs.org/;
+    homepage = https://sarge.readthedocs.org/;
    description = "A wrapper for subprocess which provides command pipeline functionality";
    license = licenses.bsd3;
    maintainers = with maintainers; [ abbradar ];
--- a/pkgs/development/python-modules/slimit/default.nix
+++ b/pkgs/development/python-modules/slimit/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {

  meta = with lib; {
    description = "JavaScript minifier";
-    homepage = http://slimit.readthedocs.org/;
+    homepage = https://slimit.readthedocs.org/;
    license = licenses.mit;
  };
 }
--- a/pkgs/development/python-modules/snscrape/default.nix
+++ b/pkgs/development/python-modules/snscrape/default.nix
@@ -9,13 +9,13 @@

 buildPythonPackage rec {
  pname = "snscrape";
-  version = "0.1.3";
+  version = "0.2.0";

  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1mnhqqc7xfwg2wrzpj1pjbcisjjwxrgmy21f53p80xbx2iz8b9n1";
+    sha256 = "02mlpzkvpl2mv30cknq6ngw02y7gj2614qikq25ncrpg5vb903d9";
  };

  # There are no tests; make sure the executable works.
--- a/pkgs/development/python-modules/sorl_thumbnail/default.nix
+++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
  doCheck = false;

  meta = with stdenv.lib; {
-    homepage = http://sorl-thumbnail.readthedocs.org/en/latest/;
+    homepage = https://sorl-thumbnail.readthedocs.org/en/latest/;
    description = "Thumbnails for Django";
    license = licenses.bsd3;
  };
--- a/pkgs/development/python-modules/sounddevice/default.nix
+++ b/pkgs/development/python-modules/sounddevice/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "8d0571349f9a438a97f2c69da760f195cf5ddf2351072199cc1dfede4785a207";
+    sha256 = "01x2hm3xxzhxrjcj21si4ggmvkwmy5hag7f6yabqlhwskws721cd";
  };

  propagatedBuildInputs = [ cffi numpy portaudio ];
@@ -34,4 +34,4 @@ buildPythonPackage rec {
    license = with lib.licenses; [ mit ];
    maintainers = with lib.maintainers; [ fridh ];
  };
-}
+}
--- a/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
+++ b/pkgs/development/python-modules/sounddevice/fix-portaudio-library-path.patch
@@ -1,8 +1,8 @@
-diff --git a/sounddevice.py b/sounddevice.py
-index f03476c..5745b6e 100644
--- a/sounddevice.py
-+++ b/sounddevice.py
-@@ -58,28 +58,7 @@ from ctypes.util import find_library as _find_library
+diff --git i/sounddevice.py w/sounddevice.py
+index c7c1d62..aabcb12 100644
+--- i/sounddevice.py
+++ w/sounddevice.py
+@@ -58,29 +58,7 @@ from ctypes.util import find_library as _find_library
 from _sounddevice import ffi as _ffi


@@ -10,6 +10,7 @@ index f03476c..5745b6e 100644
 -    for _libname in (
 -            'portaudio',  # Default name on POSIX systems
 -            'bin\\libportaudio-2.dll',  # DLL from conda-forge
+-            'lib/libportaudio.dylib',  # dylib from anaconda
 -            ):
 -        _libname = _find_library(_libname)
 -        if _libname is not None:
--- a/pkgs/development/python-modules/spotipy/default.nix
+++ b/pkgs/development/python-modules/spotipy/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [ requests ];

  meta = with stdenv.lib; {
-    homepage = http://spotipy.readthedocs.org/;
+    homepage = https://spotipy.readthedocs.org/;
    description = "A light weight Python library for the Spotify Web API";
    license = licenses.mit;
    maintainers = [ maintainers.rvolosatovs ];
--- a/pkgs/development/python-modules/webtest/default.nix
+++ b/pkgs/development/python-modules/webtest/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Helper to test WSGI applications";
-    homepage = http://webtest.readthedocs.org/en/latest/;
+    homepage = https://webtest.readthedocs.org/en/latest/;
    license = licenses.mit;
  };

--- a/pkgs/development/python-modules/wptserve/default.nix
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {

  meta = {
    description = "A webserver intended for web browser testing";
-    homepage =  http://wptserve.readthedocs.org/;
+    homepage =  https://wptserve.readthedocs.org/;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ raskin ];
  };