From e9efbc0bbb222cc90d14ba919f77bb198dd2d55f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 28 Dec 2021 21:32:26 +0100
Subject: [PATCH 01/22] nixos/tests/tinywl: init

This adds a very minimalistic (in terms of functionality and
dependencies) test for wlroots, Wayland, and related packages.

The Sway test covers more functionality and packages (e.g. XWayland) but
this test has tree advantages:
- Less dependencies: Much fewer rebuilds are required when testing core
  changes that need to go through staging.
- Testing wlroots updates: The Sway package isn't immediately updated
  after a new wlroots version is released and a lot of other packages
  depend on wlroots as well.
- Determining whether a bug only affects Sway or wlroots/TinyWL as well.
---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/tinywl.nix                        | 56 +++++++++++++++++++
 .../window-managers/tinywl/default.nix        |  2 +-
 pkgs/development/libraries/wlroots/0.15.nix   |  4 ++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/tinywl.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 4f62980e8e91..dc28b3d6478c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -476,6 +476,7 @@ in
   timezone = handleTest ./timezone.nix {};
   tinc = handleTest ./tinc {};
   tinydns = handleTest ./tinydns.nix {};
+  tinywl = handleTest ./tinywl.nix {};
   tor = handleTest ./tor.nix {};
   # traefik test relies on docker-containers
   traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
diff --git a/nixos/tests/tinywl.nix b/nixos/tests/tinywl.nix
new file mode 100644
index 000000000000..b286cab77945
--- /dev/null
+++ b/nixos/tests/tinywl.nix
@@ -0,0 +1,56 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }:
+
+  {
+    name = "tinywl";
+    meta = {
+      maintainers = with lib.maintainers; [ primeos ];
+    };
+
+    machine = { config, ... }: {
+      # Automatically login on tty1 as a normal user:
+      imports = [ ./common/user-account.nix ];
+      services.getty.autologinUser = "alice";
+
+      environment = {
+        systemPackages = with pkgs; [ tinywl foot wayland-utils ];
+      };
+
+      # Automatically start TinyWL when logging in on tty1:
+      programs.bash.loginShellInit = ''
+        if [ "$(tty)" = "/dev/tty1" ]; then
+          set -e
+          test ! -e /tmp/tinywl.log # Only start tinywl once
+          readonly TEST_CMD="wayland-info |& tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok; read"
+          readonly FOOT_CMD="foot sh -c '$TEST_CMD'"
+          tinywl -s "$FOOT_CMD" |& tee /tmp/tinywl.log
+          touch /tmp/tinywl-exit-ok
+        fi
+      '';
+
+      # Switch to a different GPU driver (default: -vga std), otherwise TinyWL segfaults:
+      virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
+    };
+
+    testScript = { nodes, ... }: ''
+      start_all()
+      machine.wait_for_unit("multi-user.target")
+
+      # Wait for complete startup:
+      machine.wait_until_succeeds("pgrep tinywl")
+      machine.wait_for_file("/run/user/1000/wayland-0")
+      machine.wait_until_succeeds("pgrep foot")
+      machine.wait_for_file("/tmp/test-wayland-exit-ok")
+
+      # Make a screenshot and save the result:
+      machine.screenshot("tinywl_foot")
+      print(machine.succeed("cat /tmp/test-wayland.out"))
+      machine.copy_from_vm("/tmp/test-wayland.out")
+
+      # Terminate cleanly:
+      machine.send_key("alt-esc")
+      machine.wait_until_fails("pgrep foot")
+      machine.wait_until_fails("pgrep tinywl")
+      machine.wait_for_file("/tmp/tinywl-exit-ok")
+      machine.copy_from_vm("/tmp/tinywl.log")
+    '';
+  })
diff --git a/pkgs/applications/window-managers/tinywl/default.nix b/pkgs/applications/window-managers/tinywl/default.nix
index 965ec67b6e94..b89d9dafd900 100644
--- a/pkgs/applications/window-managers/tinywl/default.nix
+++ b/pkgs/applications/window-managers/tinywl/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl";
     description = ''A "minimum viable product" Wayland compositor based on wlroots'';
-    maintainers = with maintainers; [ qyliss ];
+    maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers;
     license = licenses.cc0;
     inherit (wlroots.meta) platforms;
   };
diff --git a/pkgs/development/libraries/wlroots/0.15.nix b/pkgs/development/libraries/wlroots/0.15.nix
index 93ecf0bd3ab3..e7cf7bc9b4ce 100644
--- a/pkgs/development/libraries/wlroots/0.15.nix
+++ b/pkgs/development/libraries/wlroots/0.15.nix
@@ -2,6 +2,7 @@
 , libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
 , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
 , libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang
