Merge branch 'master' into staging

* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...

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

@@ -1,14 +1,14 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchPypi,
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  version = "1.4.2";
+  version = "1.4.3";
   pname = "asgi_redis";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
-    sha256 = "aa8e9342a3e66c4e7f9035b074f6f66b92e5f1cf8022f1446106ed6dd004a274";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10xk7k7mcd28nb3v93mc8xa7sa6p02jnbl8idk6scr6p75jaixzi";
   };
 
   # Requires a redis server available

pkgs/development/python-modules/cgroup-utils/default.nix

@@ -22,6 +22,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Utility tools for control groups of Linux";
     maintainers = with maintainers; [ layus ];
+    platforms = platforms.linux;
     license = licenses.gpl2;
   };
 }

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

@@ -0,0 +1,28 @@
+{ stdenv, fetchPypi, buildPythonPackage,
+  mock, django, redis, msgpack }:
+buildPythonPackage rec {
+  pname = "django-redis";
+  version = "4.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "170dbk1wmdg0mxp5m3376zz54dyxmhmhnswrccf0jnny1wqcgpsp";
+  };
+
+  doCheck = false;
+
+  buildInputs = [ mock ];
+
+  propagatedBuildInputs = [
+    django
+    redis
+    msgpack
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Full featured redis cache backend for Django";
+    homepage = https://github.com/niwibe/django-redis;
+    license = licenses.bsd3;
+  };
+}

pkgs/development/python-modules/flake8-future-import/default.nix

@@ -1,4 +1,5 @@
-{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six }:
+{ lib, fetchFromGitHub, buildPythonPackage, python, flake8, six,
+  fetchurl }:
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
@@ -11,6 +12,17 @@ buildPythonPackage rec {
     rev = version;
     sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4";
   };
+
+  patches = [
+    # Tests in 0.4.3 are broken. We can remove this patch after
+    # the next release.
+    (fetchurl {
+      url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch";
+      sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn";
+    })
+  ];
+
+
   propagatedBuildInputs = [ flake8 six ];
   meta = {
     homepage = https://github.com/xZise/flake8-future-import;

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

@@ -0,0 +1,35 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, nose
+, django
+, tornado
+, six
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "livereload";
+  version = "2.5.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "lepture";
+    repo = "python-livereload";
+    rev = "v${version}";
+    sha256 = "1irs59wqmffp8q4l9fh7givs05mamlgm5n7ga49gwxp5imwrdzba";
+  };
+
+  buildInputs = [ nose django ];
+
+  propagatedBuildInputs = [ tornado six ];
+
+  checkInputs = [ pytest ];
+  checkPhase = "pytest tests";
+
+  meta = {
+    description = "Runs a local server that reloads as you develop";
+    homepage = "https://github.com/lepture/python-livereload";
+    license = lib.licenses.bsd3;
+  };
+}

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

@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, samba, pkgconfig
+, setuptools }:
+
+buildPythonPackage rec {
+  version = "1.0.15.8";
+  pname = "pysmbc";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "tar.bz2";
+    sha256 = "07dzxfdqaj6zjg2rxxdww363bh8m02mcvgk47jw005cik9wc2rq5";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ setuptools samba ];
+
+  meta = with stdenv.lib; {
+    description = "libsmbclient binding for Python";
+    homepage = https://github.com/hamano/pysmbc;
+    license = licenses.gpl2Plus;
+  };
+}

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

@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+buildPythonPackage rec {
+  pname = "redis";
+  version = "2.10.6";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03vcgklykny0g0wpvqmy8p6azi2s078317wgb2xjv5m2rs9sjb52";
+  };
+
+  # tests require a running redis
+  doCheck = false;
+
+  meta = {
+    description = "Python client for Redis key-value store";
+    homepage = "https://pypi.python.org/pypi/redis/";
+  };
+}

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

@@ -1,20 +1,15 @@
-{ stdenv
-, fetchPypi
-, buildPythonPackage
-, semantic-version
-, boto3
-, flask
-, docutils
+{ stdenv, fetchPypi, buildPythonPackage
+, semantic-version, boto3, flask, docutils, requests
 }:
 
 buildPythonPackage rec {
   pname = "tiros";
   name = "${pname}-${version}";
-  version = "1.0.38";
+  version = "1.0.39";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0k668z9gb5vh304gysynj4rxgi24wy2vl4a33dnwkri2g6db3s4n";
+    sha256 = "10wh84lpl7k8i69hlxwrzp2lln63w2afv9l7ij7r3lqjwd0z0skr";
   };
 
   patchPhase = ''
@@ -22,5 +17,5 @@ buildPythonPackage rec {
     sed -i "s/'datetime',//" setup.py
   '';
 
-  propagatedBuildInputs = [ semantic-version boto3 flask docutils ];
+  propagatedBuildInputs = [ semantic-version boto3 flask docutils requests ];
 }