From b0dc5823fa830678aad78efdb26215c7b22d0bc7 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Mon, 11 Oct 2021 18:27:48 +0200
Subject: [PATCH 01/20] blender: 2.93.2 -> 2.93.5

---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 3dfa6d9ab513..a695b0e3e622 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -26,11 +26,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "blender";
-  version = "2.93.2";
+  version = "2.93.5";
 
   src = fetchurl {
     url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
-    sha256 = "sha256-nG1Kk6UtiCwsQBDz7VELcMRVEovS49QiO3haIpvSfu4=";
+    sha256 = "1fsw8w80h8k5w4zmy659bjlzqyn5i198hi1kbpzfrdn8psxg2bfj";
   };
 
   patches = lib.optional stdenv.isDarwin ./darwin.patch;

From 661207ce7e2b989ffa6456cf61a22800741cd364 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm+nixpkgs@sourcephile.fr>
Date: Wed, 20 Oct 2021 02:15:09 +0200
Subject: [PATCH 02/20] nixos/console: fix cross-compiling

---
 nixos/modules/config/console.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix
index 98f942ee63f5..168bebd8d06a 100644
--- a/nixos/modules/config/console.nix
+++ b/nixos/modules/config/console.nix
@@ -116,7 +116,7 @@ in
     { console.keyMap = with config.services.xserver;
         mkIf cfg.useXkbConfig
           (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
-            '${pkgs.ckbcomp}/bin/ckbcomp' \
+            '${pkgs.buildPackages.ckbcomp}/bin/ckbcomp' \
               ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT)
                 "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}"
               } \

From 728fa553e2e2fc7209a3a3a6bd0dbefe5e2313bf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 10:38:35 +0200
Subject: [PATCH 03/20] python3Packages.param: 1.11.1 -> 1.12.0

---
 pkgs/development/python-modules/param/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 0ae362dd28ac..3a812f17fe3b 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "param";
-  version = "1.11.1";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b9857df01495bd55ddafb214fd1ed017d20699ce42ec2a0fd190d99caa03099f";
+    sha256 = "sha256-NdAoHI47623UafRv8LkXdSpUvtlNGwxWc0bHbQ/1nEo=";
   };
 
   checkInputs = [ flake8 nose ];