+, nixosTests
 
 , enableXWayland ? true, xwayland ? null
 }:
@@ -49,6 +50,9 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):
+  passthru.tests.tinywl = nixosTests.tinywl;
+
   meta = with lib; {
     description = "A modular Wayland compositor library";
     longDescription = ''

From e16643f01d786625a128cae4c730ff124b80f6c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Jan 2022 18:10:24 +0000
Subject: [PATCH 02/22] logrotate: 3.18.1 -> 3.19.0

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

diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix
index 72e6f5ec71be..97d920ce918e 100644
--- a/pkgs/tools/system/logrotate/default.nix
+++ b/pkgs/tools/system/logrotate/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "logrotate";
-  version = "3.18.1";
+  version = "3.19.0";
 
   src = fetchFromGitHub {
     owner = "logrotate";
     repo = "logrotate";
     rev = version;
-    sha256 = "sha256-OJOV++rtN9ry+l0c0eanpu/Pwu8cOHfyEaDWp3FZjkw=";
+    sha256 = "sha256-YAoMRLgKPqHsXdXBigl6dPJDkZIAMYK/likhTd/LpkY=";
   };
 
   # Logrotate wants to access the 'mail' program; to be done.

From 432c6278446ea7aea5e10014fcd0f4dbaa5aef59 Mon Sep 17 00:00:00 2001
From: storvik <petterstorvik@gmail.com>
Date: Wed, 12 Jan 2022 14:27:28 +0100
Subject: [PATCH 03/22] python3Packages.torchinfo: init at 1.6.2

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

diff --git a/pkgs/development/python-modules/torchinfo/default.nix b/pkgs/development/python-modules/torchinfo/default.nix
new file mode 100644
index 000000000000..b9071782b590
--- /dev/null
+++ b/pkgs/development/python-modules/torchinfo/default.nix
@@ -0,0 +1,43 @@
+{ lib
+, fetchPypi
+, python
+, buildPythonPackage
+, pythonOlder
+, pytorch
+, pytestCheckHook
+, torchvision
+}:
+
+buildPythonPackage rec {
+  pname = "torchinfo";
+  version = "1.6.2";
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-vf3TADqIX4RtCU3dN/lBK4aRg3wud/KkK9u5XGnBbO4=";
+  };
+
+  propagatedBuildInputs = [
+    pytorch
+    torchvision
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # Skip as it downloads pretrained weights (require network access)
+    "test_eval_order_doesnt_matter"
+  ];
+
+  pythonImportsCheck = [ "torchvision" ];
+
+  meta = {
+    description = "API to visualize pytorch models";
+    homepage = "https://github.com/TylerYep/torchinfo";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ petterstorvik ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f82a0e0851c9..715d828cc881 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9728,6 +9728,8 @@ in {
 
   torchgpipe = callPackage ../development/python-modules/torchgpipe { };
 
+  torchinfo = callPackage ../development/python-modules/torchinfo { };
+
   torchvision = callPackage ../development/python-modules/torchvision { };
 
   torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };

From 694e98f8a61f86fa723503e114b6fcb38d863595 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 13 Jan 2022 21:35:50 +0100
Subject: [PATCH 04/22] python3Packages.py-tes: init at 0.4.2

---
 .../python-modules/py-tes/default.nix         | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-tes/default.nix

diff --git a/pkgs/development/python-modules/py-tes/default.nix b/pkgs/development/python-modules/py-tes/default.nix
new file mode 100644
index 000000000000..633dc6fa5f4a
--- /dev/null
+++ b/pkgs/development/python-modules/py-tes/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, attrs
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, python-dateutil
+, pytestCheckHook
+, pythonOlder
+, requests
+, requests-mock
+}:
+
+buildPythonPackage rec {
+  pname = "py-tes";
+  version = "0.4.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "ohsu-comp-bio";
+    repo = pname;
+    rev = version;
+    hash = "sha256-HZeyCQHiqfdquWQD5axS73JDjDMUieONwm5VyA+vTFk=";
+  };
+
+  propagatedBuildInputs = [
+    attrs
+    future
+    python-dateutil
+    requests
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [
+    "tes"
+  ];
+
+  meta = with lib; {
+    description = "Python SDK for the GA4GH Task Execution API";
+    homepage = "https://github.com/ohsu-comp-bio/py-tes";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a82697055ab..004191d9382f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6398,6 +6398,8 @@ in {
 
   py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { };
 
+  py-tes = callPackage ../development/python-modules/py-tes { };
+
   py-ubjson = callPackage ../development/python-modules/py-ubjson { };
 
   py-zabbix = callPackage ../development/python-modules/py-zabbix { };

From 32003c3051f73892f5e465d0eb80f3d438e5dde2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 13 Jan 2022 21:37:08 +0100
Subject: [PATCH 05/22] toil: 5.4.0 -> 5.6.0

---
 .../science/misc/toil/default.nix             | 39 +++++++++++--------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix
index a25fbe7565ce..b13ad0ad10ca 100644
--- a/pkgs/applications/science/misc/toil/default.nix
+++ b/pkgs/applications/science/misc/toil/default.nix
@@ -1,39 +1,46 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib
+, fetchFromGitHub
+, python3
+}:
 
-python3Packages.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "toil";
-  version = "5.4.0";
+  version = "5.6.0";
+  format = "setuptools";
 
-  src = python3Packages.fetchPypi {
+  src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd";
+    sha256 = "sha256-m6tzrRCCLULO+wB8htUlt0KESLm/vdIeTzBrihnAo/I=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "docker = " "docker = 'docker' #" \
-      --replace "addict = " "addict = 'addict' #"
-  '';
-
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python3.pkgs; [
     addict
     docker
     pytz
     pyyaml
     enlighten
     psutil
+    py-tes
     python-dateutil
     dill
   ];
-  checkInputs = with python3Packages; [ pytestCheckHook ];
 
-  pytestFlagsArray = [ "src/toil/test" ];
-  pythonImportsCheck = [ "toil" ];
+  checkInputs = with python3.pkgs; [
+    pytestCheckHook
+  ];
+
+  pytestFlagsArray = [
+    "src/toil/test"
+  ];
+
+  pythonImportsCheck = [
+    "toil"
+  ];
 
   meta = with lib; {
+    description = "Workflow engine written in pure Python";
     homepage = "https://toil.ucsc-cgl.org/";
     license = with licenses; [ asl20 ];
-    description = "Workflow engine written in pure Python";
     maintainers = with maintainers; [ veprbl ];
   };
 }

From d79b4037a352909445925a386be51b8e5548d712 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 13 Jan 2022 22:17:32 +0100
Subject: [PATCH 06/22] python3Packages.testfixtures: disable failing tests

---
 .../python-modules/testfixtures/default.nix   | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 99be9957a5ef..b582bf4bc7f7 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -1,9 +1,10 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, isPy27
 , mock
 , pytestCheckHook
+, pythonAtLeast
+, pythonOlder
 , sybil
 , twisted
 , zope_component
@@ -12,6 +13,9 @@
 buildPythonPackage rec {
   pname = "testfixtures";
   version = "6.18.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
@@ -19,29 +23,42 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
-    pytestCheckHook
     mock
+    pytestCheckHook
     sybil
-    zope_component
     twisted
+    zope_component
   ];
 
-  doCheck = !isPy27;
-
   disabledTestPaths = [
     # Django is too much hasle to setup at the moment
     "testfixtures/tests/test_django"
   ];
 
+  disabledTests = lib.optionals (pythonAtLeast "3.10") [
+    # https://github.com/simplistix/testfixtures/issues/168
+    "test_invalid_communicate_call"
+    "test_invalid_kill"
+    "test_invalid_parameters"
+    "test_invalid_poll"
+    "test_invalid_send_signal"
+    "test_invalid_terminate"
+    "test_invalid_wait_call"
+    "test_replace_delattr_cant_remove"
+    "test_replace_delattr_cant_remove_not_strict"
+  ];
+
   pytestFlagsArray = [
     "testfixtures/tests"
   ];
 
-  pythonImportsCheck = [ "testfixtures" ];
+  pythonImportsCheck = [
+    "testfixtures"
+  ];
 
   meta = with lib; {
+    description = "Collection of helpers and mock objects for unit tests and doc tests";
     homepage = "https://github.com/Simplistix/testfixtures";
-    description = "A collection of helpers and mock objects for unit tests and doc tests";
     license = licenses.mit;
     maintainers = with maintainers; [ siriobalmelli ];
   };

From d852768538d8e36117a7c367f5625296b08200fd Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 14 Jan 2022 00:13:52 -0300
Subject: [PATCH 07/22] tinycc: unstable-2021-10-09 -> 0.9.27+date=2022-01-11

---
 pkgs/development/compilers/tinycc/default.nix | 62 +++++++++++--------
 1 file changed, 36 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index b46dee899a33..9da506900bcd 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -1,18 +1,26 @@
-{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }:
+{ lib
+, stdenv
+, fetchFromRepoOrCz
+, perl
+, texinfo
+, which
+}:
 
 stdenv.mkDerivation rec {
   pname = "tcc";
-  version = "unstable-2021-10-09";
+  version = "0.9.27+date=2022-01-11";
 
   src = fetchFromRepoOrCz {
     repo = "tinycc";
-    rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6";
-    sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw=";
+    rev = "4e0e9b8f210d69893b306d6b24d2dd615a22f246";
+    hash = "sha256-0BJ5wXsgDLBIvcbq+rL9UQC4NjLHCI9r6sUWF98APPg=";
   };
 
-  nativeBuildInputs = [ perl texinfo which ];
-
-  hardeningDisable = [ "fortify" ];
+  nativeBuildInputs = [
+    perl
+    texinfo
+    which
+  ];
 
   postPatch = ''
     patchShebangs texi2pod.pl
@@ -46,37 +54,39 @@ stdenv.mkDerivation rec {
     install -Dt $out/lib/pkgconfig libtcc.pc -m 444
   '';
 
+  outputs = [ "out" "info" "man" ];
+
   doCheck = true;
   checkTarget = "test";
 
   meta = with lib; {
+    homepage = "https://repo.or.cz/tinycc.git";
     description = "Small, fast, and embeddable C compiler and interpreter";
     longDescription = ''
-      TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike
-      other C compilers, it is meant to be self-sufficient: you do not
-      need an external assembler or linker because TCC does that for
-      you.
+      TinyCC (aka TCC) is a small but hyper fast C compiler.  Unlike other C
+      compilers, it is meant to be self-sufficient: you do not need an external
+      assembler or linker because TCC does that for you.
 
-      TCC compiles so fast that even for big projects Makefiles may not
-      be necessary.
+      TCC compiles so fast that even for big projects Makefiles may not be
+      necessary.
 
-      TCC not only supports ANSI C, but also most of the new ISO C99
-      standard and many GNU C extensions.
+      TCC not only supports ANSI C, but also most of the new ISO C99 standard
+      and many GNU C extensions.
 
-      TCC can also be used to make C scripts, i.e. pieces of C source
-      that you run as a Perl or Python script.  Compilation is so fast
-      that your script will be as fast as if it was an executable.
+      TCC can also be used to make C scripts, i.e. pieces of C source that you
+      run as a Perl or Python script.  Compilation is so fast that your script
+      will be as fast as if it was an executable.
 
-      TCC can also automatically generate memory and bound checks while
-      allowing all C pointers operations.  TCC can do these checks even
-      if non patched libraries are used.
+      TCC can also automatically generate memory and bound checks while allowing
+      all C pointers operations.  TCC can do these checks even if non patched
+      libraries are used.
 
-      With libtcc, you can use TCC as a backend for dynamic code
-      generation.
+      With libtcc, you can use TCC as a backend for dynamic code generation.
     '';
-    homepage = "https://repo.or.cz/tinycc.git";
     license = licenses.lgpl21Only;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.joachifm ];
+    maintainers = with maintainers; [ joachifm AndersonTorres ];
+    platforms = platforms.unix;
   };
 }
+# TODO: more multiple outputs
+# TODO: self-compilation

From 6390150a0562aef42e7197760c98fc668cac0d7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 14 Jan 2022 09:49:15 +0100
Subject: [PATCH 08/22] python3Packages.connexion: relax pyyaml and jsonschema
 constraint

---
 .../python-modules/connexion/default.nix      | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix
index ed6f2da5142f..bfe4fc221445 100644
--- a/pkgs/development/python-modules/connexion/default.nix
+++ b/pkgs/development/python-modules/connexion/default.nix
@@ -7,7 +7,6 @@
 , clickclick
 , decorator
 , fetchFromGitHub
-, fetchpatch
 , flask
 , inflection
 , jsonschema
@@ -23,14 +22,16 @@
 
 buildPythonPackage rec {
   pname = "connexion";
-  version = "2.9.0";
+  version = "2.10.0";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "zalando";
     repo = pname;
     rev = version;
-    sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik";
+    sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8=";
   };
 
   propagatedBuildInputs = [
@@ -55,16 +56,20 @@ buildPythonPackage rec {
     testfixtures
   ];
 
-  patches = [
-    # No minor release for later versions, https://github.com/zalando/connexion/pull/1402
-    (fetchpatch {
-      name = "allow-later-flask-and-werkzeug-releases.patch";
-      url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch";
-      sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k";
-    })
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \
+      --replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1"
+  '';
+
+  disabledTests = [
+    # We have a later PyYAML release
+    "test_swagger_yaml"
   ];
 
-  pythonImportsCheck = [ "connexion" ];
+  pythonImportsCheck = [
+    "connexion"
+  ];
 
   meta = with lib; {
     description = "Swagger/OpenAPI First framework on top of Flask";

From 55eac498436b38fe8630dea089cdd861e191130b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Jan 2022 15:42:52 +0100
Subject: [PATCH 09/22] ocamlPackages.terminal: init at 0.2.1

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

diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix
new file mode 100644
index 000000000000..1fcdc1a5cba9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/terminal/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildDunePackage, fetchurl, ocaml
+, stdlib-shims, uutf, uucp
+, alcotest, fmt
+}:
+
+buildDunePackage rec {
+  pname = "terminal";
+  version = "0.2.1";
+
+  minimalOCamlVersion = "4.03";
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz";
+    sha256 = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs";
+  };
+
+  propagatedBuildInputs = [ stdlib-shims uutf uucp ];
+
+  doCheck = lib.versionAtLeast ocaml.version "4.05";
+  checkInputs = [ alcotest fmt ];
+
+  meta = with lib; {
+    description = "Basic utilities for interacting with terminals";
+    homepage = "https://github.com/CraigFe/progress";
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
+  };
+}
+
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ab1c8704fbb0..1364bfe723c6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1281,6 +1281,8 @@ let
 
     tcslib = callPackage ../development/ocaml-modules/tcslib { };
 
+    terminal = callPackage ../development/ocaml-modules/terminal { };
+
     terminal_size = callPackage ../development/ocaml-modules/terminal_size { };
 
     tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { };

From 94aeee3af18511fed2712ba64b065bd554a8d0a7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Jan 2022 15:43:00 +0100
Subject: [PATCH 10/22] ocamlPackages.vector: init at 1.0.0

---
 .../ocaml-modules/vector/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/vector/default.nix

diff --git a/pkgs/development/ocaml-modules/vector/default.nix b/pkgs/development/ocaml-modules/vector/default.nix
new file mode 100644
index 000000000000..c5f4336bb833
--- /dev/null
+++ b/pkgs/development/ocaml-modules/vector/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildDunePackage, fetchurl }:
+
+buildDunePackage rec {
+  pname = "vector";
+  version = "1.0.0";
+
+  useDune2 = true;
+
+  src = fetchurl {
+    url = "https://github.com/backtracking/vector/releases/download/${version}/vector-${version}.tbz";
+    sha256 = "sha256:0hb6prpada4c5z07sxf5ayj5xbahsnwall15vaqdwdyfjgbd24pj";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "Resizable arrays for OCaml";
+    license = lib.licenses.lgpl2Only;
+    homepage = "https://github.com/backtracking/vector";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1364bfe723c6..feb412e320a3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1374,6 +1374,8 @@ let
 
     vchan = callPackage ../development/ocaml-modules/vchan { };
 
+    vector = callPackage ../development/ocaml-modules/vector { };
+
     vg = callPackage ../development/ocaml-modules/vg { };
 
     vlq = callPackage ../development/ocaml-modules/vlq { };

From 70126f0e4ac7b4df2becc34696e35a8e38837b55 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 14 Jan 2022 15:43:06 +0100
Subject: [PATCH 11/22] =?UTF-8?q?ocamlPackages.progress:=200.1.1=20?=
 =?UTF-8?q?=E2=86=92=200.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.index: 1.4.0 → 1.4.1
---
 .../development/ocaml-modules/index/default.nix |  6 +++---
 .../ocaml-modules/progress/default.nix          | 17 +++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix
index 8e503f5ddd25..3649ee284eca 100644
--- a/pkgs/development/ocaml-modules/index/default.nix
+++ b/pkgs/development/ocaml-modules/index/default.nix
@@ -6,14 +6,14 @@
 
 buildDunePackage rec {
   pname = "index";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
-    sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c";
+    sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx";
   };
 
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
   useDune2 = true;
 
   buildInputs = [
diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix
index a3c0a5add3d2..4c00ff98465a 100644
--- a/pkgs/development/ocaml-modules/progress/default.nix
+++ b/pkgs/development/ocaml-modules/progress/default.nix
@@ -1,23 +1,20 @@
-{ lib, buildDunePackage, fetchurl
-, mtime, terminal_size, alcotest, astring, fmt
+{ lib, buildDunePackage
+, fmt, logs, mtime, optint, terminal, vector
+, alcotest, astring
 }:
 
 buildDunePackage rec {
   pname = "progress";
-  version = "0.1.1";
 
-  minimumOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.08";
   useDune2 = true;
 
-  src = fetchurl {
-    url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";
-    sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32";
-  };
+  inherit (terminal) version src;
 
-  propagatedBuildInputs = [ mtime terminal_size ];
+  propagatedBuildInputs = [ fmt logs mtime optint terminal vector ];
 
   doCheck = true;
-  checkInputs = [ alcotest astring fmt ];
+  checkInputs = [ alcotest astring ];
 
   meta = with lib; {
     description = "Progress bar library for OCaml";

From 50ede5f4e0997259e1f170342e185b9f8929e181 Mon Sep 17 00:00:00 2001
From: Solene Rapenne <solene@perso.pw>
Date: Fri, 14 Jan 2022 18:00:35 +0100
Subject: [PATCH 12/22] clamav: 0.103.3 -> 0.103.5

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

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 8fb66ebcb3ff..cc1eaf8265cf 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "0.103.3";
+  version = "0.103.5";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    sha256 = "sha256-n249GESfPRo5kncdaWaFJJ36EnNv4rKSmFjyx9gnauk=";
+    sha256 = "sha256-HnSx4dKoqQVkScMT9Ippg7nVug1vte8LK+atPIQaVCY=";
   };
 
   # don't install sample config files into the absolute sysconfdir folder

From a40f3bc88e10dbe9abdb1a5553a0cd7f0c41682a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Jan 2022 10:05:21 +0000
Subject: [PATCH 13/22] python3Packages.pyturbojpeg: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/development/python-modules/pyturbojpeg/default.nix b/pkgs/development/python-modules/pyturbojpeg/default.nix
index a357e45a5faf..aecbbbd65055 100644
--- a/pkgs/development/python-modules/pyturbojpeg/default.nix
+++ b/pkgs/development/python-modules/pyturbojpeg/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pyturbojpeg";
-  version = "1.6.3";
+  version = "1.6.4";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "PyTurboJPEG";
     inherit version;
-    sha256 = "sha256-5g9MQB7vpeuorVGExt0scHtLdrWlkuLOZMT38FhAsi4=";
+    hash = "sha256-kAIFFK7VnwL7o4G512f7kVVDBLz2SnjapzzpNM/KNKA=";
   };
 
   patches = [

From 43d5b318d80322bd460edee2e054f3d5f5db027e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Jan 2022 10:09:10 +0000
Subject: [PATCH 14/22] python3Packages.ytmusicapi: 0.19.5 -> 0.20.0

https://github.com/sigma67/ytmusicapi/releases/tag/0.20.0
---
 pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix
index b19aed0c6fdc..218c2edd0ac5 100644
--- a/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/pkgs/development/python-modules/ytmusicapi/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "ytmusicapi";
-  version = "0.19.5";
+  version = "0.20.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-haZe5afwkU8wD8s2lrmHJuVo6TO3CcQ/0TuJbHPmqvU=";
+    hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo=";
   };
 
   propagatedBuildInputs = [

From 8a552994d8e91b206b7d807917d1bbca54ce1145 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 14 Jan 2022 19:17:11 +0100
Subject: [PATCH 15/22] nixos/build-vm.nix: Fix docs eval

Quick fix. Might be possible to provide `extendModules`?
---
 nixos/modules/virtualisation/build-vm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/virtualisation/build-vm.nix b/nixos/modules/virtualisation/build-vm.nix
index 3baa84cce018..4a4694950f98 100644
--- a/nixos/modules/virtualisation/build-vm.nix
+++ b/nixos/modules/virtualisation/build-vm.nix
@@ -52,4 +52,7 @@ in
     };
 
   };
+
+  # uses extendModules
+  meta.buildDocsInSandbox = false;
 }

From ffde221dcb839fc4febdf8106ae5e896383ebaf4 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 14 Jan 2022 19:23:26 +0100
Subject: [PATCH 16/22] python3Packages.pytorch-bin: enable on darwin (cpu
 build)

---
 .../python-modules/pytorch/bin.nix            |  4 ++-
 .../python-modules/pytorch/binary-hashes.nix  | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix
index f570a0a5c95a..df3e5da4c5ab 100644
--- a/pkgs/development/python-modules/pytorch/bin.nix
+++ b/pkgs/development/python-modules/pytorch/bin.nix
@@ -11,6 +11,7 @@
 , patchelf
 , pyyaml
 , requests
+, setuptools
 , typing-extensions
 }:
 
@@ -41,6 +42,7 @@ in buildPythonPackage {
     numpy
     pyyaml
     requests
+    setuptools
     typing-extensions
   ];
 
@@ -72,7 +74,7 @@ in buildPythonPackage {
     # https://docs.nvidia.com/cuda/eula/index.html
     # https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ junjihashimoto ];
   };
 }
diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix
index dd3e5dc1ae3e..61f1e59d09e8 100644
--- a/pkgs/development/python-modules/pytorch/binary-hashes.nix
+++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix
@@ -22,5 +22,30 @@ version : builtins.getAttr version {
       url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
       hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg=";
     };
+    x86_64-darwin-37 = {
+      name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE=";
+    };
+    x86_64-darwin-38 = {
+      name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I=";
+    };
+    x86_64-darwin-39 = {
+      name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
+      hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw=";
+    };
+    aarch64-darwin-38 = {
+      name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
+      hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ=";
+    };
+    aarch64-darwin-39 = {
+      name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
+      hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY=";
+    };
   };
 }

From 47a8b15664f45dc66c166be35e0615163b6199d3 Mon Sep 17 00:00:00 2001
From: Tom Fitzhenry <tom@tom-fitzhenry.me.uk>
Date: Fri, 10 Dec 2021 22:51:54 +1100
Subject: [PATCH 17/22] evolution-data-server: propagate libgdata

Motivation: Stop programs from having to declare transitive dependencies (fixed in this commit).

Per https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs, evolution-data-server requires libgdata for gobject introspection.

See also https://github.com/NixOS/nixpkgs/commit/025960d2296456b8a4cc3b2bcd5a6c624c68a54b, which did a similar thing for libsoup.
---
 pkgs/applications/networking/calls/default.nix         |  1 -
 .../applications/office/elementary-planner/default.nix |  1 -
 .../gnome/core/evolution-data-server/default.nix       | 10 +++++++++-
 pkgs/desktops/gnome/core/gnome-contacts/default.nix    |  1 -
 .../pantheon/apps/elementary-calendar/default.nix      |  1 -
 .../desktop/wingpanel-indicators/datetime/default.nix  |  1 -
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index 2eb0f63bc345..8282713aa00a 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -73,7 +73,6 @@ stdenv.mkDerivation rec {
     callaudiod
     gtk3
     libpeas
-    libgdata # required by some dependency transitively
     sofia_sip
   ];
 
diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix
index c0cdfd75d9be..d07133e9065e 100644
--- a/pkgs/applications/office/elementary-planner/default.nix
+++ b/pkgs/applications/office/elementary-planner/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     pantheon.granite
     sqlite
     webkitgtk
-    libgdata # required by some dependency transitively
     libhandy
     curl
   ];