@@ -19,10 +19,14 @@ buildPythonPackage rec {
   # tests not included with pypi release
   doCheck = false;
 
+  pythonImportsCheck = [
+    "param"
+  ];
+
   meta = with lib; {
     description = "Declarative Python programming using Parameters";
     homepage = "https://github.com/pyviz/param";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 82407152f50835564a92bb497a8007994802ce51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 11:41:46 +0200
Subject: [PATCH 04/20] python3Packages.pyct: switch to pytestCheckHook

---
 .../python-modules/pyct/default.nix           | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix
index b2314e6edfeb..4538410c3623 100644
--- a/pkgs/development/python-modules/pyct/default.nix
+++ b/pkgs/development/python-modules/pyct/default.nix
@@ -3,9 +3,9 @@
 , fetchPypi
 , isPy27
 , param
+, pytestCheckHook
 , pyyaml
 , requests
-, pytest
 }:
 
 buildPythonPackage rec {
@@ -17,22 +17,26 @@ buildPythonPackage rec {
     sha256 = "23d7525b5a1567535c093aea4b9c33809415aa5f018dd77f6eb738b1226df6f7";
   };
 
-  doCheck = !isPy27;
-  checkInputs = [ pytest ];
   propagatedBuildInputs = [
     param
     pyyaml
     requests
   ];
 
-  checkPhase = ''
-    pytest
-  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  doCheck = !isPy27;
+
+  pythonImportsCheck = [
+    "pyct"
+  ];
 
   meta = with lib; {
-    description = "Cli for python common tasks for users";
+    description = "ClI for Python common tasks for users";
     homepage = "https://github.com/pyviz/pyct";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 76638545c8e9af9cac48f7bc16f97ef3eabf3ede Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 11:42:32 +0200
Subject: [PATCH 05/20] python3Packages.colorcet: switch to pytestCheckHook

---
 .../python-modules/colorcet/default.nix       | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix
index 207653375144..6135730beb00 100644
--- a/pkgs/development/python-modules/colorcet/default.nix
+++ b/pkgs/development/python-modules/colorcet/default.nix
@@ -1,12 +1,11 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, nbsmoke
 , param
 , pyct
-, nbsmoke
-, flake8
-, pytest
 , pytest-mpl
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -24,25 +23,29 @@ buildPythonPackage rec {
   ];
 
   checkInputs = [
-    pytest
-    flake8
     pytest-mpl
+    pytestCheckHook
   ];
 
-  checkPhase = ''
+  preCheck = ''
     export HOME=$(mktemp -d)
     mkdir -p $HOME/.config/matplotlib
     echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc
     ln -s $HOME/.config/matplotlib $HOME/.matplotlib
-
-    # requires other backends to be available
-    pytest colorcet -k 'not matplotlib_default_colormap_plot'
   '';
 
+  disabledTests = [
+    "matplotlib_default_colormap_plot"
+  ];
+
+  pythonImportsCheck = [
+    "colorcet"
+  ];
+
   meta = with lib; {
     description = "Collection of perceptually uniform colormaps";
     homepage = "https://colorcet.pyviz.org";
     license = licenses.cc-by-40;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From f78568d24a17accc07059d869068f44d86d88d54 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 11:42:55 +0200
Subject: [PATCH 06/20] python3Packages.hvplot: remove unused inputs

---
 .../python-modules/hvplot/default.nix         | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix
index 271b3923033c..22be0ff75c9f 100644
--- a/pkgs/development/python-modules/hvplot/default.nix
+++ b/pkgs/development/python-modules/hvplot/default.nix
@@ -1,18 +1,10 @@
 { lib
-, buildPythonPackage
-, fetchPypi
 , bokeh
+, buildPythonPackage
+, colorcet
+, fetchPypi
 , holoviews
 , pandas
-, pytest
-, parameterized
-, nbsmoke
-, flake8
-, coveralls
-, xarray
-, networkx
-, streamz
-, colorcet
 , pythonImportsCheckHook
 }:
 
@@ -29,7 +21,6 @@ buildPythonPackage rec {
     pythonImportsCheckHook
   ];
 
-  checkInputs = [ pytest parameterized nbsmoke flake8 coveralls xarray networkx streamz ];
   propagatedBuildInputs = [
     bokeh
     colorcet
@@ -37,11 +28,7 @@ buildPythonPackage rec {
     pandas
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  # many tests require a network connection
+  # Many tests require a network connection
   doCheck = false;
 
   pythonImportsCheck = [
@@ -52,6 +39,6 @@ buildPythonPackage rec {
     description = "A high-level plotting API for the PyData ecosystem built on HoloViews";
     homepage = "https://hvplot.pyviz.org";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 840f7a226938c33b443da6cb57cacb1d9e623454 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 12:05:47 +0200
Subject: [PATCH 07/20] python3Packages.param: enable tests

---
 .../python-modules/param/default.nix          | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix
index 3a812f17fe3b..23c9bc9c3933 100644
--- a/pkgs/development/python-modules/param/default.nix
+++ b/pkgs/development/python-modules/param/default.nix
@@ -1,23 +1,29 @@
 { lib
 , buildPythonPackage
-, fetchPypi
-, flake8
-, nose
+, fetchFromGitHub
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "param";
   version = "1.12.0";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-NdAoHI47623UafRv8LkXdSpUvtlNGwxWc0bHbQ/1nEo=";
+  src = fetchFromGitHub {
+    owner = "holoviz";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "02zmd4bwyn8b4q1l9jgddc70ii1i7bmynacanl1cvbr6la4v9b2c";
   };
 
-  checkInputs = [ flake8 nose ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  # tests not included with pypi release
-  doCheck = false;
+  postPatch = ''
+    # Version is not set properly
+    substituteInPlace setup.py \
+      --replace 'version=get_setup_version("param"),' 'version="${version}",'
+  '';
 
   pythonImportsCheck = [
     "param"

From 5c46d745d5a55c8b2741cb6bf2e90287d766f8b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 15:41:55 +0200
Subject: [PATCH 08/20] python3Packages.intake: 0.6.3 -> 0.6.4

---
 .../python-modules/intake/default.nix         | 48 +++++++++++--------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix
index 361469f540e1..26448f3a21d2 100644
--- a/pkgs/development/python-modules/intake/default.nix
+++ b/pkgs/development/python-modules/intake/default.nix
@@ -1,67 +1,71 @@
 { lib
-, buildPythonPackage
-, fetchPypi
 , appdirs
+, bokeh
+, buildPythonPackage
 , dask
+, entrypoints
+, fetchFromGitHub
+, fsspec
 , holoviews
 , hvplot
-, fsspec
+, intake-parquet
 , jinja2
 , msgpack
 , msgpack-numpy
 , numpy
 , pandas
 , panel
-, intake-parquet
 , pyarrow
 , pytestCheckHook
-, pythonOlder
 , python-snappy
+, pythonOlder
+, pyyaml
 , requests
-, ruamel_yaml
-, six
 , tornado
 }:
 
 buildPythonPackage rec {
   pname = "intake";
-  version = "0.6.3";
+  version = "0.6.4";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "194cdd6lx92zcpkn3wgm490kxvw0c58ziix8hcihsr5ayfr1wdsl";
   };
 
   propagatedBuildInputs = [
     appdirs
+    bokeh
     dask
+    entrypoints
+    fsspec
     holoviews
     hvplot
     jinja2
-    msgpack-numpy
     msgpack
+    msgpack-numpy
     numpy
     pandas
     panel
+    pyarrow
     python-snappy
+    pyyaml
     requests
-    ruamel_yaml
-    six
     tornado
   ];
 
   checkInputs = [
-    fsspec
     intake-parquet
-    pyarrow
     pytestCheckHook
   ];
 
   postPatch = ''
-    # Is in setup_requires but not used in setup.py...
-    substituteInPlace setup.py --replace "'pytest-runner'" ""
+    substituteInPlace setup.py \
+      --replace "'pytest-runner'" ""
   '';
 
   # test_discover requires driver_with_entrypoints-0.1.dist-info, which is not included in tarball
@@ -72,7 +76,7 @@ buildPythonPackage rec {
   '';
 
   disabledTests = [
-    # disable tests which touch network and are broken
+    # Disable tests which touch network and are broken
     "test_discover"
     "test_filtered_compressed_cache"
     "test_get_dir"
@@ -82,6 +86,10 @@ buildPythonPackage rec {
     "test_remote_arr"
   ];
 
+  pythonImportsCheck = [
+    "intake"
+  ];
+
   meta = with lib; {
     description = "Data load and catalog system";
     homepage = "https://github.com/ContinuumIO/intake";

From 967d7610a060d840ad0d688102c8f3b79fcde4f2 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 2 Sep 2021 11:59:41 -0300
Subject: [PATCH 09/20] python3Packages.jaeger-client: init 4.6.1

---
 .../python-modules/jaeger-client/default.nix  | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/jaeger-client/default.nix

diff --git a/pkgs/development/python-modules/jaeger-client/default.nix b/pkgs/development/python-modules/jaeger-client/default.nix
new file mode 100644
index 000000000000..05a76333af09
--- /dev/null
+++ b/pkgs/development/python-modules/jaeger-client/default.nix
@@ -0,0 +1,40 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, opentracing
+, threadloop
+, thrift
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "jaeger-client";
+  version = "4.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3bc27ad77e035efd0899f377a15f180467fec44b2afbf5be0660cc888a2a4ac3";
+  };
+
+  propagatedBuildInputs = [
+    threadloop
+    thrift
+    tornado
+    opentracing
+  ];
+
+  # FIXME: Missing dependencies: tchannel, opentracing_instrumentation
+  # opentracing_instrumentation: Requires "tornado" lower than 6. Current is 6.1.
+  # https://github.com/uber-common/opentracing-python-instrumentation/pull/115
+  doCheck = false;
+
+  pythonImportsCheck = [ "jaeger_client" ];
+
+  meta = with lib; {
+    description = "Jaeger bindings for Python OpenTracing API";
+    downloadPage = "https://pypi.org/project/jaeger-client/";
+    homepage = "https://github.com/jaegertracing/jaeger-client-python";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ superherointj ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 61cadea5f264..6bdfa2c8ca8c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3833,6 +3833,8 @@ in {
 
   j2cli = callPackage ../development/python-modules/j2cli { };
 
+  jaeger-client = callPackage ../development/python-modules/jaeger-client { };
+
   janus = callPackage ../development/python-modules/janus { };
 
   jaraco_classes = callPackage ../development/python-modules/jaraco_classes { };

From f5a5a3e95c3b403fe0dd61bdb219cfbc99d0d978 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 2 Sep 2021 12:10:38 -0300
Subject: [PATCH 10/20] python3Packages.threadloop: init 1.0.2

---
 .../python-modules/threadloop/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/threadloop/default.nix

diff --git a/pkgs/development/python-modules/threadloop/default.nix b/pkgs/development/python-modules/threadloop/default.nix
new file mode 100644
index 000000000000..4a4a781cac93
--- /dev/null
+++ b/pkgs/development/python-modules/threadloop/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, tornado
+}:
+
+buildPythonPackage rec {
+  pname = "threadloop";
+  version = "1.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "8b180aac31013de13c2ad5c834819771992d350267bddb854613ae77ef571944";
+  };
+
+  propagatedBuildInputs = [
+    tornado
+  ];
+
+  doCheck = false; # ImportError: cannot import name 'ThreadLoop' from 'threadloop'
+
+  pythonImportsCheck = [ "threadloop" ];
+
+  meta = with lib; {
+    description = "A library to run tornado coroutines from synchronous Python";
+    homepage = "https://github.com/GoodPete/threadloop";
+    license = licenses.mit;
+    maintainers = with maintainers; [ superherointj ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6bdfa2c8ca8c..c5f8b2f32de1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9122,6 +9122,8 @@ in {
     inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo;
   };
 
+  threadloop = callPackage ../development/python-modules/threadloop { };
+
   threadpool = callPackage ../development/python-modules/threadpool { };
 
   threadpoolctl = callPackage ../development/python-modules/threadpoolctl { };

From 0f37973306a31e377515ba1257008c15e2d7834f Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 2 Sep 2021 15:22:59 -0300
Subject: [PATCH 11/20] python3Packages.zc_buildout: 2.13.4 -> 3.0.0b2

---
 .../python-modules/buildout/default.nix       | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index 796eaa18259f..0b20eea257f7 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -1,18 +1,37 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pip
+, setuptools
+, wheel
+}:
 
 buildPythonPackage rec {
-  pname = "zc.buildout";
-  version = "2.13.4";
+  pname = "zc_buildout";
+  version = "3.0.0b2";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63";
+  src = fetchFromGitHub {
+    owner = "buildout";
+    repo = "buildout";
+    rev = version;
+    sha256 = "01sj09xx5kmkzynhq1xd8ahn6xqybfi8lrqjqr5lr45aaxjk2pid";
   };
 
+  propagatedBuildInputs = [
+    setuptools
+    pip
+    wheel
+  ];
+
+  doCheck = false; # Missing package & BLOCKED on "zc.recipe.egg"
+
+  pythonImportsCheck = [ "zc.buildout" ];
+
   meta = with lib; {
-    homepage = "http://www.buildout.org";
     description = "A software build and configuration system";
+    downloadPage = "https://github.com/buildout/buildout";
+    homepage = "https://www.buildout.org";
     license = licenses.zpl21;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ superherointj ];
   };
 }

From f92139a5dab1a5c4df4b3b700cb089df1cfc2f35 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Fri, 22 Oct 2021 10:30:55 -0300
Subject: [PATCH 12/20] python3Packages.zc_buildout: renamed to zc-buildout

---
 pkgs/development/python-modules/buildout/default.nix          | 2 +-
 pkgs/development/python-modules/z3c-checkversions/default.nix | 4 ++--
 pkgs/top-level/python-aliases.nix                             | 2 +-
 pkgs/top-level/python-packages.nix                            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index 0b20eea257f7..3cf2c1712fb3 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -7,7 +7,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "zc_buildout";
+  pname = "zc-buildout";
   version = "3.0.0b2";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix
index 8610306ea6f2..b8c684295a6f 100644
--- a/pkgs/development/python-modules/z3c-checkversions/default.nix
+++ b/pkgs/development/python-modules/z3c-checkversions/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , python
-, zc_buildout
+, zc-buildout
 , zope_testrunner
 }:
 
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d";
   };
 
-  propagatedBuildInputs = [ zc_buildout ];
+  propagatedBuildInputs = [ zc-buildout ];
   checkInputs = [ zope_testrunner ];
   doCheck = !python.pkgs.isPy27;
   checkPhase = ''
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 9e24ea29e7f2..bd3e315f0863 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -84,5 +84,5 @@ mapAliases ({
   tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05
   WazeRouteCalculator = wazeroutecalculator; # 2021-09-29
   websocket_client = websocket-client;
-  zc_buildout221 = zc_buildout; # added 2021-07-21
+  zc-buildout221 = zc-buildout; # added 2021-07-21
 })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c5f8b2f32de1..ccffb1fe5daa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10011,7 +10011,7 @@ in {
 
   zarr = callPackage ../development/python-modules/zarr { };
 
-  zc_buildout = callPackage ../development/python-modules/buildout { };
+  zc-buildout = callPackage ../development/python-modules/buildout { };
 
   zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { };
 

From ec092c69fb3934b57f7e860c7443439c383207ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 15:46:16 +0200
Subject: [PATCH 13/20] terrascan: 1.11.0 -> 1.12.0

---
 pkgs/tools/security/terrascan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix
index 0308bc5d35bc..da338ba347ca 100644
--- a/pkgs/tools/security/terrascan/default.nix
+++ b/pkgs/tools/security/terrascan/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "terrascan";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "accurics";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-vKKBbTculy/r1l3lHnHiBZLAwhw/61kDAsypa0o2VXQ=";
+    sha256 = "sha256-DYWp7D2CQxasEYkoCEa0KdFQDvo4rNgRcTKzxYLsYFg=";
   };
 
   vendorSha256 = "0vx406y3kj1qmgr1y9vg3rprwjpm5g8p9shmhq28gp7sxz3j82ry";

From 2626ebd9b66f9f36222cffa2802f52788571b98d Mon Sep 17 00:00:00 2001
From: Arthur Gautier <baloo@superbaloo.net>
Date: Fri, 22 Oct 2021 15:33:04 +0000
Subject: [PATCH 14/20] diffoscope: 187 -> 188

Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
---
 pkgs/tools/misc/diffoscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 37ea9ebd026c..bdac532f07e1 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -9,11 +9,11 @@
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python3Packages.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "187";
+  version = "188";
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    sha256 = "sha256-oXWdXJhf8OOxBcLumjeWW0Xev0LjcTScAw9baDOs6ls=";
+    sha256 = "sha256-kB3EnmnQYqal4cdzwArH+QdHe5wnUOnbjbQAz52g1Us=";
   };
 
   outputs = [ "out" "man" ];

From 7f1866e127a30f123af95ae6786bef22f65e81e8 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 22 Oct 2021 11:58:49 -0400
Subject: [PATCH 15/20] lucky-commit: init at 2.1.0

---
 .../git-and-tools/lucky-commit/default.nix    | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
new file mode 100644
index 000000000000..71c40e86aa97
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix
@@ -0,0 +1,35 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, withOpenCL ? true
+, ocl-icd
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "lucky-commit";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "not-an-aardvark";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0vs668i1yglfcqs94jhwdk90v0lja2w5kr5gakz082wykilms0zg";
+  };
+
+  cargoSha256 = "sha256-MvopLKhovwXaEmRgXnAzJeuhPgqnMjt0EtKUGSWFpaY=";
+
+  buildInputs = lib.optional withOpenCL [ ocl-icd ];
+
+  cargoBuildFlags = lib.optional (!withOpenCL) "--no-default-features";
+
+  # disable tests that require gpu
+  cargoTestFlags = [ "--no-default-features" ];
+
+  meta = with lib; {
+    description = "Change the start of your git commit hashes to whatever you want";
+    homepage = "https://github.com/not-an-aardvark/lucky-commit";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "lucky_commit";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b022361f2752..508bfbc81590 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26207,6 +26207,8 @@ with pkgs;
 
   lscolors = callPackage ../applications/misc/lscolors { };
 
+  lucky-commit = callPackage ../applications/version-management/git-and-tools/lucky-commit { };
+
   luddite = with python3Packages; toPythonApplication luddite;
 
   lumail = callPackage ../applications/networking/mailreaders/lumail {

From d923a443dcabde7e74198eac5803f06b77f2f7d2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 18:23:24 +0200
Subject: [PATCH 16/20] python3Packages.adb-shell: 0.4.1 -> 0.4.2

---
 pkgs/development/python-modules/adb-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/adb-shell/default.nix b/pkgs/development/python-modules/adb-shell/default.nix
index 9094b1c780cf..bc71e3721288 100644
--- a/pkgs/development/python-modules/adb-shell/default.nix
+++ b/pkgs/development/python-modules/adb-shell/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "adb-shell";
-  version = "0.4.1";
+  version = "0.4.2";
 
   disabled = !isPy3k;
 
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "JeffLIrion";
     repo = "adb_shell";
     rev = "v${version}";
-    sha256 = "sha256-E7sX+N6d5Otwp1AbdPCnQJ2YT/k89+6kMJDLt8U2Dsg=";
+    sha256 = "sha256-8tclSjmLlTAIeq6t7YPGtJwvSwtlzQ7sRAQatcQRzeY=";
   };
 
   propagatedBuildInputs = [

From 64d1f1df1108d5a9f5823d4e227fb0911087c387 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Oct 2021 18:27:17 +0200
Subject: [PATCH 17/20] python3Packages.pywizlight: 0.4.8 -> 0.4.10

---
 pkgs/development/python-modules/pywizlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pywizlight/default.nix b/pkgs/development/python-modules/pywizlight/default.nix
index 57c0bec47e44..755e1555a431 100644
--- a/pkgs/development/python-modules/pywizlight/default.nix
+++ b/pkgs/development/python-modules/pywizlight/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pywizlight";
-  version = "0.4.8";
+  version = "0.4.10";
 
   src = fetchFromGitHub {
     owner = "sbidy";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0zagdb90bxmf06fzpljhqgsgzg36zc1yhdibacfrx8bmnx3l657h";
+    sha256 = "sha256-XO9KmsC3DXgVcGWr5ss3m2wB8rVboWyQUWBidynhkP8=";
   };
 
   propagatedBuildInputs = [

From 090e4a21a5734077c2246a4c2cbd94dc201b9cef Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 22 Oct 2021 12:57:59 -0400
Subject: [PATCH 18/20] piping-server-rust: init at 0.9.1

---
 pkgs/servers/piping-server-rust/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/piping-server-rust/default.nix

diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix
new file mode 100644
index 000000000000..f37dbee8eb39
--- /dev/null
+++ b/pkgs/servers/piping-server-rust/default.nix
@@ -0,0 +1,24 @@
+{ lib, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "piping-server-rust";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "nwtgck";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "16jzl0nk14gzb5kvilr17f02b41ma7xwh8y0g42pm9sb7jdbcn7g";
+  };
+
+  cargoSha256 = "sha256-SDAxXYX51/4S7zRTdNZK9uSjKHKrAXpDJgRRDyu6qug=";
+
+  meta = with lib; {
+    description = "Infinitely transfer between every device over pure HTTP with pipes or browsers";
+    homepage = "https://github.com/nwtgck/piping-server-rust";
+    changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "piping-server";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d7ee648a3ce..6885d9d9328e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8449,6 +8449,8 @@ with pkgs;
 
   pinnwand = callPackage ../servers/pinnwand { };
 
+  piping-server-rust = callPackage ../servers/piping-server-rust { };
+
   pirate-get = callPackage ../tools/networking/pirate-get { };
 
   pipr = callPackage ../applications/misc/pipr { };

From de0f40c837232761068bba96adf0da20abe13f3d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 20 Oct 2021 16:33:20 -0700
Subject: [PATCH 19/20] python3Packages.jupyter-server-mathjax: init at 0.2.3

---
 .../jupyter-server-mathjax/default.nix        | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/jupyter-server-mathjax/default.nix

diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
new file mode 100644
index 000000000000..9aff01cd9d38
--- /dev/null
+++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchPypi
+, jupyter-packaging
+, jupyter_server
+, pytest-tornasync
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "jupyter-server-mathjax";
+  version = "0.2.3";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "jupyter_server_mathjax";
+    sha256 = "564e8d1272019c6771208f577b5f9f2b3afb02b9e2bff3b34c042cef8ed84451";
+  };
+
+  nativeBuildInputs = [
+    jupyter-packaging
+  ];
+
+  propagatedBuildInputs = [
+    jupyter_server
+  ];
+
+  checkInputs = [
+    pytest-tornasync
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "jupyter_server_mathjax" ];
+
+  meta = with lib; {
+    description = "MathJax resources as a Jupyter Server Extension";
+    homepage = "http://jupyter.org";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jonringer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd2c7aa58be3..fafa812eb6ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4013,6 +4013,8 @@ in {
     pkgs-docker = pkgs.docker;
   };
 
+  jupyter-server-mathjax = callPackage ../development/python-modules/jupyter-server-mathjax { };
+
   jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { };
 
   jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { };

From 2fa6e756ed0aa186c74854b73605bf48e5067c3d Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Wed, 20 Oct 2021 17:13:01 -0700
Subject: [PATCH 20/20] python3Packages.nbdime: fix build, add missing
 dependency

---
 pkgs/development/python-modules/nbdime/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix
index a4cbe11fbe7a..0d073027e5d5 100644
--- a/pkgs/development/python-modules/nbdime/default.nix
+++ b/pkgs/development/python-modules/nbdime/default.nix
@@ -18,6 +18,7 @@
 , tornado
 , requests
 , GitPython
+, jupyter-server-mathjax
 , notebook
 , jinja2
 }:
@@ -59,6 +60,7 @@ buildPythonPackage rec {
     py
     setuptools
     six
+    jupyter-server-mathjax
     nbformat
     colorama
     pygments