diff --git a/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
index 048fe600797b..11308bfcf5e9 100644
--- a/pkgs/desktops/gnome/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix
@@ -38,7 +38,15 @@ stdenv.mkDerivation rec {
     libcanberra-gtk3 pcre libphonenumber boost protobuf
   ];
 
-  propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ];
+  propagatedBuildInputs = [
+    db
+    libsecret
+    nss
+    nspr
+    libical
+    libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs
+    libsoup
+  ];
 
   cmakeFlags = [
     "-DENABLE_UOA=OFF"
diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix
index 919bb5206cff..1c16c3dd35ea 100644
--- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     evolution-data-server
     gsettings-desktop-schemas
     folks
-    libgdata # required by some dependency transitively
     gnome-desktop
     libhandy
     libxml2
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 019e2cf5a242..c7c5becd7032 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -64,7 +64,6 @@ stdenv.mkDerivation rec {
     libhandy
     libical
     libnotify
-    libgdata # required by some dependency transitively
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index 1164e0592bfb..3f7408d9dff3 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
     libical
     libsoup
     wingpanel
-    libgdata # required by some dependency transitively
   ];
 
   postPatch = ''

From b24a2be269d0780a4627e955b4abf9fd254dadbc Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 14 Jan 2022 20:26:08 +0100
Subject: [PATCH 18/22] deadnix: init at 0.1.3

---
 pkgs/development/tools/deadnix/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/deadnix/default.nix

diff --git a/pkgs/development/tools/deadnix/default.nix b/pkgs/development/tools/deadnix/default.nix
new file mode 100644
index 000000000000..34fb92973bc6
--- /dev/null
+++ b/pkgs/development/tools/deadnix/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "deadnix";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "astro";
+    repo = "deadnix";
+    rev = "v${version}";
+    sha256 = "0ddnxmcr9fncgrqg1vvqcbx49c3lccdpb40h9rvzyldzy9xynzi7";
+  };
+
+  cargoSha256 = "19vgjv70vxgxssrxvdjwfl16bwdbdrpb2wzb3fg9vlz4fhbj2lv9";
+
+  meta = with lib; {
+    description = "Find and remove unused code in .nix source files";
+    homepage = "https://github.com/astro/deadnix";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ astro ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afa76760cd45..9d88bf53bfa0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -315,6 +315,8 @@ with pkgs;
 
   deadcode = callPackage ../development/tools/deadcode { };
 
+  deadnix = callPackage ../development/tools/deadnix { };
+
   each = callPackage ../tools/text/each { };
 
   eclipse-mat = callPackage ../development/tools/eclipse-mat { };

From e040f9cd641d41f32abdccf8c706aec6a2379c50 Mon Sep 17 00:00:00 2001
From: Julius de Bruijn <julius+github@nauk.io>
Date: Fri, 14 Jan 2022 19:38:51 +0100
Subject: [PATCH 19/22] mautrix: 0.14.3 -> 0.14.4

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

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 4e4e6dcc6345..63f6466622a7 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "mautrix";
-  version = "0.14.3";
+  version = "0.14.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a7b41b522deafe47f8d3ce2b13f5a8a01f7bc715f09ebb5ca53a4af4f6987701";
+    sha256 = "sha256-SipDW1ahPHnC/BYv/I+uuzCYpFtOw3b4Oiu7N9LxFik=";
   };
 
   propagatedBuildInputs = [

From b6a83b4867b909adc50b4da5dc239763b0795f2c Mon Sep 17 00:00:00 2001
From: Julius de Bruijn <julius+github@nauk.io>
Date: Fri, 14 Jan 2022 19:39:07 +0100
Subject: [PATCH 20/22] mautrix-signal: 2021-11-12 -> 2022-01-14

---
 pkgs/servers/mautrix-signal/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix
index 6b11b386421e..7bdb29b08e9a 100644
--- a/pkgs/servers/mautrix-signal/default.nix
+++ b/pkgs/servers/mautrix-signal/default.nix
@@ -2,13 +2,13 @@
 
 python3.pkgs.buildPythonPackage rec {
   pname = "mautrix-signal";
-  version = "unstable-2021-11-12";
+  version = "unstable-2022-01-13";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "signal";
-    rev = "2e57810e964c1701df2e69273c2f8cebbe021464";
-    sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8=";
+    rev = "e015852a9969ac169e215c80872199ba3f3d838f";
+    sha256 = "sha256-7+0JubSGmQDMr7n1PK6i7homR1WknMz9ikC4164XmMo=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 4e7e160ea6a44e7d1731e11399a5bdd6a6bd505b Mon Sep 17 00:00:00 2001
From: Alvar Penning <post@0x21.biz>
Date: Mon, 10 Jan 2022 11:15:12 +0100
Subject: [PATCH 21/22] olm: 3.2.8 -> 3.2.9

---
 pkgs/development/libraries/olm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index e5c2d66827bf..baae8ae81b72 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "olm";
-  version = "3.2.8";
+  version = "3.2.9";
 
   src = fetchFromGitLab {
     domain = "gitlab.matrix.org";
     owner = "matrix-org";
     repo = pname;
     rev = version;
-    sha256 = "1jfhydfcnqpksb2bhi960v3h10prf4v5gx42mm2rp6p0jfbqcy50";
+    sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08";
   };
 
   nativeBuildInputs = [ cmake ];

From 97a8c7228abcbf1696554dc930f05666d5cd522e Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Tue, 11 Jan 2022 13:51:34 -0800
Subject: [PATCH 22/22] linuxPackages.nvidia_x11_beta: 495.29.05 -> 510.39.01

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index e335c7740a45..250ebbb59fdb 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -30,10 +30,10 @@ rec {
   production = legacy_470;
 
   beta = generic {
-    version = "495.29.05";
-    sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4=";
-    settingsSha256 = "sha256-dcEI+3bxSTwVbHcR6IgvIUFt4vWtK5T4NMGVhmmeVJ0=";
-    persistencedSha256 = "sha256-OT/hOXEPatc6pAKrxDe0jsmaDFCtVXAbdW4elKe6xE8=";
+    version = "510.39.01";
+    sha256_64bit = "sha256-Lj7cOvulhApeuRycIiyYy5kcPv3ZlM8qqpPUWl0bmRs=";
+    settingsSha256 = "sha256-qlSwNq0wC/twvrbQjY+wSTcDaV5KG4Raq6WkzTizyXw=";
+    persistencedSha256 = "sha256-UNrl/hfiNXKGACQ7aHpsNcfcHPWVnycQ51yaa3eKXhI=";
   };
 
   # Vulkan developer beta driver