From 59990a614f9a641f52d196a71d8350c9d1c516ad Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Fri, 24 Jun 2022 13:15:23 -0700
Subject: [PATCH 001/149] gam init at 6.22

Fixes #59781
---
 pkgs/tools/admin/gam/default.nix              | 73 +++++++++++++++++++
 .../admin/gam/signal_files_as_env_vars.patch  | 38 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 113 insertions(+)
 create mode 100644 pkgs/tools/admin/gam/default.nix
 create mode 100644 pkgs/tools/admin/gam/signal_files_as_env_vars.patch

diff --git a/pkgs/tools/admin/gam/default.nix b/pkgs/tools/admin/gam/default.nix
new file mode 100644
index 000000000000..191785dd0308
--- /dev/null
+++ b/pkgs/tools/admin/gam/default.nix
@@ -0,0 +1,73 @@
+{ lib
+, fetchFromGitHub
+, python3
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "gam";
+  version = "6.22";
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "GAM-team";
+    repo = "gam";
+    rev = "v${version}";
+    sha256 = "sha256-G/S1Rrm+suiy1CTTFLcBGt/QhARL7puHgR65nCxodH0=";
+  };
+
+  sourceRoot = "source/src";
+
+  patches = [
+    # Also disables update check
+    ./signal_files_as_env_vars.patch
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    distro
+    filelock
+    google-api-python-client
+    google-auth
+    google-auth-oauthlib
+    passlib
+    pathvalidate
+    python-dateutil
+    setuptools
+  ];
+
+  # Use XDG-ish dirs for configuration. These would otherwise be in the gam
+  # package.
+  #
+  # Using --run as `makeWapper` evaluates variables for --set and --set-default
+  # at build time and then single quotes the vars in the wrapper, thus they
+  # wouldn't get expanded. But using --run allows setting default vars that are
+  # evaluated on run and not during build time.
+   makeWrapperArgs = [
+    ''--run 'export GAMUSERCONFIGDIR="''${XDG_CONFIG_HOME:-$HOME/.config}/gam"' ''
+    ''--run 'export GAMSITECONFIGDIR="''${XDG_CONFIG_HOME:-$HOME/.config}/gam"' ''
+    ''--run 'export GAMCACHEDIR="''${XDG_CACHE_HOME:-$HOME/.cache}/gam"' ''
+    ''--run 'export GAMDRIVEDIR="$PWD"' ''
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp gam.py $out/bin/gam
+    mkdir -p $out/lib/${python3.libPrefix}/site-packages
+    cp -r gam $out/lib/${python3.libPrefix}/site-packages
+    runHook postInstall
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ${python3.interpreter} -m unittest discover --pattern "*_test.py" --buffer
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Command line management for Google Workspace";
+    homepage = "https://github.com/GAM-team/GAM/wiki";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ thanegill ];
+  };
+
+}
diff --git a/pkgs/tools/admin/gam/signal_files_as_env_vars.patch b/pkgs/tools/admin/gam/signal_files_as_env_vars.patch
new file mode 100644
index 000000000000..640a416d8a3a
--- /dev/null
+++ b/pkgs/tools/admin/gam/signal_files_as_env_vars.patch
@@ -0,0 +1,38 @@
+diff --git a/gam/__init__.py b/gam/__init__.py
+index 1c187ce..b2de793 100755
+--- a/gam/__init__.py
++++ b/gam/__init__.py
+@@ -549,22 +549,16 @@ def SetGlobalVariables():
+     _getOldEnvVar(GC_TLS_MIN_VERSION, 'GAM_TLS_MIN_VERSION')
+     _getOldEnvVar(GC_TLS_MAX_VERSION, 'GAM_TLS_MAX_VERSION')
+     _getOldEnvVar(GC_CA_FILE, 'GAM_CA_FILE')
+-    _getOldSignalFile(GC_DEBUG_LEVEL,
+-                      'debug.gam',
+-                      filePresentValue=4,
+-                      fileAbsentValue=0)
+-    _getOldSignalFile(GC_NO_BROWSER, 'nobrowser.txt')
+-    _getOldSignalFile(GC_NO_TDEMAIL, 'notdemail.txt')
+-    _getOldSignalFile(GC_OAUTH_BROWSER, 'oauthbrowser.txt')
++    _getOldEnvVar(GC_DEBUG_LEVEL, 'GAM_DEBUG')
++    _getOldEnvVar(GC_NO_BROWSER, 'GAM_NO_BROWSER')
++    _getOldEnvVar(GC_NO_TDEMAIL, 'GAM_NO_TDEMAIL')
++    _getOldEnvVar(GC_OAUTH_BROWSER, 'GAM_OAUTH_BROWSER')
+     #  _getOldSignalFile(GC_NO_CACHE, u'nocache.txt')
+     #  _getOldSignalFile(GC_CACHE_DISCOVERY_ONLY, u'allcache.txt', filePresentValue=False, fileAbsentValue=True)
+-    _getOldSignalFile(GC_NO_CACHE,
+-                      'allcache.txt',
+-                      filePresentValue=False,
+-                      fileAbsentValue=True)
+-    _getOldSignalFile(GC_NO_SHORT_URLS, 'noshorturls.txt')
+-    _getOldSignalFile(GC_NO_UPDATE_CHECK, 'noupdatecheck.txt')
+-    _getOldSignalFile(GC_ENABLE_DASA, FN_ENABLEDASA_TXT)
++    _getOldEnvVar(GC_NO_CACHE, 'GAM_NO_CACHE')
++    _getOldEnvVar(GC_NO_SHORT_URLS, 'GAM_NO_SHORT_URLS')
++    GC_Defaults[GC_NO_UPDATE_CHECK] = True
++    _getOldEnvVar(GC_ENABLE_DASA, FN_ENABLEDASA_TXT)
+     # Assign directories first
+     for itemName in GC_VAR_INFO:
+         if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_DIRECTORY:
+--
+2.36.0
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90ab4630a31d..27616240b226 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1179,6 +1179,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa VideoToolbox;
   };
 
+  gam = callPackage ../tools/admin/gam { };
+
   gfshare = callPackage ../tools/security/gfshare { };
 
   gh-cal = callPackage ../tools/misc/gh-cal {

From 4f64659d54ce6dd1002707cec1fad3fcc649fbd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jul 2022 09:59:52 +0000
Subject: [PATCH 002/149] fast-downward: 21.12.0 -> 22.06.0

---
 pkgs/applications/science/logic/fast-downward/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/fast-downward/default.nix b/pkgs/applications/science/logic/fast-downward/default.nix
index 1fe770a599d0..4025fd4e6d65 100644
--- a/pkgs/applications/science/logic/fast-downward/default.nix
+++ b/pkgs/applications/science/logic/fast-downward/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fast-downward";
-  version = "21.12.0";
+  version = "22.06.0";
 
   src = fetchFromGitHub {
     owner = "aibasel";
     repo = "downward";
     rev = "release-${version}";
-    sha256 = "sha256-qc+SaUpIYm7bnOZlHH2mdvUaMBB+VRyOCQM/BOoOaPE=";
+    sha256 = "sha256-WzxLUuwZy+oNqmgj0n4Pe1QBYXXAaJqYhT+JSLbmyiM=";
   };
 
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];

From 0c4d481dbc2c5f631656b128d5d5261c1c02e5eb Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Sun, 24 Jul 2022 15:20:54 +0400
Subject: [PATCH 003/149] openjdk17: 17.0.3+7 -> 17.0.4+8

---
 pkgs/development/compilers/openjdk/17.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix
index 45acc7f1ce98..2f94abab2804 100644
--- a/pkgs/development/compilers/openjdk/17.nix
+++ b/pkgs/development/compilers/openjdk/17.nix
@@ -11,8 +11,8 @@
 let
   version = {
     feature = "17";
-    interim = ".0.3";
-    build = "7";
+    interim = ".0.4";
+    build = "8";
   };
 
   openjdk = stdenv.mkDerivation {
@@ -23,7 +23,7 @@ let
       owner = "openjdk";
       repo = "jdk${version.feature}u";
       rev = "jdk-${version.feature}${version.interim}+${version.build}";
-      sha256 = "qxiKz8HCNZXFdfgfiA16q5z0S65cZE/u7e+QxLlplWo=";
+      sha256 = "drbljLz82ZyK29lIDLPqCkwqpBdgU/7zCTZ0ceeb1SI=";
     };
 
     nativeBuildInputs = [ pkg-config autoconf unzip ];

From fa84750cdbb105699a019d97766ece2f0ad00358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= <smancill@smancill.dev>
Date: Tue, 26 Jul 2022 01:29:09 -0400
Subject: [PATCH 004/149] libbdplus: 0.1.2 -> 0.2.0

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

diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 5b57cd7d458d..5c2255a50a62 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libbdplus";
-  version  = "0.1.2";
+  version  = "0.2.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libbdplus/${version}/${pname}-${version}.tar.bz2";
-    sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
+    sha256 = "sha256-uT7qPq7zPW6RVdLDSwaMUFSTqlpJNuYydPQ0KrD0Clg=";
   };
 
   buildInputs = [ libgcrypt libgpg-error gettext ];

From 40e13156af02f27c40b5020136e39790e4216fc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Jul 2022 04:53:42 +0000
Subject: [PATCH 005/149] libyang: 2.0.194 -> 2.0.231

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

diff --git a/pkgs/development/libraries/libyang/default.nix b/pkgs/development/libraries/libyang/default.nix
index 8cc4ad06e356..45c535d81bf3 100644
--- a/pkgs/development/libraries/libyang/default.nix
+++ b/pkgs/development/libraries/libyang/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyang";
-  version = "2.0.194";
+  version = "2.0.231";
 
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
     rev = "v${version}";
-    sha256 = "sha256-5dgSBXJIeGXT+jGqT2MFqtsEFcIn+ULjybnyXz+95Gk=";
+    sha256 = "sha256-IntucM8ABJsJNH7XnZ59McwmfSIimclrWzSz4NKdMrE=";
   };
 
   nativeBuildInputs = [

From e57b2715396a68001dcd6dbbbdebc1134b5f6e75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Jul 2022 22:02:58 +0000
Subject: [PATCH 006/149] asciidoctorj: 2.5.4 -> 2.5.5

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

diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix
index 7482930983c3..80872b0fdff0 100644
--- a/pkgs/tools/typesetting/asciidoctorj/default.nix
+++ b/pkgs/tools/typesetting/asciidoctorj/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "asciidoctorj";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchzip {
     url = "mirror://maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip";
-    sha256 = "DMP47YgGE8qQwS9kcS9lUg+2N7z9T+7joClqrgF055Q=";
+    sha256 = "sha256-0MWZKT4TkgNEJPP0HRc316P2AFeZ2gh+mu30X0y3Otc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4303cfcc641f804ec1b480955be661cccc35d428 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 00:44:37 +0000
Subject: [PATCH 007/149] ceph: 16.2.9 -> 16.2.10

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

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 73e9dd1f01fa..be7d0dfb3407 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -138,10 +138,10 @@ let
   ]);
   sitePackages = ceph-python-env.python.sitePackages;
 
-  version = "16.2.9";
+  version = "16.2.10";
   src = fetchurl {
     url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-    sha256 = "sha256-CNj48myJvYwj8cWQRWrTSPiPHS+AFcXfqzd1ytMUxvk=";
+    sha256 = "sha256-342+nUV3mCX7QJfZSnKEfnQFCJwJmVQeYnefJwW/AtU=";
   };
 in rec {
   ceph = stdenv.mkDerivation {

From db004ed2dc159bc5717a5f3380804586f8e9bd3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Jul 2022 01:55:12 +0000
Subject: [PATCH 008/149] nanoflann: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix
index 477ff27078bf..36208fc09a81 100644
--- a/pkgs/development/libraries/nanoflann/default.nix
+++ b/pkgs/development/libraries/nanoflann/default.nix
@@ -1,14 +1,14 @@
 {lib, stdenv, fetchFromGitHub, cmake}:
 
 stdenv.mkDerivation rec {
-  version = "1.4.2";
+  version = "1.4.3";
   pname = "nanoflann";
 
   src = fetchFromGitHub {
     owner = "jlblancoc";
     repo = "nanoflann";
     rev = "v${version}";
-    sha256 = "sha256-znIX1S0mfOqLYPIcyVziUM1asBjENPEAdafLud1CfFI=";
+    sha256 = "sha256-NcewcNQcI1CjMNibRF9HCoE2Ibs0/Hy4eOkJ20W3wLo=";
   };
 
   nativeBuildInputs = [ cmake ];

From 8377a22472cbd04728217cf88d2c992e4ae2f9d6 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 30 Jul 2022 12:46:37 +0200
Subject: [PATCH 009/149] python310Packages.lark: Enable more tests

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

diff --git a/pkgs/development/python-modules/lark/default.nix b/pkgs/development/python-modules/lark/default.nix
index 8fc32539d69d..62123032a5d4 100644
--- a/pkgs/development/python-modules/lark/default.nix
+++ b/pkgs/development/python-modules/lark/default.nix
@@ -4,6 +4,7 @@
 , python
 , regex
 , pytestCheckHook
+, js2py
 }:
 
 buildPythonPackage rec {
@@ -27,10 +28,9 @@ buildPythonPackage rec {
     "lark.grammars"
   ];
 
-  checkInputs = [ pytestCheckHook ];
-
-  disabledTestPaths = [
-    "tests/test_nearley/test_nearley.py"  # requires unpackaged Js2Py library
+  checkInputs = [
+    js2py
+    pytestCheckHook
   ];
 
   meta = with lib; {

From f393b3190b695c2989e115bc6b383f6286778807 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Aug 2022 01:46:48 +0000
Subject: [PATCH 010/149] socket_wrapper: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 1f68f044cda5..19dfb62002e2 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "socket_wrapper";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz";
-    sha256 = "sha256-G42i+w7n3JkPvOc039I+frzDnq1GGGyQqUkMFdoebhM=";
+    sha256 = "sha256-dmYeXGXbe05WiT2ZDrH4aCmymDjj8SqrZyEc3d0Uf0Y=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 4b7937fd7b735caa6ef46aee4318f9007e51c195 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 4 Aug 2022 21:57:10 +0100
Subject: [PATCH 011/149] streamlit: 1.2.0 -> 1.11.1

---
 .../machine-learning/streamlit/default.nix    | 36 ++++++-------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix
index f439b113d1ab..2b05566e2647 100755
--- a/pkgs/applications/science/machine-learning/streamlit/default.nix
+++ b/pkgs/applications/science/machine-learning/streamlit/default.nix
@@ -6,16 +6,11 @@
 
   # Build inputs
   altair,
-  astor,
-  base58,
   blinker,
-  boto3,
-  botocore,
   click,
   cachetools,
-  enum-compat,
-  future,
   GitPython,
+  importlib-metadata,
   jinja2,
   pillow,
   pyarrow,
@@ -23,6 +18,8 @@
   pympler,
   protobuf,
   requests,
+  rich,
+  semver,
   setuptools,
   toml,
   tornado,
@@ -31,36 +28,23 @@
   watchdog,
 }:
 
-let
-  click_7 = click.overridePythonAttrs(old: rec {
-    version = "7.1.2";
-    src = old.src.override {
-      inherit version;
-      sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a";
-    };
-  });
-in buildPythonApplication rec {
+buildPythonApplication rec {
   pname = "streamlit";
-  version = "1.2.0";
-  format = "wheel"; # the only distribution available
+  version = "1.11.1";
+  format = "wheel";  # source currently requires pipenv
 
   src = fetchPypi {
     inherit pname version format;
-    sha256 = "1dzb68a8n8wvjppcmqdaqnh925b2dg6rywv51ac9q09zjxb6z11n";
+    hash = "sha256-+GGuL3UngPDgLOGx9QXUdRJsTswhTg7d6zuvhpp0Mo0=";
   };
 
   propagatedBuildInputs = [
     altair
-    astor
-    base58
     blinker
-    boto3
-    botocore
     cachetools
-    click_7
-    enum-compat
-    future
+    click
     GitPython
+    importlib-metadata
     jinja2
     pillow
     protobuf
@@ -68,6 +52,8 @@ in buildPythonApplication rec {
     pydeck
     pympler
     requests
+    rich
+    semver
     setuptools
     toml
     tornado

From 87942da08e3221f32c7a43a17b165fabfdb04082 Mon Sep 17 00:00:00 2001
From: Lara <lara@uwu.is>
Date: Mon, 20 Sep 2021 08:53:29 +0200
Subject: [PATCH 012/149] nixos/sssd: Add secrets handling

Currently, it is not possible to supply sensitive credentials like
`ldap_default_authtok` without writing them to the nix store. This
This commit introduces a new option `environmentFile` where those
credentials can be supplied via environment substitution.
---
 nixos/modules/services/misc/sssd.nix | 48 ++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 70afbe0433ae..039c9737b1f4 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -3,6 +3,10 @@ with lib;
 let
   cfg = config.services.sssd;
   nscd = config.services.nscd;
+
+  dataDir = "/var/lib/sssd";
+  settingsFile = "${dataDir}/sssd.conf";
+  settingsFileUnsubstituted = pkgs.writeText "${dataDir}/sssd-unsubsituted.conf" cfg.config;
 in {
   options = {
     services.sssd = {
@@ -47,6 +51,30 @@ in {
           Kerberos will be configured to cache credentials in SSS.
         '';
       };
+      environmentFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = ''
+          Environment file as defined in <citerefentry>
+          <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum>
+          </citerefentry>.
+
+          Secrets may be passed to the service without adding them to the world-readable
+          Nix store, by specifying placeholder variables as the option value in Nix and
+          setting these variables accordingly in the environment file.
+
+          <programlisting>
+            # snippet of sssd-related config
+            [domain/LDAP]
+            ldap_default_authtok = $SSSD_LDAP_DEFAULT_AUTHTOK
+          </programlisting>
+
+          <programlisting>
+            # contents of the environment file
+            SSSD_LDAP_DEFAULT_AUTHTOK=verysecretpassword
+          </programlisting>
+        '';
+      };
     };
   };
   config = mkMerge [
@@ -60,22 +88,28 @@ in {
         wants = [ "nss-user-lookup.target" ];
         restartTriggers = [
           config.environment.etc."nscd.conf".source
-          config.environment.etc."sssd/sssd.conf".source
+          settingsFileUnsubstituted
         ];
         script = ''
           export LDB_MODULES_PATH+="''${LDB_MODULES_PATH+:}${pkgs.ldb}/modules/ldb:${pkgs.sssd}/modules/ldb"
           mkdir -p /var/lib/sss/{pubconf,db,mc,pipes,gpo_cache,secrets} /var/lib/sss/pipes/private /var/lib/sss/pubconf/krb5.include.d
-          ${pkgs.sssd}/bin/sssd -D
+          ${pkgs.sssd}/bin/sssd -D -c ${settingsFile}
         '';
         serviceConfig = {
           Type = "forking";
           PIDFile = "/run/sssd.pid";
+          StateDirectory = baseNameOf dataDir;
+          EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
         };
-      };
-
-      environment.etc."sssd/sssd.conf" = {
-        text = cfg.config;
-        mode = "0400";
+        preStart = ''
+          [ -f ${settingsFile} ] && rm -f ${settingsFile}
+          old_umask=$(umask)
+          umask 0177
+          ${pkgs.envsubst}/bin/envsubst \
+            -o ${settingsFile} \
+            -i ${settingsFileUnsubstituted}
+          umask $old_umask
+        '';
       };
 
       system.nssModules = [ pkgs.sssd ];

From 1cd88b09ecf0148348efa0d0702b096209b0c1fb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 30 Jul 2022 12:48:52 +0200
Subject: [PATCH 013/149] python310Packages.js2py: init at 0.71

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

diff --git a/pkgs/development/python-modules/js2py/default.nix b/pkgs/development/python-modules/js2py/default.nix
new file mode 100644
index 000000000000..c47e6aee0bbd
--- /dev/null
+++ b/pkgs/development/python-modules/js2py/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, tzlocal
+, six
+, pyjsparser
+}:
+
+buildPythonPackage rec {
+  pname = "js2py";
+  version = "0.71";
+
+  src = fetchFromGitHub {
+    owner = "PiotrDabkowski";
+    repo = "Js2Py";
+    rev = "5f665f60083a9796ec33861240ce31d6d2b844b6";
+    sha256 = "sha256-1omTV7zkYSQfxhkNgI4gtXTenWt9J1r3VARRHoRsSfc=";
+  };
+
+  propagatedBuildInputs = [
+    pyjsparser
+    six
+    tzlocal
+  ];
+
+  # Test require network connection
+  doCheck = false;
+
+  pythonImportsCheck = [ "js2py" ];
+
+  meta = with lib; {
+    description = "JavaScript to Python Translator & JavaScript interpreter written in 100% pure Python";
+    homepage = "https://github.com/PiotrDabkowski/Js2Py";
+    license = licenses.mit;
+    maintainers = with maintainers; [ onny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dfa493883041..10716ef3d40b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4579,6 +4579,8 @@ in {
     inherit (pkgs) jq;
   };
 
+  js2py = callPackage ../development/python-modules/js2py { };
+
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier { };
 
   jschema-to-python = callPackage ../development/python-modules/jschema-to-python { };

From f83576d77e02d72b5b07eadc630a8ad6c48363df Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 12 Aug 2022 22:25:44 +0200
Subject: [PATCH 014/149] python310Packages.pyjsparser: init at 2.7.1

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

diff --git a/pkgs/development/python-modules/pyjsparser/default.nix b/pkgs/development/python-modules/pyjsparser/default.nix
new file mode 100644
index 000000000000..0f2ddf62f1a8
--- /dev/null
+++ b/pkgs/development/python-modules/pyjsparser/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pytestCheckHook
+, js2py
+}:
+
+let pyjsparser = buildPythonPackage rec {
+  pname = "pyjsparser";
+  version = "2.7.1";
+
+  src = fetchFromGitHub {
+    owner = "PiotrDabkowski";
+    repo = pname;
+    rev = "5465d037b30e334cb0997f2315ec1e451b8ad4c1";
+    sha256 = "sha256-Hqay9/qsjUfe62U7Q79l0Yy01L2Bnj5xNs6427k3Br8=";
+  };
+
+  checkInputs = [ pytestCheckHook js2py ];
+
+  # escape infinite recursion with js2py
+  doCheck = false;
+
+  passthru.tests = {
+    check = pyjsparser.overridePythonAttrs (_: { doCheck = true; });
+  };
+
+  pythonImportsCheck = [ "pyjsparser" ];
+
+  meta = with lib; {
+    description = "Fast javascript parser (based on esprima.js)";
+    homepage = "https://github.com/PiotrDabkowski/pyjsparser";
+    license = licenses.mit;
+    maintainers = with maintainers; [ onny ];
+  };
+}; in pyjsparser
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 10716ef3d40b..9a6d90dbebb7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7598,6 +7598,8 @@ in {
 
   pyjson5 = callPackage ../development/python-modules/pyjson5 { };
 
+  pyjsparser = callPackage ../development/python-modules/pyjsparser { };
+
   pyjwkest = callPackage ../development/python-modules/pyjwkest { };
 
   pyjwt = callPackage ../development/python-modules/pyjwt { };

From 633d5cb10fba4d1cddaa462f25c45a14e3726296 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Mon, 1 Aug 2022 11:24:40 +1000
Subject: [PATCH 015/149] python3Packages.jaxlib: fix darwin build

---
 .../python-modules/jaxlib/default.nix         | 54 ++++++++++++++-----
 pkgs/top-level/python-packages.nix            |  7 ++-
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix
index 0fb0a183ebe4..54b4c36dc5a2 100644
--- a/pkgs/development/python-modules/jaxlib/default.nix
+++ b/pkgs/development/python-modules/jaxlib/default.nix
@@ -8,9 +8,11 @@
 , binutils
 , buildBazelPackage
 , buildPythonPackage
+, cctools
 , cython
 , fetchFromGitHub
 , git
+, IOKit
 , jsoncpp
 , pybind11
 , setuptools
@@ -55,8 +57,11 @@ let
     homepage = "https://github.com/google/jax";
     license = licenses.asl20;
     maintainers = with maintainers; [ ndl ];
-    platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin"];
-    hydraPlatforms = ["x86_64-linux" ]; # Don't think anybody is checking the darwin builds
+    platforms = platforms.unix;
+    # aarch64-darwin is broken because of https://github.com/bazelbuild/rules_cc/pull/136
+    # however even with that fix applied, it doesn't work for everyone:
+    # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129
+    broken = stdenv.isAarch64;
   };
 
   cudatoolkit_joined = symlinkJoin {
@@ -117,6 +122,8 @@ let
     ] ++ lib.optionals cudaSupport [
       cudatoolkit
       cudnn
+    ] ++ lib.optionals stdenv.isDarwin [
+      IOKit
     ];
 
     postPatch = ''
@@ -201,9 +208,7 @@ let
 
     # Make sure Bazel knows about our configuration flags during fetching so that the
     # relevant dependencies can be downloaded.
-    bazelFetchFlags = bazel-build.bazelBuildFlags;
-
-    bazelBuildFlags = [
+    bazelFlags = [
       "-c opt"
     ] ++ lib.optional (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [
       "--config=avx_posix"
@@ -211,6 +216,11 @@ let
       "--config=cuda"
     ] ++ lib.optional mklSupport [
       "--config=mkl_open_source_only"
+    ] ++ lib.optionals stdenv.cc.isClang [
+      # bazel depends on the compiler frontend automatically selecting these flags based on file
+      # extension but our clang doesn't.
+      # https://github.com/NixOS/nixpkgs/issues/150655
+      "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++"
     ];
 
     fetchAttrs = {
@@ -218,7 +228,7 @@ let
         if cudaSupport then
           "sha256-Ald+vplRx/DDG/7TfHAqD4Gktb1BGnf7FSCCJzSI0eo="
         else
-          "sha256-6acSbBNcUBw177HMVOmpV7pUfP1aFSe5cP6/zWFdGFo=";
+          "sha256-eK5IjTAncDarkWYKnXrEo7kw7J7iOH7in2L2GabnFYo=";
     };
 
     buildAttrs = {
@@ -226,8 +236,8 @@ let
 
       # Note: we cannot do most of this patching at `patch` phase as the deps are not available yet.
       # 1) Fix pybind11 include paths.
-      # 2) Force static protobuf linkage to prevent crashes on loading multiple extensions
-      #    in the same python program due to duplicate protobuf DBs.
+      # 2) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on
+      #    loading multiple extensions in the same python program due to duplicate protobuf DBs.
       # 3) Patch python path in the compiler driver.
       # 4) Patch tensorflow sources to work with later versions of protobuf. See
       #    https://github.com/google/jax/issues/9534. Note that this should be
@@ -236,13 +246,25 @@ let
         for src in ./jaxlib/*.{cc,h}; do
           sed -i 's@include/pybind11@pybind11@g' $src
         done
-        sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
-        sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
         substituteInPlace ../output/external/org_tensorflow/tensorflow/compiler/xla/python/pprof_profile_builder.cc \
           --replace "status.message()" "std::string{status.message()}"
+        substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \
+          --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool"
+        substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \
+          --replace "/usr/bin/libtool" "${cctools}/bin/libtool"
       '' + lib.optionalString cudaSupport ''
         patchShebangs ../output/external/org_tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
-      '';
+      '' + lib.optionalString stdenv.isDarwin ''
+        # Framework search paths aren't added by bintools hook
+        # https://github.com/NixOS/nixpkgs/pull/41914
+        export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks"
+      '' + (if stdenv.cc.isGNU then ''
+        sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
+        sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
+      '' else if stdenv.cc.isClang then ''
+        sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
+        sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
+      '' else throw "Unsupported stdenv.cc: ${stdenv.cc}");
 
       installPhase = ''
         ./bazel-bin/build/build_wheel --output_path=$out --cpu=${stdenv.targetPlatform.linuxArch}
@@ -251,13 +273,21 @@ let
 
     inherit meta;
   };
+  platformTag =
+    if stdenv.targetPlatform.isLinux then
+      "manylinux2010_${stdenv.targetPlatform.linuxArch}"
+    else if stdenv.system == "x86_64-darwin" then
+      "macosx_10_9_${stdenv.targetPlatform.linuxArch}"
+    else if stdenv.system == "aarch64-darwin" then
+      "macosx_11_0_${stdenv.targetPlatform.linuxArch}"
+    else throw "Unsupported target platform: ${stdenv.targetPlatform}";
 
 in
 buildPythonPackage {
   inherit meta pname version;
   format = "wheel";
 
-  src = "${bazel-build}/jaxlib-${version}-cp${builtins.replaceStrings ["."] [""] python.pythonVersion}-none-manylinux2010_${stdenv.targetPlatform.linuxArch}.whl";
+  src = "${bazel-build}/jaxlib-${version}-cp${builtins.replaceStrings ["."] [""] python.pythonVersion}-none-${platformTag}.whl";
 
   # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH.
   # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e104a8d57686..8c7c4935d264 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4558,12 +4558,17 @@ in {
     cudaPackages = pkgs.cudaPackages_11_6;
   };
 
-  jaxlib-build = callPackage ../development/python-modules/jaxlib {
+  jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
+    inherit (pkgs.darwin) cctools;
+    buildBazelPackage = pkgs.buildBazelPackage.override {
+      stdenv = if stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else stdenv;
+    };
     # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
     cudaSupport = pkgs.config.cudaSupport or false;
     # At the time of writing (2022-04-18), `cudaPackages.nccl` is broken, so we
     # pin to `cudaPackages_11_6` instead.
     cudaPackages = pkgs.cudaPackages_11_6;
+    IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
   };
 
   jaxlib = self.jaxlib-build;

From 911880f76310219fa8da24268060a209379d4710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 13 Aug 2022 09:10:47 -0300
Subject: [PATCH 016/149] xfce.xfdashboard: 0.9.5 -> 1.0.0

---
 pkgs/desktops/xfce/applications/xfdashboard/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix
index ee09d6196c78..fd92e2c92e8f 100644
--- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix
+++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix
@@ -18,11 +18,10 @@
 mkXfceDerivation {
   category = "apps";
   pname = "xfdashboard";
-  version = "0.9.5";
+  version = "1.0.0";
   rev-prefix = "";
-  odd-unstable = false;
 
-  sha256 = "sha256-nb1zY78MUjEOJF59MYIOY1rxo3JFmzH9yTJVUGsOwOA=";
+  sha256 = "sha256-iC41I0u9id9irUNyjuvRRzSldF3dzRYkaxb/fgptnq4=";
 
   buildInputs = [
     clutter

From 72f0457ed64edf41363c32d26471a6ea03b0ccd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 13 Aug 2022 09:18:36 -0300
Subject: [PATCH 017/149] xfce.tumbler: 4.16.0 -> 4.16.1

---
 pkgs/desktops/xfce/core/tumbler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
index 26a28b9b426d..ee5413fdda5a 100644
--- a/pkgs/desktops/xfce/core/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -14,9 +14,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "tumbler";
-  version = "4.16.0";
+  version = "4.16.1";
 
-  sha256 = "sha256-JLcmYjStF9obDoRHsxnZ1e9HPTeJUVKjnn5Ip1BBmPw=";
+  sha256 = "sha256-f2pCItNHTB0ggovIddpwNWEhaohfxD2otN8x9VfwR4k=";
 
   buildInputs = [
     ffmpegthumbnailer

From 5b5e7723ee450b32b14ae1394a12ad5ea974e395 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Aug 2022 17:12:47 +0000
Subject: [PATCH 018/149] entt: 3.10.0 -> 3.10.3

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

diff --git a/pkgs/development/libraries/entt/default.nix b/pkgs/development/libraries/entt/default.nix
index 67886920cd37..7c87580aea11 100644
--- a/pkgs/development/libraries/entt/default.nix
+++ b/pkgs/development/libraries/entt/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, cmake }:
 stdenv.mkDerivation rec {
   pname = "entt";
-  version = "3.10.0";
+  version = "3.10.3";
 
   src = fetchFromGitHub {
     owner = "skypjack";
     repo = "entt";
     rev = "v${version}";
-    sha256 = "sha256-/4lc+/YiLPxrn+7Z67sEapYY0ocLWHPC8yeYD2VI+64=";
+    sha256 = "sha256-pewAwvNRCBS6rm3AmHthiayGfP71lqkAO+x6rT957Xg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 020c641a88bd27658a6a9f193bdaeb41b015581b Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 14 Aug 2022 13:53:07 +0200
Subject: [PATCH 019/149] crosvm: 103.3 -> 104.0

---
 .../virtualization/crosvm/Cargo.lock          | 517 +++++++++++++++---
 .../virtualization/crosvm/default.nix         |  27 +-
 2 files changed, 456 insertions(+), 88 deletions(-)

diff --git a/pkgs/applications/virtualization/crosvm/Cargo.lock b/pkgs/applications/virtualization/crosvm/Cargo.lock
index c7775564c32e..646562bd27d6 100644
--- a/pkgs/applications/virtualization/crosvm/Cargo.lock
+++ b/pkgs/applications/virtualization/crosvm/Cargo.lock
@@ -12,6 +12,7 @@ dependencies = [
  "devices",
  "hypervisor",
  "kernel_cmdline",
+ "kernel_loader",
  "kvm",
  "kvm_sys",
  "libc",
@@ -42,6 +43,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "android_system_properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -53,9 +63,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
+checksum = "508b352bb5c066aac251f6daf6b36eccd03e8a88e8081cd44959ea277a3af9a8"
 
 [[package]]
 name = "arch"
@@ -98,8 +108,17 @@ dependencies = [
  "argh_shared",
  "heck",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "argh_helpers"
+version = "0.1.0"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -120,13 +139,13 @@ checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524"
 
 [[package]]
 name = "async-trait"
-version = "0.1.56"
+version = "0.1.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
+checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -177,13 +196,15 @@ name = "base"
 version = "0.1.0"
 dependencies = [
  "audio_streams",
- "base_poll_token_derive",
+ "base_event_token_derive",
  "cfg-if",
  "chrono",
  "data_model",
+ "env_logger",
  "lazy_static",
  "libc",
  "log",
+ "once_cell",
  "rand 0.8.5",
  "regex",
  "remain",
@@ -193,17 +214,18 @@ dependencies = [
  "sync",
  "tempfile",
  "thiserror",
+ "uuid",
  "win_util",
  "winapi",
 ]
 
 [[package]]
-name = "base_poll_token_derive"
+name = "base_event_token_derive"
 version = "0.1.0"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -218,8 +240,8 @@ name = "bit_field_derive"
 version = "0.1.0"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -228,6 +250,28 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "broker_ipc"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base",
+ "metrics",
+ "serde",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
 [[package]]
 name = "cbindgen"
 version = "0.20.0"
@@ -239,10 +283,10 @@ dependencies = [
  "indexmap",
  "log",
  "proc-macro2",
- "quote",
+ "quote 1.0.21",
  "serde",
  "serde_json",
- "syn",
+ "syn 1.0.99",
  "tempfile",
  "toml",
 ]
@@ -261,14 +305,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.19"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
+checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1"
 dependencies = [
- "libc",
+ "iana-time-zone",
+ "js-sys",
  "num-integer",
  "num-traits",
+ "serde",
  "time",
+ "wasm-bindgen",
  "winapi",
 ]
 
@@ -302,6 +349,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -351,9 +404,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
+checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -367,10 +420,13 @@ dependencies = [
  "acpi_tables",
  "anyhow",
  "arch",
+ "argh",
+ "argh_helpers",
  "assertions",
  "audio_streams",
  "base",
  "bit_field",
+ "broker_ipc",
  "cfg-if",
  "crosvm_plugin",
  "data_model",
@@ -388,6 +444,7 @@ dependencies = [
  "libc",
  "libcras",
  "log",
+ "metrics",
  "minijail",
  "net_util",
  "p9",
@@ -477,6 +534,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "derive-into-owned"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "576fce04d31d592013a5887ba8d9c3830adff329e5096d7e1eb5e8e61262ca62"
+dependencies = [
+ "quote 0.3.15",
+ "syn 0.11.11",
+]
+
 [[package]]
 name = "devices"
 version = "0.1.0"
@@ -513,6 +580,7 @@ dependencies = [
  "power_monitor",
  "protobuf",
  "protos",
+ "rand 0.7.3",
  "remain",
  "resources",
  "rutabaga_gfx",
@@ -541,6 +609,7 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "base",
+ "cfg-if",
  "crc32fast",
  "cros_async",
  "data_model",
@@ -549,6 +618,7 @@ dependencies = [
  "protobuf",
  "protos",
  "remain",
+ "serde",
  "tempfile",
  "thiserror",
  "uuid",
@@ -569,24 +639,43 @@ checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
 
 [[package]]
 name = "enumn"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "052bc8773a98bd051ff37db74a8a25f00e6bfa2cbd03373390c72e9f7afbf344"
+checksum = "038b1afa59052df211f9efd58f8b1d84c242935ede1c3dbaed26b018a9e06ae2"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
 ]
 
 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
  "instant",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
@@ -663,8 +752,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -721,6 +810,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.7"
@@ -748,9 +848,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "heck"
@@ -770,22 +870,46 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hypervisor"
 version = "0.1.0"
 dependencies = [
  "base",
  "bit_field",
+ "bitflags",
  "data_model",
  "downcast-rs",
  "enumn",
+ "fnv",
  "kvm",
  "kvm_sys",
  "libc",
  "memoffset 0.6.5",
  "serde",
  "sync",
+ "tempfile",
  "vm_memory",
+ "win_util",
+ "winapi",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "808cf7d67cf4a22adc5be66e75ebdf769b3f2ea032041437a7061f97a63dad4b"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "js-sys",
+ "wasm-bindgen",
+ "winapi",
 ]
 
 [[package]]
@@ -814,7 +938,6 @@ dependencies = [
  "anyhow",
  "arch",
  "base",
- "crosvm",
  "libc",
  "tempfile",
 ]
@@ -843,9 +966,18 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754"
+
+[[package]]
+name = "js-sys"
+version = "0.3.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2"
+dependencies = [
+ "wasm-bindgen",
+]
 
 [[package]]
 name = "kernel_cmdline"
@@ -898,9 +1030,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "04c3b4822ccebfa39c02fc03d1534441b22ead323fa0f48bb7ddd8e6ba076a40"
 
 [[package]]
 name = "libcras"
@@ -915,6 +1047,15 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "libslirp-sys"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2772370ce9b7fa05c7eae0bd033005e139a64d52cee498a7905b3eb5d243c5f4"
+dependencies = [
+ "pkg-config",
+]
+
 [[package]]
 name = "libvda"
 version = "0.1.0"
@@ -972,6 +1113,25 @@ dependencies = [
  "autocfg 1.1.0",
 ]
 
+[[package]]
+name = "metrics"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "base",
+ "cfg-if",
+ "chrono",
+ "lazy_static",
+ "libc",
+ "protobuf",
+ "protoc-rust",
+ "serde",
+ "serde_json",
+ "sync",
+ "winapi",
+ "wmi",
+]
+
 [[package]]
 name = "minijail"
 version = "0.2.3"
@@ -1006,10 +1166,16 @@ dependencies = [
  "cros_async",
  "data_model",
  "libc",
+ "libslirp-sys",
+ "metrics",
  "net_sys",
+ "pcap-file",
  "remain",
  "serde",
+ "smallvec",
  "thiserror",
+ "virtio_sys",
+ "winapi",
 ]
 
 [[package]]
@@ -1057,9 +1223,20 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
+checksum = "9423e2b32f7a043629287a536f21951e8c6a82482d0acb1eeebfc90bc2225b22"
+
+[[package]]
+name = "pcap-file"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ad13fed1a83120159aea81b265074f21d753d157dd16b10cc3790ecba40a341"
+dependencies = [
+ "byteorder",
+ "derive-into-owned",
+ "thiserror",
+]
 
 [[package]]
 name = "pin-project-lite"
@@ -1099,9 +1276,9 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
 dependencies = [
  "unicode-ident",
 ]
@@ -1111,6 +1288,10 @@ name = "protobuf"
 version = "2.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96"
+dependencies = [
+ "serde",
+ "serde_derive",
+]
 
 [[package]]
 name = "protobuf-codegen"
@@ -1163,9 +1344,15 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
+
+[[package]]
+name = "quote"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
  "proc-macro2",
 ]
@@ -1180,7 +1367,7 @@ dependencies = [
  "libc",
  "rand_chacha 0.1.1",
  "rand_core 0.4.2",
- "rand_hc",
+ "rand_hc 0.1.0",
  "rand_isaac",
  "rand_jitter",
  "rand_os",
@@ -1189,6 +1376,19 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc 0.2.0",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1210,6 +1410,16 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -1235,13 +1445,22 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -1253,6 +1472,15 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -1317,9 +1545,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
@@ -1343,13 +1571,13 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
 [[package]]
 name = "remain"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c35270ea384ac1762895831cc8acb96f171468e52cec82ed9186f9416209fa4"
+checksum = "06df529c0d271b27ac4a2c260f5ce2914b60bd44702cecec7b9f271adbdde23b"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -1382,15 +1610,16 @@ dependencies = [
  "libc",
  "pkg-config",
  "remain",
+ "serde",
  "sync",
  "thiserror",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "scudo"
@@ -1414,29 +1643,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.139"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
+checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.139"
+version = "1.0.143"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
+checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
+checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
 dependencies = [
  "itoa",
  "ryu",
@@ -1448,6 +1677,7 @@ name = "serde_keyvalue"
 version = "0.1.0"
 dependencies = [
  "argh",
+ "num-traits",
  "remain",
  "serde",
  "serde_keyvalue_derive",
@@ -1460,15 +1690,18 @@ version = "0.1.0"
 dependencies = [
  "argh",
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg 1.1.0",
+]
 
 [[package]]
 name = "smallvec"
@@ -1484,12 +1717,23 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "0.11.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"
+dependencies = [
+ "quote 0.3.15",
+ "synom",
+ "unicode-xid",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
 dependencies = [
  "proc-macro2",
- "quote",
+ "quote 1.0.21",
  "unicode-ident",
 ]
 
@@ -1497,6 +1741,15 @@ dependencies = [
 name = "sync"
 version = "0.1.0"
 
+[[package]]
+name = "synom"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6"
+dependencies = [
+ "unicode-xid",
+]
+
 [[package]]
 name = "system_api"
 version = "0.1.0"
@@ -1515,6 +1768,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "terminal_size"
 version = "0.1.17"
@@ -1536,22 +1798,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
 ]
 
 [[package]]
@@ -1605,9 +1867,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
+checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
 
 [[package]]
 name = "unicode-segmentation"
@@ -1621,6 +1883,12 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
+[[package]]
+name = "unicode-xid"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc"
+
 [[package]]
 name = "usb_sys"
 version = "0.1.0"
@@ -1647,7 +1915,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.7",
 ]
 
 [[package]]
@@ -1712,6 +1980,7 @@ version = "0.1.0"
 dependencies = [
  "base",
  "bitflags",
+ "cfg-if",
  "cros_async",
  "data_model",
  "libc",
@@ -1737,6 +2006,12 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -1749,6 +2024,60 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote 1.0.21",
+ "syn 1.0.99",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
+dependencies = [
+ "quote 1.0.21",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
+dependencies = [
+ "proc-macro2",
+ "quote 1.0.21",
+ "syn 1.0.99",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
+
 [[package]]
 name = "which"
 version = "4.2.5"
@@ -1760,6 +2089,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "widestring"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983"
+
 [[package]]
 name = "win_util"
 version = "0.1.0"
@@ -1787,6 +2122,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -1816,7 +2160,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f757e7665f81f33ace9f89b0f0fc3a7c770e24ff4fa1475c6503bb35b4524893"
 dependencies = [
- "syn",
+ "syn 1.0.99",
  "windows_gen",
 ]
 
@@ -1825,8 +2169,22 @@ name = "wire_format_derive"
 version = "0.1.0"
 dependencies = [
  "proc-macro2",
- "quote",
- "syn",
+ "quote 1.0.21",
+ "syn 1.0.99",
+]
+
+[[package]]
+name = "wmi"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "757a458f9bfab0542c11feed99bd492cbe23add50515bd8eecf8c6973673d32d"
+dependencies = [
+ "chrono",
+ "log",
+ "serde",
+ "thiserror",
+ "widestring",
+ "winapi",
 ]
 
 [[package]]
@@ -1846,6 +2204,7 @@ dependencies = [
  "kernel_loader",
  "libc",
  "minijail",
+ "once_cell",
  "remain",
  "resources",
  "sync",
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 2e74fda9e2c1..375aaf873112 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -1,19 +1,28 @@
 { stdenv, lib, rustPlatform, fetchgit
-, minijail-tools, pkg-config, wayland-scanner
+, minijail-tools, pkg-config, protobuf, wayland-scanner
 , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols
 }:
 
-rustPlatform.buildRustPackage rec {
-  pname = "crosvm";
-  version = "103.3";
-
+let
   src = fetchgit {
     url = "https://chromium.googlesource.com/crosvm/crosvm";
-    rev = "e7db3a5cc78ca90ab06aadd5f08bb151090269b6";
-    sha256 = "0hyz0mg5fn6hi97awfpxfykgv68m935r037sdf85v3vcwjy5n5ki";
+    rev = "265aab613b1eb31598ea0826f04810d9f010a2c6";
+    sha256 = "OzbtPHs6BWK83RZ/6eCQHA61X6SY8FoBkaN70a37pvc=";
     fetchSubmodules = true;
   };
 
+  # use vendored virglrenderer
+  virglrenderer' = virglrenderer.overrideAttrs (oa: {
+    src = "${src}/third_party/virglrenderer";
+  });
+in
+
+rustPlatform.buildRustPackage rec {
+  pname = "crosvm";
+  version = "104.0";
+
+  inherit src;
+
   separateDebugInfo = true;
 
   patches = [
@@ -22,10 +31,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoLock.lockFile = ./Cargo.lock;
 
-  nativeBuildInputs = [ minijail-tools pkg-config wayland-scanner ];
+  nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ];
 
   buildInputs = [
-    libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
+    libcap libdrm libepoxy minijail virglrenderer' wayland wayland-protocols
   ];
 
   arch = stdenv.hostPlatform.parsed.cpu.name;

From 52539e410cf310b0517989d68a80caf90af486fb Mon Sep 17 00:00:00 2001
From: Mrinal Purohit <github@mrinalpurohit.in>
Date: Thu, 7 Jul 2022 00:28:42 +0530
Subject: [PATCH 020/149] google-cloud-sdk: 387.0.0 -> 397.0.0

---
 pkgs/tools/admin/google-cloud-sdk/data.nix    | 22 +++++++++----------
 .../admin/google-cloud-sdk/gcloud-path.patch  | 12 +++++-----
 pkgs/tools/admin/google-cloud-sdk/update.sh   |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix
index 9858ea1dd7d8..f4992b63d5d5 100644
--- a/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/data.nix
@@ -1,32 +1,32 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "387.0.0";
+  version = "397.0.0";
   googleCloudSdkPkgs = {
     x86_64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-x86_64.tar.gz";
-        sha256 = "1hsp575xg7caxhldxmqxsds99mr0gs2qxgk7x7mr9jnjdq6nqmdg";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86_64.tar.gz";
+        sha256 = "1b7ggqc43xyszb583paky4gvph4ncvvwpdy1037dj1ckrd53bg00";
       };
     x86_64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-darwin-x86_64.tar.gz";
-        sha256 = "0qyd6z5clnd0slhsn9hc1xiic5rbssrps1n97jq94mv90rjp94jx";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-x86_64.tar.gz";
+        sha256 = "0iiyga7b4axkprif5gyqnr8sjkv9nap5lvabgfx5845br7hzr5ps";
       };
     aarch64-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-arm.tar.gz";
-        sha256 = "0drxv1dzlnzmrs92j7a48iwvzfvdl9dl4hk688lj7cl51yndbyyz";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-arm.tar.gz";
+        sha256 = "102vw2f2q28c54hvn4hlp2da3zsib16z6hkz41079c1pmiybysi1";
       };
     aarch64-darwin =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-darwin-arm.tar.gz";
-        sha256 = "0244k34lwj29smyds8qs7qdrvwwnvwh0v6giifbwzhlb40nw4k72";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-arm.tar.gz";
+        sha256 = "0hp60fpmsvhn046sp0wb52xszkmin5v235khbxb82wr0vsgnqd7z";
       };
     i686-linux =
       {
-        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-x86.tar.gz";
-        sha256 = "0fb6qx1qjm9y013glinxdaf1x9ppwrb7szjx96maqb90zvq1jdcz";
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz";
+        sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26";
       };
   };
 }
diff --git a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch b/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
index 74c0754f3ceb..05b3ea3a8d16 100644
--- a/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
+++ b/pkgs/tools/admin/google-cloud-sdk/gcloud-path.patch
@@ -30,17 +30,15 @@ keep working.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
-index 4330988d6..37424b841 100644
+index 5975cb8f..b98e6721 100644
 --- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py
 +++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
-@@ -352,7 +352,7 @@ def _AuthProvider(name='gcp',
+@@ -396,7 +396,7 @@ def _AuthProvider(name='gcp',
        if sdk_bin_path is None:
          log.error(SDK_BIN_PATH_NOT_FOUND)
          raise Error(SDK_BIN_PATH_NOT_FOUND)
 -      cmd_path = os.path.join(sdk_bin_path, bin_name)
 +      cmd_path = bin_name
- 
-     cfg = {
-         # Command for gcloud credential helper
--- 
-2.21.0
+       try:
+         # Print warning if gke-gcloud-auth-plugin is not present or executable
+         _GetGkeGcloudPluginCommandAndPrintWarning()
diff --git a/pkgs/tools/admin/google-cloud-sdk/update.sh b/pkgs/tools/admin/google-cloud-sdk/update.sh
index 5b9321ff9eea..d58220dc10c0 100755
--- a/pkgs/tools/admin/google-cloud-sdk/update.sh
+++ b/pkgs/tools/admin/google-cloud-sdk/update.sh
@@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
 
 # Version of Google Cloud SDK from
 # https://cloud.google.com/sdk/docs/release-notes
-VERSION="387.0.0"
+VERSION="397.0.0"
 
 function genMainSrc() {
     local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"

From 497d1a5b7298b603424718b1db237e9bc082edac Mon Sep 17 00:00:00 2001
From: Benedikt Tissot <benedikt.tissot@googlemail.com>
Date: Mon, 15 Aug 2022 10:05:09 +0200
Subject: [PATCH 021/149] matrix-commander: 2.37.3 -> 3.5.0

---
 .../instant-messengers/matrix-commander/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 85c3dc86ea0f..64ef21a1bf81 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -11,19 +11,19 @@
 , aiofiles
 , notify2
 , dbus-python
-, xdg
+, pyxdg
 , python-olm
 }:
 
 buildPythonApplication rec {
   pname = "matrix-commander";
-  version = "2.37.3";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
     rev = "v${version}";
-    sha256 = "sha256-X5tCPR0EqY1dxViwh8/tEjJM2oo81L3H703pPzWzUv8=";
+    sha256 = "sha256-/hNTaajZTyeIcGILIXqUVbBvZ8AUNZKBDsZ4Gr5RL2o=";
   };
 
   format = "pyproject";
@@ -54,7 +54,7 @@ buildPythonApplication rec {
     aiofiles
     notify2
     dbus-python
-    xdg
+    pyxdg
     python-olm
   ];
 

From 3fe4330f180591b1c54c175bcf334a55ed8137ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 15 Aug 2022 21:20:59 +0000
Subject: [PATCH 022/149] doctl: 1.78.0 -> 1.79.0

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

diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix
index 9d66b6359652..04014db912cc 100644
--- a/pkgs/development/tools/doctl/default.nix
+++ b/pkgs/development/tools/doctl/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.78.0";
+  version = "1.79.0";
 
   vendorSha256 = null;
 
@@ -31,7 +31,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     rev = "v${version}";
-    sha256 = "sha256-mbUGfAqKC8g2K9pPNnXrpa7DmJUeGXs0KFaavDRMXdc=";
+    sha256 = "sha256-0tl79nVvnY2KECrfgEXQ8tOHnwEX+34uiJ/jshK5oFA=";
   };
 
   meta = with lib; {

From 73ee1a3b1cfe7b3cf7bc410c77f767191ed20aa8 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Mon, 15 Aug 2022 14:14:18 +0300
Subject: [PATCH 023/149] python3Packages.backports-cached-property: init at
 1.0.2

---
 .../backports-cached-property/default.nix     | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/backports-cached-property/default.nix

diff --git a/pkgs/development/python-modules/backports-cached-property/default.nix b/pkgs/development/python-modules/backports-cached-property/default.nix
new file mode 100644
index 000000000000..7bb8c4e81225
--- /dev/null
+++ b/pkgs/development/python-modules/backports-cached-property/default.nix
@@ -0,0 +1,46 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder
+, setuptools-scm, wheel
+, pytestCheckHook, pytest-mock, pytest-sugar
+}:
+
+buildPythonPackage rec {
+  pname = "backports-cached-property";
+  version = "1.0.2";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "penguinolog";
+    repo = "backports.cached_property";
+    rev = version;
+    sha256 = "sha256-rdgKbVQaELilPrN4ve8RbbaLiT14Xex0esy5vUX2ZBc=";
+  };
+
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = [
+    wheel
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-mock
+    pytest-sugar
+  ];
+
+  pythonImportsCheck = [
+    "backports.cached_property"
+  ];
+
+  meta = with lib; {
+    description = "Python 3.8 functools.cached_property backport to python 3.6";
+    homepage = "https://github.com/penguinolog/backports.cached_property";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ izorkin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index baa5a67a662e..b682c4786380 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1181,6 +1181,8 @@ in {
 
   backoff = callPackage ../development/python-modules/backoff { };
 
+  backports-cached-property = callPackage ../development/python-modules/backports-cached-property { };
+
   backports_abc = callPackage ../development/python-modules/backports_abc { };
 
   backports_csv = callPackage ../development/python-modules/backports_csv { };

From dd9fe977708d9b6c7b5e21e39aabeb8ee5fa5de5 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 9 Aug 2022 22:30:05 +0300
Subject: [PATCH 024/149] python3Packages.strawberry-graphql: init at 0.125.0

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

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
new file mode 100644
index 000000000000..3c84d30ab371
--- /dev/null
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -0,0 +1,39 @@
+{ lib, buildPythonPackage, fetchFromGitHub, poetry, pythonOlder
+, click, backports-cached-property, graphql-core, pygments, python-dateutil, python-multipart, typing-extensions
+, aiohttp, asgiref, chalice, django, fastapi, flask, pydantic, sanic, starlette, uvicorn
+}:
+
+buildPythonPackage rec {
+  pname = "strawberry-graphql";
+  version = "0.125.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "strawberry-graphql";
+    repo = "strawberry";
+    rev = version;
+    sha256 = "sha256-8ERmG10qNiYg9Zr8oUZk/Uz68sCE+oWrqmJ5kUMqbRo=";
+  };
+
+  nativeBuildInputs = [
+    poetry
+  ];
+
+  propagatedBuildInputs = [
+    click backports-cached-property graphql-core pygments python-dateutil python-multipart typing-extensions
+    aiohttp asgiref chalice django fastapi flask pydantic sanic starlette uvicorn
+  ];
+
+  pythonImportsCheck = [
+    "strawberry"
+  ];
+
+  meta = with lib; {
+    description = "A GraphQL library for Python that leverages type annotations";
+    homepage = "https://strawberry.rocks";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ izorkin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b682c4786380..5690e412683d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10399,6 +10399,8 @@ in {
 
   stravalib = callPackage ../development/python-modules/stravalib { };
 
+  strawberry-graphql = callPackage ../development/python-modules/strawberry-graphql { };
+
   streamdeck = callPackage ../development/python-modules/streamdeck { };
 
   streaming-form-data = callPackage ../development/python-modules/streaming-form-data { };

From 55a29891d4db257138d7eeefb16c450474b8f2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 16 Aug 2022 15:10:08 +0200
Subject: [PATCH 025/149] knot-resolver: 5.5.1 -> 5.5.2

https://gitlab.nic.cz/knot/knot-resolver/-/tags/v5.5.2
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 3b2faf7eaa45..61f105a62bd4 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -17,11 +17,11 @@ lua = luajitPackages;
 
 unwrapped = stdenv.mkDerivation rec {
   pname = "knot-resolver";
-  version = "5.5.1";
+  version = "5.5.2";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz";
-    sha256 = "9bad1edfd6631446da2d2331bd869887d7fe502f6eeaf62b2e43e2c113f02b6d";
+    sha256 = "3f78aa69c3f28edc42b5900b9788fba39498d8bffda7fb9c772bb470865780cb";
   };
 
   outputs = [ "out" "dev" ];

From d5330dddc692b5313acaa8bbe676b86fd60117fc Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 16 Aug 2022 21:53:50 +0800
Subject: [PATCH 026/149] libsForQt5.messagelib: add patch for compatibility
 with cmake 3.24

---
 pkgs/applications/kde/messagelib.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
index 3273716ca673..193b9cadf53c 100644
--- a/pkgs/applications/kde/messagelib.nix
+++ b/pkgs/applications/kde/messagelib.nix
@@ -1,12 +1,11 @@
 {
   mkDerivation, lib, kdepimTeam,
-  cmake_3_23,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
   grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
   kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
   kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
-  pimcommon, qca-qt5, qtwebengine, syntax-highlighting
+  pimcommon, qca-qt5, qtwebengine, syntax-highlighting, fetchpatch
 }:
 
 mkDerivation {
@@ -15,7 +14,18 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = kdepimTeam;
   };
-  nativeBuildInputs = [ (extra-cmake-modules.override { cmake = cmake_3_23; }) kdoctools ];
+  patches = [
+    # fix compatibility with cmake 3.24
+    (fetchpatch {
+      url = "https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3.patch";
+      hash = "sha256-H0ayU81HxX5moHOQ3hDW7tg824oqK1p9atrBhuvZ8K8=";
+    })
+    (fetchpatch {
+      url = "https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c2.patch";
+      hash = "sha256-tBFWCfttjDjyQyWnKdhVfLY6QsixzqqYuvD77GVH080=";
+    })
+  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
     kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap

From ef640cb34644f6ccb97bc58ca71c9a4af10fb53e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 16 Aug 2022 21:54:52 +0800
Subject: [PATCH 027/149] Revert "cmake_3_23: bring this version back
 (temporarily, I hope)"

This reverts commit 8334328f11ef140f5915cf974e4608649525d8cf.
---
 .../tools/build-managers/cmake/3_23.nix       | 168 ------------------
 pkgs/top-level/all-packages.nix               |   5 -
 2 files changed, 173 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/cmake/3_23.nix

diff --git a/pkgs/development/tools/build-managers/cmake/3_23.nix b/pkgs/development/tools/build-managers/cmake/3_23.nix
deleted file mode 100644
index 863d82d8aaed..000000000000
--- a/pkgs/development/tools/build-managers/cmake/3_23.nix
+++ /dev/null
@@ -1,168 +0,0 @@
-{ lib
-, stdenv
-, buildPackages
-, bzip2
-, curlMinimal
-, expat
-, fetchurl
-, libarchive
-, libuv
-, ncurses
-, openssl
-, pkg-config
-, qtbase
-, rhash
-, sphinx
-, texinfo
-, wrapQtAppsHook
-, xz
-, zlib
-, SystemConfiguration
-, ps ? null
-, isBootstrap ? false
-, useOpenSSL ? !isBootstrap
-, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
-, uiToolkits ? [] # can contain "ncurses" and/or "qt5"
-, buildDocs ? !(isBootstrap || (uiToolkits == []))
-}:
-
-let
-  cursesUI = lib.elem "ncurses" uiToolkits;
-  qt5UI = lib.elem "qt5" uiToolkits;
-in
-# Accepts only "ncurses" and "qt5" as possible uiToolkits
-assert lib.subtractLists [ "ncurses" "qt5" ] uiToolkits == [];
-stdenv.mkDerivation rec {
-  pname = "cmake"
-    + lib.optionalString isBootstrap "-boot"
-    + lib.optionalString cursesUI "-cursesUI"
-    + lib.optionalString qt5UI "-qt5UI";
-  version = "3.23.3";
-
-  src = fetchurl {
-    url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
-    sha256 = "sha256-Bv768K2UmJcktW9zMJPCYj9vhDVuW+uVWVf5zj7iiAk=";
-  };
-
-  patches = [
-    # Don't search in non-Nix locations such as /usr, but do search in our libc.
-    ./001-search-path.diff
-    # Don't depend on frameworks.
-    ./002-application-services.diff
-    # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d
-    ./003-libuv-application-services.diff
-  ]
-  ++ lib.optional stdenv.isCygwin ./004-cygwin.diff
-  # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51
-  ++ lib.optional (stdenv.isDarwin && isBootstrap) ./005-remove-systemconfiguration-dep.diff
-  # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
-  ++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff;
-
-  outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ];
-  setOutputFlags = false;
-
-  setupHook = ./setup-hook.sh;
-
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-
-  nativeBuildInputs = [
-    pkg-config
-    setupHook
-  ]
-  ++ lib.optionals buildDocs [ texinfo ]
-  ++ lib.optionals qt5UI [ wrapQtAppsHook ];
-
-  buildInputs = lib.optionals useSharedLibraries [
-    bzip2
-    curlMinimal
-    expat
-    libarchive
-    xz
-    zlib
-    libuv
-    rhash
-  ]
-  ++ lib.optional useOpenSSL openssl
-  ++ lib.optional cursesUI ncurses
-  ++ lib.optional qt5UI qtbase
-  ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration;
-
-  propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
-
-  preConfigure = ''
-    fixCmakeFiles .
-    substituteInPlace Modules/Platform/UnixPaths.cmake \
-      --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \
-      --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \
-      --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc}
-    # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake
-    configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags"
-  '';
-
-  configureFlags = [
-    "CXXFLAGS=-Wno-elaborated-enum-base"
-    "--docdir=share/doc/${pname}${version}"
-  ] ++ (if useSharedLibraries
-        then [ "--no-system-jsoncpp" "--system-libs" ]
-        else [ "--no-system-libs" ]) # FIXME: cleanup
-  ++ lib.optional qt5UI "--qt-gui"
-  ++ lib.optionals buildDocs [
-    "--sphinx-build=${sphinx}/bin/sphinx-build"
-    "--sphinx-info"
-    "--sphinx-man"
-  ]
-  # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
-  ++ lib.optionals stdenv.hostPlatform.is32bit [
-    "CFLAGS=-D_FILE_OFFSET_BITS=64"
-    "CXXFLAGS=-D_FILE_OFFSET_BITS=64"
-  ]
-  ++ [
-    "--"
-    # We should set the proper `CMAKE_SYSTEM_NAME`.
-    # http://www.cmake.org/Wiki/CMake_Cross_Compiling
-    #
-    # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
-    # strip. Otherwise they are taken to be relative to the source root of the
-    # package being built.
-    "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
-    "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
-    "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
-    "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
-    "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
-
-    "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}"
-    # Avoid depending on frameworks.
-    "-DBUILD_CursesDialog=${if cursesUI then "ON" else "OFF"}"
-  ];
-
-  # make install attempts to use the just-built cmake
-  preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-    sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile
-  '';
-
-  dontUseCmakeConfigure = true;
-  enableParallelBuilding = true;
-
-  # This isn't an autoconf configure script; triples are passed via
-  # CMAKE_SYSTEM_NAME, etc.
-  configurePlatforms = [ ];
-
-  doCheck = false; # fails
-
-  meta = with lib; {
-    homepage = "https://cmake.org/";
-    description = "Cross-platform, open-source build system generator";
-    longDescription = ''
-      CMake is an open-source, cross-platform family of tools designed to build,
-      test and package software. CMake is used to control the software
-      compilation process using simple platform and compiler independent
-      configuration files, and generate native makefiles and workspaces that can
-      be used in the compiler environment of your choice.
-    '';
-    changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ ttuegel lnl7 AndersonTorres ];
-    platforms = platforms.all;
-    broken = (qt5UI && stdenv.isDarwin);
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95fdb4978bc2..25fba3867d50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15783,11 +15783,6 @@ with pkgs;
     inherit (libsForQt5) qtbase wrapQtAppsHook;
   };
 
-  cmake_3_23 = callPackage ../development/tools/build-managers/cmake/3_23.nix {
-    inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
-    inherit (libsForQt5) qtbase wrapQtAppsHook;
-  };
-
   cmakeMinimal = callPackage ../development/tools/build-managers/cmake {
     isBootstrap = true;
     qtbase = null;

From d23a9eea6f9e74c59b4024c15b262f4fb650586a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 16 Aug 2022 15:06:43 -0400
Subject: [PATCH 028/149] geant4: move clhep to propagatedBuildInputs

The include/Geant4/G4ThreeVector.hh includes CLHEP/Vector/ThreeVector.h
---
 pkgs/development/libraries/physics/geant4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 1bed1362bac6..3315e5a535ae 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -88,11 +88,11 @@ stdenv.mkDerivation rec {
   ];
   dontWrapQtApps = true; # no binaries
 
-  buildInputs = [ clhep libGLU xlibsWrapper libXmu ]
+  buildInputs = [ libGLU xlibsWrapper libXmu ]
     ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
     ++ lib.optionals enablePython [ boost_python python3 ];
 
-  propagatedBuildInputs = [ expat xercesc zlib libGL ]
+  propagatedBuildInputs = [ clhep expat xercesc zlib libGL ]
     ++ lib.optionals enableXM [ motif ]
     ++ lib.optionals enableQt [ qtbase ];
 

From 56a79b5653f6dfc14bb14dd8e65c06da9061ff46 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Tue, 16 Aug 2022 21:20:46 +0200
Subject: [PATCH 029/149] php81.packages.composer: 2.3.10 -> 2.4.0

---
 pkgs/development/php-packages/composer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index 6d4d5ddd127b..c1fb77a20598 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -1,14 +1,14 @@
 { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }:
 let
   pname = "composer";
-  version = "2.3.10";
+  version = "2.4.0";
 in
 mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "https://getcomposer.org/download/${version}/composer.phar";
-    sha256 = "2AgnLyhPqOD4tHBwPhQ4rI82IDC7ydEuKVMCd9dnr/A=";
+    sha256 = "HNx090llkI0OmNAP7so3wjuG2lEXCjoRoVONif9E1N0=";
   };
 
   dontUnpack = true;

From 1d7fa64523f882c2017e930cefae4b6fab4ed083 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Aug 2022 22:36:20 +0000
Subject: [PATCH 030/149] skypeforlinux: 8.87.0.403 -> 8.87.0.406

---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 6048fb079edb..ec33f99809ef 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.87.0.403";
+  version = "8.87.0.406";
 
   rpath = lib.makeLibraryPath [
     alsa-lib
@@ -68,7 +68,7 @@ let
           "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
           "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
         ];
-        sha256 = "sha256-ibugr15eRQ2gbvX8wmk2lFioLPST9ljAuWcJHCoi9l8=";
+        sha256 = "sha256-lWnQIdMmfz90h3tOWkQv0vo3HnRi3z6W27vK28+Ksjo=";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";

From cec14458becf95cd3269b98b5dd5ff311c1ecc34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Aug 2022 22:43:01 +0000
Subject: [PATCH 031/149] swagger-codegen3: 3.0.34 -> 3.0.35

---
 pkgs/tools/networking/swagger-codegen3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix
index d1443ddd20a8..01c82c1fff54 100644
--- a/pkgs/tools/networking/swagger-codegen3/default.nix
+++ b/pkgs/tools/networking/swagger-codegen3/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, jre, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.34";
+  version = "3.0.35";
   pname = "swagger-codegen";
 
   jarfilename = "${pname}-cli-${version}.jar";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
-    sha256 = "sha256-C6uSqb8o6hcK7r7NxlHckMBcdMf2APK4FYRpQFMaE9Y=";
+    sha256 = "sha256-GTqB2wyDguzxrVgnkGiQGgkDVt+caaoyRvUdpeItPcA=";
   };
 
   dontUnpack = true;

From 1af6f5a2220b2d1a88a1a8c8bf7e9972b3315c89 Mon Sep 17 00:00:00 2001
From: Grace Dinh <git@contact.dinh.ai>
Date: Tue, 16 Aug 2022 15:59:41 -0700
Subject: [PATCH 032/149] hmat-oss: init at 1.7.1

---
 .../libraries/hmat-oss/default.nix            | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/hmat-oss/default.nix

diff --git a/pkgs/development/libraries/hmat-oss/default.nix b/pkgs/development/libraries/hmat-oss/default.nix
new file mode 100644
index 000000000000..3455cf250ce6
--- /dev/null
+++ b/pkgs/development/libraries/hmat-oss/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, blas
+, lapack
+}:
+
+
+stdenv.mkDerivation rec {
+  pname = "hmat-oss";
+  version = "1.7.1";
+
+  src = fetchFromGitHub {
+    owner = "jeromerobert";
+    repo = "hmat-oss";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-Xc8AbeyEtM6R5I4HdgF4XR5/b8ZYBOv34kY1xrYk/Jw=";
+  };
+
+  cmakeFlags = [
+    "-DHMAT_GIT_VERSION=OFF"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ blas lapack ];
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    description = "A hierarchical matrix C/C++ library";
+    homepage = "https://github.com/jeromerobert/hmat-oss";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ gdinh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd7a49ef54fe..8caafd662f1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18479,6 +18479,8 @@ with pkgs;
     autoreconfHook = buildPackages.autoreconfHook269;
   };
 
+  hmat-oss = callPackage ../development/libraries/hmat-oss { };
+
   hound = callPackage ../development/tools/misc/hound { };
 
   hpx = callPackage ../development/libraries/hpx {

From f2c42a583b19183be047b28482adf1403a86f108 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Aug 2022 23:51:44 +0000
Subject: [PATCH 033/149] swayr: 0.20.0 -> 0.20.1

---
 pkgs/tools/wayland/swayr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix
index f7daa1116edb..6a391a274451 100644
--- a/pkgs/tools/wayland/swayr/default.nix
+++ b/pkgs/tools/wayland/swayr/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "swayr";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "swayr";
     rev = "swayr-${version}";
-    sha256 = "sha256-Od23QF4vasr1gvtahENLPkz4wbx1WFaN1mauB4iDftk=";
+    sha256 = "sha256-kHFo5FJMzPRlnYg5iER1ULThhfJ0pY5apJNXPyHrMzE=";
   };
 
-  cargoSha256 = "sha256-ZgFTmeCrFpdGv9vkFKG7VY/tPeOIVKWCMk0JyrtJ22s=";
+  cargoSha256 = "sha256-Tm+LSL13COfKyH2021oiKme2yO9jurQ/F+U2y9klz18=";
 
   patches = [
     ./icon-paths.patch

From 1cd743eb8ae80e746f101dddd5059fda7cfc8ff8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 01:42:35 +0000
Subject: [PATCH 034/149] zotero: 6.0.10 -> 6.0.12

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

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 32f59a718f00..72e84487b28a 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -41,12 +41,12 @@
 
 stdenv.mkDerivation rec {
   pname = "zotero";
-  version = "6.0.10";
+  version = "6.0.12";
 
   src = fetchurl {
     url =
       "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    sha256 = "sha256-+RFTFOZVf0w9HBlk05pEsssiFlEaPJ9XTq29QpuIil8=";
+    sha256 = "sha256-RIPFn0fLk2CbOoiZ4a5ungnbvfRWFQQUypCYVvVIQms=";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 3c5c3ce1aad4e3b7ec6c349718262e4d91b3af33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 01:45:54 +0000
Subject: [PATCH 035/149] xcp: 0.9.0 -> 0.9.1

---
 pkgs/tools/misc/xcp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix
index 4b649aecb698..c427a802539e 100644
--- a/pkgs/tools/misc/xcp/default.nix
+++ b/pkgs/tools/misc/xcp/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xcp";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "tarka";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Kwt1qLuP63bIn0VY3oFEcbKh1GGBdObfOmtPV4DMQUU=";
+    sha256 = "sha256-fzwlDYjNCWAnMrRSGvR+OwL+TEs4eRsjqF7uPjui3T0=";
   };
 
   # no such file or directory errors
   doCheck = false;
 
-  cargoSha256 = "sha256-wFOXRQSOfmGB6Zmkqn7KoK+vyHeFKyGNx7Zf2zzPcE4=";
+  cargoSha256 = "sha256-c3jUG/ysTzV/67HmGgFSM0KWKlQKo6iqOCQT4E9QA9k=";
 
   meta = with lib; {
     description = "An extended cp(1)";

From fb1a44c7804975fcd1020a59f4f3c2f343c9f64c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 04:42:04 +0000
Subject: [PATCH 036/149] batsignal: 1.5.1 -> 1.6.0

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

diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix
index bacb622e2c8b..7b98b429c82e 100644
--- a/pkgs/applications/misc/batsignal/default.nix
+++ b/pkgs/applications/misc/batsignal/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "batsignal";
-  version = "1.5.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "electrickite";
     repo = "batsignal";
     rev = version;
-    sha256 = "sha256-lXxHvcUlIl5yb4QBJ/poLdTbwBMBlDYmTz4tSdNtCyY=";
+    sha256 = "sha256-uDfC/PqT1Bb8np0l2DDIZUoNP9QpjxZH5v1hK2k1Miw=";
   };
 
   buildInputs = [ libnotify glib ];

From 829d19938cf6a3e5f05d53941dad25e40fc40320 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 05:32:38 +0000
Subject: [PATCH 037/149] cloud-nuke: 0.16.4 -> 0.17.0

---
 pkgs/development/tools/cloud-nuke/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix
index 230dd7b47b3d..6d28a2056c94 100644
--- a/pkgs/development/tools/cloud-nuke/default.nix
+++ b/pkgs/development/tools/cloud-nuke/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.16.4";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-TiXP7ftzQ3yWWfTDqfO33Fuk0XlgVwgt1+tZqSr6mJQ=";
+    sha256 = "sha256-8rp0bfgqPl48RHIPSp3rpDAmPQ0eZnvAbO66jbp6TCk=";
   };
 
-  vendorSha256 = "sha256-YsnqasRywNtJLq0noUpil9k2AILXJz//+aYoy/tlRIo=";
+  vendorSha256 = "sha256-4Hm8zqeRNhIX2aN7JdEX1GruqbEafpBjY1r/vijPs8M=";
 
   ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ];
 

From e95f913cb1dec92df15180eef7cb34d5cc67d956 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 05:58:03 +0000
Subject: [PATCH 038/149] dolt: 0.40.25 -> 0.40.26

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

diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix
index d59f021678aa..06b1cea4f010 100644
--- a/pkgs/servers/sql/dolt/default.nix
+++ b/pkgs/servers/sql/dolt/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "dolt";
-  version = "0.40.25";
+  version = "0.40.26";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     rev = "v${version}";
-    sha256 = "sha256-MPfi6rfqlbrnl3CE0YKtIAUagqCB6f3cJtZ7mGUQ5Ng=";
+    sha256 = "sha256-onv7IGB8Tq1R0KDQkZQnzY5EWAk2hn+7LnbjZPicUUE=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ];
-  vendorSha256 = "sha256-Iy01voXaCzbBEbJRxcLDzr5BKj4PHfcib3KH21VzFS4=";
+  vendorSha256 = "sha256-5MWEc3gWmBHWbasdGvgYPd4eelH+FwkoR9SAB/gi6nY=";
 
   doCheck = false;
 

From 283d90b11097c95f3694258375ed9206f46f8a34 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Fri, 12 Aug 2022 12:20:25 -0700
Subject: [PATCH 039/149] ryujinx: Add dependencies for the Avalonia UI

---
 .../emulators/ryujinx/default.nix             | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix
index 8d77e00e8201..bda8f40dfcc0 100644
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@@ -14,6 +14,14 @@
 , gdk-pixbuf
 , wrapGAppsHook
 , vulkan-loader
+, libICE
+, libSM
+, libXi
+, libXcursor
+, libXext
+, libXrandr
+, fontconfig
+, glew
 }:
 
 buildDotnetModule rec {
@@ -34,7 +42,7 @@ buildDotnetModule rec {
 
   # TODO: Add the headless frontend. Currently errors on the following:
   # System.Exception: SDL2 initlaization failed with error "No available video device"
-  executables = [ "Ryujinx" ];
+  executables = [ "Ryujinx" "Ryujinx.Ava" ];
 
   nativeBuildInputs = [
     wrapGAppsHook
@@ -56,6 +64,16 @@ buildDotnetModule rec {
     pulseaudio
     vulkan-loader
     ffmpeg
+
+    # Avalonia UI
+    libICE
+    libSM
+    libXi
+    libXcursor
+    libXext
+    libXrandr
+    fontconfig
+    glew
   ];
 
   patches = [

From 26b39753a5ec6fd694ce7b16b516c1db0f866bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 17 Aug 2022 11:00:42 +0200
Subject: [PATCH 040/149] flyctl: 0.0.372 -> 0.0.374

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

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 5ecb5c5b9469..f789769ab318 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.372";
+  version = "0.0.374";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "sha256-KsSaBzAjiexyhUmYEFEHhWuRROt553Lhkm1idlT8n5s=";
+    sha256 = "sha256-rudTGh4l0wroag0yp2YU8h5NTq+noC3bjbisyP47ktI=";
   };
 
   vendorSha256 = "sha256-E6QeWu88MXMMfZAM7vMIGXpJQuduX6GTj3tXvlE9hFo=";

From 6fcd1e635650b848fc02d6e19ca0163355ec524e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 09:04:27 +0000
Subject: [PATCH 041/149] dagger: 0.2.29 -> 0.2.30

---
 .../tools/continuous-integration/dagger/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix
index bd05a0ec35c1..ea103f9fc28d 100644
--- a/pkgs/development/tools/continuous-integration/dagger/default.nix
+++ b/pkgs/development/tools/continuous-integration/dagger/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dagger";
-  version = "0.2.29";
+  version = "0.2.30";
 
   src = fetchFromGitHub {
     owner = "dagger";
     repo = "dagger";
     rev = "v${version}";
-    sha256 = "sha256-IfsBrsArP5PoznepNPr7ARVJWuDnFJaiSDMm8NjaLVY=";
+    sha256 = "sha256-D/BamTjhAopoiQoEa9rqk25sGU7ZTTkze/tIKICTx5o=";
   };
 
-  vendorSha256 = "sha256-e++fNcgdQUPnbKVx7ncuf7NGc8eVdli5/rB7Jw+D/Ds=";
+  vendorSha256 = "sha256-IOLZ15Mr+IGWIE4nvMOyjbtYBYOhDMXFYFbOp8beD5w=";
 
   subPackages = [
     "cmd/dagger"

From 52edc85c1f45de5acc4b7c8b900d8b31ce95ea5c Mon Sep 17 00:00:00 2001
From: Colin Arnott <colin@urandom.co.uk>
Date: Fri, 5 Aug 2022 05:26:11 +0000
Subject: [PATCH 042/149] maintainers: add urandom

---
 maintainers/maintainer-list.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fdbeccb45b67..f5fc92c6f61c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13498,6 +13498,15 @@
     githubId = 619015;
     name = "Svintsov Dmitry";
   };
+  urandom = {
+    email = "colin@urandom.co.uk";
+    github = "arnottcr";
+    githubId = 2526260;
+    keys = [{
+      fingerprint = "04A3 A2C6 0042 784A AEA7  D051 0447 A663 F7F3 E236";
+    }];
+    name = "Colin Arnott";
+  };
   urbas = {
     email = "matej.urbas@gmail.com";
     github = "urbas";

From 89361f7b9986e2d5f5db1a902290bd23f2dc80db Mon Sep 17 00:00:00 2001
From: Colin Arnott <colin@urandom.co.uk>
Date: Mon, 1 Aug 2022 12:54:33 +0000
Subject: [PATCH 043/149] gotags: reinit at 1.4.1

This change reverts #176044 and #178000, as well as updating the version
to the latest stable release. Unfortunately, despite the lack of updates
to gotags, it is still depended upon by vim-go, thus we must keep it
around until they (and other consumers) have removed it from the
dependency trees.

This change also adds myself as a maintainer, since I would not wish the
burden of this package's maintanence on anybody else.
---
 .../editors/vim/plugins/overrides.nix         |  3 ++-
 pkgs/development/tools/gotags/default.nix     | 22 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 -
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/gotags/default.nix

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index b2477665ec90..8f805d1254ee 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -103,6 +103,7 @@
 , golint
 , gomodifytags
 , gopls
+, gotags
 , gotools
 , iferr
 , impl
@@ -1045,7 +1046,7 @@ self: super: {
         gomodifytags
         gopls
         # gorename
-        # gotags
+        gotags
         gotools
         # guru
         iferr
diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix
new file mode 100644
index 000000000000..c4c0b7cbb06f
--- /dev/null
+++ b/pkgs/development/tools/gotags/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  pname = "gotags";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "jstemmer";
+    repo = pname;
+    rev = "4c0c4330071a994fbdfdff68f412d768fbcca313";
+    sha256 = "sha256-cHTgt+zW6S6NDWBE6NxSXNPdn84CLD8WmqBe+uXN8sA=";
+  };
+
+  goPackagePath = "github.com/jstemmer/gotags";
+
+  meta = with lib; {
+    description = "ctags-compatible tag generator for Go";
+    homepage = "https://github.com/jstemmer/gotags";
+    license = licenses.mit;
+    maintainers = with maintainers; [ urandom ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3d1eb0c2035a..ca228b77f493 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -535,7 +535,6 @@ mapAliases ({
   google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   gosca = throw "gosca has been dropped due to the lack of maintanence from upstream since 2018"; # Added 2022-06-30
-  gotags = throw "gotags has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
   google-play-music-desktop-player = throw "GPMDP shows a black screen, upstream homepage is dead, use 'ytmdesktop' instead"; # Added 2022-06-16
   go-langserver = throw "go-langserver has been replaced by gopls"; # Added 2022-06-30
   go-mk = throw "go-mk has been dropped due to the lack of maintanence from upstream since 2015"; # Added 2022-06-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc770ddbc03d..92977582c7f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24286,6 +24286,8 @@ with pkgs;
 
   gofumpt = callPackage ../development/tools/gofumpt { };
 
+  gotags = callPackage ../development/tools/gotags { };
+
   go-task = callPackage ../development/tools/go-task { };
 
   golint = callPackage ../development/tools/golint { };

From a9d5080bd43f56a77799cfa3a5b56d3dc5018b7f Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Tue, 16 Aug 2022 14:49:19 +0200
Subject: [PATCH 044/149] u-boot: 22.01 -> 22.07

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

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index acb9675213d2..7dd88a5b3119 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -20,10 +20,10 @@
 }:
 
 let
-  defaultVersion = "2022.01";
+  defaultVersion = "2022.07";
   defaultSrc = fetchurl {
     url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
-    hash = "sha256-gbRUMifbIowD+KG/XdvIE7C7j2VVzkYGTvchpvxoBBM=";
+    hash = "sha256-krCOtJwk2hTBrb9wpxro83zFPutCMOhZrYtnM9E9z14=";
   };
   buildUBoot = lib.makeOverridable ({
     version ? null

From 2c30675e9d972aea3f3d5fdc079388b36708865c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 11:24:51 +0000
Subject: [PATCH 045/149] hcloud: 1.30.2 -> 1.30.3

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

diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix
index 7b764fa79c74..a1a555f274c4 100644
--- a/pkgs/development/tools/hcloud/default.nix
+++ b/pkgs/development/tools/hcloud/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.30.2";
+  version = "1.30.3";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-1ay0cW1zBCfaLIWvJGW7A/OeDc4l7OldnQHvrGeqXjE=";
+    sha256 = "sha256-iF30gh14v2OHwT2W7gb4DaZu1h9RYJjw6rkHaPZp9NU=";
   };
 
   vendorSha256 = "sha256-DoCiyaEPh+QyKgC3PJ5oivJTlcKzscaphXET9et8T1g=";

From 807b54680aa860ed8f4263649d3b9ce558e6217e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 11:32:28 +0000
Subject: [PATCH 046/149] intel-cmt-cat: 4.4.0 -> 4.4.1

---
 pkgs/os-specific/linux/intel-cmt-cat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/os-specific/linux/intel-cmt-cat/default.nix
index 669f79fab49b..dd96e518300e 100644
--- a/pkgs/os-specific/linux/intel-cmt-cat/default.nix
+++ b/pkgs/os-specific/linux/intel-cmt-cat/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "4.4.0";
+  version = "4.4.1";
   pname = "intel-cmt-cat";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-cmt-cat";
     rev = "v${version}";
-    sha256 = "sha256-THP0ie9Ta0iNcAJYCRXMajqYBIFuT67kGMDakL4vIZc=";
+    sha256 = "sha256-6v9MRIW9Wqojia6GZNM75AvoYJGJ9C/k+ShwQKOjiL8=";
   };
 
   enableParallelBuilding = true;

From 1cbb508b8ba5b9248c292b5ada574711f4d80a4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 11:36:18 +0000
Subject: [PATCH 047/149] intel-compute-runtime: 22.31.23852 -> 22.32.23937

---
 pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
index 0001493d3b39..5c38e05fbfe4 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "22.31.23852";
+  version = "22.32.23937";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     rev = version;
-    sha256 = "sha256-YkuYW/RRRs3EYMcx2BOsEpyW3O3XzDltmIaBoqnZfhw=";
+    sha256 = "sha256-W+0EbrbF+jPtsf9QCMmSEX7HFDlfiRtD/kjeMJVqCoY=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From deef8b3b31d98de605c4bcc6ee90135eb1be34b5 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 17 Aug 2022 13:34:31 +0200
Subject: [PATCH 048/149] python310Packages.fipy: 3.4.2.1 -> 3.4.3

---
 .../python-modules/fipy/default.nix           |  25 +--
 .../python-modules/fipy/gmsh.patch            | 182 ------------------
 2 files changed, 10 insertions(+), 197 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fipy/gmsh.patch

diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix
index 57835019d5de..7e08fa87fd58 100644
--- a/pkgs/development/python-modules/fipy/default.nix
+++ b/pkgs/development/python-modules/fipy/default.nix
@@ -3,27 +3,27 @@
 , numpy
 , scipy
 , pyamg
-, pysparse
 , future
 , matplotlib
 , tkinter
 , mpi4py
 , scikit-fmm
-, isPy27
 , gmsh
 , python
 , stdenv
 , openssh
-, fetchurl
+, fetchFromGitHub
 }:
 
 buildPythonPackage rec {
   pname = "fipy";
-  version = "3.4.2.1";
+  version = "3.4.3";
 
-  src = fetchurl {
-    url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz";
-    sha256 = "0v5yk9b4hksy3176w4vm4gagb9kxqgv75zcyswlqvl371qwy1grk";
+  src = fetchFromGitHub {
+    owner = "usnistgov";
+    repo = "fipy";
+    rev = version;
+    sha256 = "sha256-oTg/5fGXqknWBh1ShdAOdOwX7lVDieIoM5aALcOWFqY=";
   };
 
   propagatedBuildInputs = [
@@ -36,14 +36,7 @@ buildPythonPackage rec {
     future
     scikit-fmm
     openssh
-  ] ++ lib.optionals isPy27 [ pysparse ]
-  ++ lib.optionals (!stdenv.isDarwin) [ gmsh ];
-
-  # Reading version string from Gmsh is broken in latest release of FiPy
-  # This issue is repaired on master branch of FiPy
-  # Fixed with: https://github.com/usnistgov/fipy/pull/848/files
-  # Remove patch with next release.
-  patches = [ ./gmsh.patch ];
+  ] ++ lib.optionals (!stdenv.isDarwin) [ gmsh ];
 
   checkInputs = lib.optionals (!stdenv.isDarwin) [ gmsh ];
 
@@ -52,6 +45,8 @@ buildPythonPackage rec {
     ${python.interpreter} setup.py test --modules
   '';
 
+  pythonImportsCheck = [ "fipy" ];
+
   meta = with lib; {
     homepage = "https://www.ctcms.nist.gov/fipy/";
     description = "A Finite Volume PDE Solver Using Python";
diff --git a/pkgs/development/python-modules/fipy/gmsh.patch b/pkgs/development/python-modules/fipy/gmsh.patch
deleted file mode 100644
index 7e7b687ac8c6..000000000000
--- a/pkgs/development/python-modules/fipy/gmsh.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff --git a/fipy/meshes/gmshMesh.py b/fipy/meshes/gmshMesh.py
-index fc3ff6c8..d529d532 100755
---- a/fipy/meshes/gmshMesh.py
-+++ b/fipy/meshes/gmshMesh.py
-@@ -13,11 +13,11 @@ import sys
- import tempfile
- from textwrap import dedent
- import warnings
--from distutils.version import StrictVersion
- 
- from fipy.tools import numerix as nx
- from fipy.tools import parallelComm
- from fipy.tools import serialComm
-+from fipy.tools.version import Version, parse_version
- from fipy.tests.doctestPlus import register_skipper
- 
- from fipy.meshes.mesh import Mesh
-@@ -38,7 +38,7 @@ def _checkForGmsh():
-     hasGmsh = True
-     try:
-         version = _gmshVersion(communicator=parallelComm)
--        hasGmsh = version >= StrictVersion("2.0")
-+        hasGmsh = version >= Version("2.0")
-     except Exception:
-         hasGmsh = False
-     return hasGmsh
-@@ -68,6 +68,7 @@ def gmshVersion(communicator=parallelComm):
-         while True:
-             try:
-                 # gmsh returns version in stderr (Why?!?)
-+                # (newer versions of gmsh return the version in stdout)
-                 # spyder on Windows throws
-                 #   OSError: [WinError 6] The handle is invalid
-                 # if we don't PIPE stdout, too
-@@ -77,8 +78,11 @@ def gmshVersion(communicator=parallelComm):
-                 break
- 
-             try:
--                out, verStr = p.communicate()
--                verStr = verStr.decode('ascii').strip()
-+                out, err = p.communicate()
-+                verStr = err.decode('ascii').strip()
-+                if not verStr:
-+                    # newer versions of gmsh return the version in stdout
-+                    verStr = out.decode('ascii').strip()
-                 break
-             except IOError:
-                 # some weird conflict with things like PyQT can cause
-@@ -93,12 +97,12 @@ def gmshVersion(communicator=parallelComm):
- def _gmshVersion(communicator=parallelComm):
-     version = gmshVersion(communicator) or "0.0"
-     try:
--        version = StrictVersion(version)
-+        version = parse_version(version)
-     except ValueError:
-         # gmsh returns the version string in stderr,
-         # which means it's often unparsable due to irrelevant warnings
-         # assume it's OK and move on
--        version = StrictVersion("3.0")
-+        version = Version("3.0")
- 
-     return version
- 
-@@ -133,7 +137,7 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
- 
-     # Enforce gmsh version to be either >= 2 or 2.5, based on Nproc.
-     version = _gmshVersion(communicator=communicator)
--    if version < StrictVersion("2.0"):
-+    if version < Version("2.0"):
-         raise EnvironmentError("Gmsh version must be >= 2.0.")
- 
-     # If we're being passed a .msh file, leave it be. Otherwise,
-@@ -176,9 +180,11 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
-             gmshFlags = ["-%d" % dimensions, "-nopopup"]
- 
-             if communicator.Nproc > 1:
--                if not (StrictVersion("2.5") < version <= StrictVersion("4.0")):
--                    warnstr = "Cannot partition with Gmsh version < 2.5 or >= 4.0. " \
--                               + "Reverting to serial."
-+                if  ((version < Version("2.5"))
-+                     or (Version("4.0") <= version < Version("4.5.2"))):
-+                    warnstr = ("Cannot partition with Gmsh version < 2.5 "
-+                               "or 4.0 <= version < 4.5.2. "
-+                               "Reverting to serial.")
-                     warnings.warn(warnstr, RuntimeWarning, stacklevel=2)
-                     communicator = serialComm
- 
-@@ -188,13 +194,13 @@ def openMSHFile(name, dimensions=None, coordDimensions=None, communicator=parall
-                         raise ValueError("'dimensions' must be specified to generate a mesh from a geometry script")
-                 else: # gmsh version is adequate for partitioning
-                     gmshFlags += ["-part", "%d" % communicator.Nproc]
--                    if version >= StrictVersion("4.0"):
-+                    if version >= Version("4.0"):
-                         # Gmsh 4.x needs to be told to generate ghost cells
--                        # Unfortunately, the ghosts are broken
-+                        # Unfortunately, the ghosts are broken in Gmsh 4.0--4.5.1
-                         # https://gitlab.onelab.info/gmsh/gmsh/issues/733
-                         gmshFlags += ["-part_ghosts"]
- 
--            gmshFlags += ["-format", "msh2"]
-+            gmshFlags += ["-format", "msh2", "-smooth", "8"]
- 
-             if background is not None:
-                 if communicator.procID == 0:
-@@ -1387,6 +1393,11 @@ class _GmshTopology(_MeshTopology):
- class Gmsh2D(Mesh2D):
-     """Construct a 2D Mesh using Gmsh
- 
-+    If called in parallel, the mesh will be partitioned based on the value
-+    of `parallelComm.Nproc`.  If an `MSH` file is supplied, it must have
-+    been previously partitioned with the number of partitions matching
-+    `parallelComm.Nproc`.
-+
-     >>> radius = 5.
-     >>> side = 4.
-     >>> squaredCircle = Gmsh2D('''
-@@ -1875,6 +1886,11 @@ class Gmsh2D(Mesh2D):
- class Gmsh2DIn3DSpace(Gmsh2D):
-     """Create a topologically 2D Mesh in 3D coordinates using Gmsh
- 
-+    If called in parallel, the mesh will be partitioned based on the value
-+    of `parallelComm.Nproc`.  If an `MSH` file is supplied, it must have
-+    been previously partitioned with the number of partitions matching
-+    `parallelComm.Nproc`.
-+
-     Parameters
-     ----------
-     arg : str
-@@ -1959,6 +1975,11 @@ class Gmsh2DIn3DSpace(Gmsh2D):
- class Gmsh3D(Mesh):
-     """Create a 3D Mesh using Gmsh
- 
-+    If called in parallel, the mesh will be partitioned based on the value
-+    of `parallelComm.Nproc`.  If an `MSH` file is supplied, it must have
-+    been previously partitioned with the number of partitions matching
-+    `parallelComm.Nproc`.
-+
-     Parameters
-     ----------
-     arg : str
-@@ -2225,7 +2246,7 @@ class GmshGrid2D(Gmsh2D):
-         width  = nx * dx
-         numLayers = int(ny / float(dy))
- 
--        if _gmshVersion() < StrictVersion("2.7"):
-+        if _gmshVersion() < Version("2.7"):
-             # kludge: must offset cellSize by `eps` to work properly
-             eps = float(dx)/(nx * 10)
-         else:
-@@ -2299,7 +2320,7 @@ class GmshGrid3D(Gmsh3D):
-         width  = nx * dx
-         depth  = nz * dz
- 
--        if _gmshVersion() < StrictVersion("2.7"):
-+        if _gmshVersion() < Version("2.7"):
-             # kludge: must offset cellSize by `eps` to work properly
-             eps = float(dx)/(nx * 10)
-         else:
-diff --git a/fipy/tools/version.py b/fipy/tools/version.py
-new file mode 100644
-index 00000000..93d89c18
---- /dev/null
-+++ b/fipy/tools/version.py
-@@ -0,0 +1,18 @@
-+"""Shim for version checking
-+
-+`distutils.version` is deprecated, but `packaging.version` is unavailable
-+in Python 2.7
-+"""
-+from __future__ import unicode_literals
-+
-+__docformat__ = 'restructuredtext'
-+
-+
-+__all__ = ["Version", "parse_version"]
-+from future.utils import text_to_native_str
-+__all__ = [text_to_native_str(n) for n in __all__]
-+
-+try:
-+    from packaging.version import Version, parse as parse_version
-+except ImportError:
-+    from distutils.version import StrictVersion as Version, StrictVersion as parse_version    

From 341f68764d93ddf9dc69b44c4c812cb7a44261f9 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Wed, 17 Aug 2022 14:53:32 +0200
Subject: [PATCH 049/149] logseq: 0.8.0 -> 0.8.1

https://github.com/logseq/logseq/releases/tag/0.8.1

This release updates Electron to version 19, so we do update the version
of Electron as well.
---
 pkgs/applications/misc/logseq/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix
index d314bfed07e1..7eee1fb85af6 100644
--- a/pkgs/applications/misc/logseq/default.nix
+++ b/pkgs/applications/misc/logseq/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "logseq";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchurl {
     url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
-    sha256 = "sha256-eHSZqWQWPX5gavzUwsI3VMsD2Ov0h/fVPqnA92dzKH4=";
+    sha256 = "sha256-sJ0zaP3zhmcFKK97Bhist98xDuC/jpoN/5Vp1FIWp5M=";
     name = "${pname}-${version}.AppImage";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc770ddbc03d..6af2619acb0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1832,7 +1832,7 @@ with pkgs;
   lilo = callPackage ../tools/misc/lilo { };
 
   logseq = callPackage ../applications/misc/logseq {
-    electron = electron_15;
+    electron = electron_19;
   };
 
   natls = callPackage ../tools/misc/natls { };

From 1a50f6ce42f31610fc88a4efe6e438471a7f5ac9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 13:06:50 +0000
Subject: [PATCH 050/149] kubeone: 1.4.6 -> 1.4.7

---
 pkgs/applications/networking/cluster/kubeone/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix
index 513e77dfc2d8..7851496558f6 100644
--- a/pkgs/applications/networking/cluster/kubeone/default.nix
+++ b/pkgs/applications/networking/cluster/kubeone/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubeone";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "kubermatic";
     repo = "kubeone";
     rev = "v${version}";
-    sha256 = "sha256-2abuKLAqOaRceokmNb7YG0qg/iYbPhSTG75Rs5mwHDU=";
+    sha256 = "sha256-SgberbjqIf+5bfE+gM7+lxl25aQVs2tJBNrPgkzowJ4=";
   };
 
   vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw=";

From 45e6c607d6fe601905354cb743e6070265b9dde8 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Mon, 15 Aug 2022 20:31:14 +0200
Subject: [PATCH 051/149] nvidia_x11: add conditional overrides

nvidia_x11_open: unbreak 5.19

common kernel code is shared, if the closed build is broken, so is the open one.

nvidia_x11_production: add alias, sort names

nvidia_x11: reintroduce stable as a pure alias

nvidia_x11: don't use alias in override
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 38 ++++++++++++-------
 pkgs/os-specific/linux/nvidia-x11/generic.nix |  5 ++-
 pkgs/os-specific/linux/nvidia-x11/open.nix    |  6 ++-
 pkgs/top-level/linux-kernels.nix              |  5 ++-
 4 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 00bb005f636a..bc66e3c8b7eb 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,30 +12,40 @@ let
 
   kernel = callPackage # a hacky way of extracting parameters from callPackage
     ({ kernel, libsOnly ? false }: if libsOnly then { } else kernel) { };
+
+  selectHighestVersion = a: b: if lib.versionOlder a.version b.version
+    then b
+    else a;
 in
 rec {
+  # Official Unix Drivers - https://www.nvidia.com/en-us/drivers/unix/
+  # Branch/Maturity data - http://people.freedesktop.org/~aplattner/nvidia-versions.txt
+
   # Policy: use the highest stable version as the default (on our master).
-  stable = if stdenv.hostPlatform.system == "x86_64-linux"
-    then generic {
-      version = "515.65.01";
-      sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek=";
-      openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
-      settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
-      persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
-    }
-    else legacy_390;
+  stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
-  # see https://www.nvidia.com/en-us/drivers/unix/ "Production branch"
-  production = stable;
+  production = generic {
+    version = "515.65.01";
+    sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek=";
+    openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI=";
+    settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg=";
+    persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY=";
+  };
 
-  beta = generic {
+  latest = selectHighestVersion production (generic {
+    version = "495.46";
+    sha256_64bit = "2Dt30X2gxUZnqlsT1uqVpcUTBCV7Hs8vjUo7WuMcYvU=";
+    settingsSha256 = "vbcZYn+UBBGwjfrJ6SyXt3+JLBeNcXK4h8mjj7qxZPk=";
+    persistencedSha256 = "ieYqkVxe26cLw1LUgBsFSSowAyfZkTcItIzQCestCXI=";
+  });
+
+  beta = selectHighestVersion latest (generic {
     version = "515.43.04";
     sha256_64bit = "sha256-PodaTTUOSyMW8rtdtabIkSLskgzAymQyfToNlwxPPcc=";
     openSha256 = "sha256-1bAr5dWZ4jnY3Uo2JaEz/rhw2HuW9LZ5bACmA1VG068=";
     settingsSha256 = "sha256-j47LtP6FNTPfiXFh9KwXX8vZOQzlytA30ZfW9N5F2PY=";
     persistencedSha256 = "sha256-hULBy0wnVpLH8I0L6O9/HfgvJURtE2whpXOgN/vb3Wo=";
-    broken = kernel.kernelAtLeast "5.19"; # Added at 2022-08-12
-  };
+  });
 
   # Vulkan developer beta driver
   # See here for more information: https://developer.nvidia.com/vulkan-driver
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 768d4179111f..d6dcc7ad6cd0 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -103,7 +103,10 @@ let
     disallowedReferences = optional (!libsOnly) [ kernel.dev ];
 
     passthru = {
-      open = mapNullable (hash: callPackage (import ./open.nix self hash) { }) openSha256;
+      open = mapNullable (hash: callPackage ./open.nix {
+        inherit hash broken;
+        nvidia_x11 = self;
+      }) openSha256;
       settings = (if settings32Bit then pkgsi686Linux.callPackage else callPackage) (import ./settings.nix self settingsSha256) {
         withGtk2 = preferGtk2;
         withGtk3 = !preferGtk2;
diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix
index 5f8715aa7360..3e21dade83ae 100644
--- a/pkgs/os-specific/linux/nvidia-x11/open.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/open.nix
@@ -1,8 +1,10 @@
-nvidia_x11: hash:
 { stdenv
 , lib
 , fetchFromGitHub
 , kernel
+, nvidia_x11
+, hash
+, broken ? false
 }:
 
 stdenv.mkDerivation {
@@ -32,7 +34,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules";
     license = with licenses; [ gpl2Plus mit ];
     platforms = platforms.linux;
-    broken = kernel.kernelAtLeast "5.19";
     maintainers = with maintainers; [ nickcao ];
+    inherit broken;
   };
 }
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index bb19710ffd87..e2e20726525b 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -356,12 +356,13 @@ in {
 
     nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { }));
 
+    nvidia_x11             = nvidiaPackages.stable;
+    nvidia_x11_beta        = nvidiaPackages.beta;
     nvidia_x11_legacy340   = nvidiaPackages.legacy_340;
     nvidia_x11_legacy390   = nvidiaPackages.legacy_390;
     nvidia_x11_legacy470   = nvidiaPackages.legacy_470;
-    nvidia_x11_beta        = nvidiaPackages.beta;
+    nvidia_x11_production  = nvidiaPackages.production;
     nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta;
-    nvidia_x11             = nvidiaPackages.stable;
 
     # this is not a replacement for nvidia_x11
     # only the opensource kernel driver exposed for hydra to build

From 5e168822ba92518a9c448269735a247090b12c6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 14:31:17 +0000
Subject: [PATCH 052/149] python310Packages.cwcwidth: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index c3778415e570..f6bab4ffc4bc 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "cwcwidth";
-  version = "0.1.6";
+  version = "0.1.7";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b31da599c9f0cf41f39ed10c1ceaa01d6024e31c6cd9aea2885b1f2a6d15fba";
+    sha256 = "sha256-wNZH4S46SxWogeHYT3lpN1FmSEieARJXI33CF51rGVE=";
   };
 
   nativeBuildInputs = [ cython ];

From 239d8f14ad58dbe0ffd12c20bf04825b77e9bcb9 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sun, 3 Apr 2022 22:18:55 +0200
Subject: [PATCH 053/149] python3Packages.recordlinkage: init at 0.14

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

diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix
new file mode 100644
index 000000000000..b717d8a4c5b5
--- /dev/null
+++ b/pkgs/development/python-modules/recordlinkage/default.nix
@@ -0,0 +1,53 @@
+{ lib
+, bottleneck
+, buildPythonPackage
+, fetchPypi
+, jellyfish
+, joblib
+, networkx
+, numexpr
+, numpy
+, pandas
+, pyarrow
+, pytest
+, scikit-learn
+, scipy
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "recordlinkage";
+  version = "0.14";
+
+  disabled = pythonOlder "3.7";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-kuY2MUuwaLb228kwkJmOnnU+OolZcvGlhKTTiama+T4=";
+  };
+
+  propagatedBuildInputs = [
+    pyarrow
+    jellyfish
+    numpy
+    pandas
+    scipy
+    scikit-learn
+    joblib
+    networkx
+    bottleneck
+    numexpr
+  ];
+
+  # pytestCheckHook does not work
+  # Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too.
+  checkInputs = [ pytest ];
+
+  pythonImportsCheck = [ "recordlinkage" ];
+
+  meta = with lib; {
+    description = "Library to link records in or between data sources";
+    homepage = "https://recordlinkage.readthedocs.io/";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.raitobezarius ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51100fb611a7..a4400479294b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8837,6 +8837,8 @@ in {
 
   recommonmark = callPackage ../development/python-modules/recommonmark { };
 
+  recordlinkage = callPackage ../development/python-modules/recordlinkage { };
+
   redbaron = callPackage ../development/python-modules/redbaron { };
 
   redis = callPackage ../development/python-modules/redis { };

From b7731c3997d1bd453ecd8b98532104a334c12dee Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 10 Aug 2022 21:54:37 +0200
Subject: [PATCH 054/149] crosvm: install both .policy and .bpf files

`crosvm --seccomp-log-failures` requires the .policy files. see:
https://crosvm.dev/book/building_crosvm.html#known-issues
---
 pkgs/applications/virtualization/crosvm/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index 375aaf873112..bd2c8badce54 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -52,13 +52,16 @@ rustPlatform.buildRustPackage rec {
         compile_seccomp_policy \
             --default-action trap $policy ''${policy%.policy}.bpf
     done
+
+    substituteInPlace seccomp/$arch/*.policy \
+      --replace "@include $(pwd)/seccomp/$arch/" "@include $out/share/policy/"
   '';
 
   buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ];
 
   postInstall = ''
     mkdir -p $out/share/policy/
-    cp -v seccomp/$arch/*.bpf $out/share/policy/
+    cp -v seccomp/$arch/*.{policy,bpf} $out/share/policy/
   '';
 
   passthru.updateScript = ./update.py;

From 3c4899b2e48b62a80f8e7eb9000c841c52c62887 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 17 Aug 2022 18:58:34 +0200
Subject: [PATCH 055/149] python3Packages.humanize: 4.2.3 -> 4.3.0

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

diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix
index b64b26844d18..a995e56b1da6 100644
--- a/pkgs/development/python-modules/humanize/default.nix
+++ b/pkgs/development/python-modules/humanize/default.nix
@@ -11,7 +11,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "4.2.3";
+  version = "4.3.0";
   pname = "humanize";
   format = "pyproject";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "python-humanize";
     repo = pname;
     rev = version;
-    hash = "sha256-cAlNtN9sUnDAkCQj2bJfT72B2TQDYRBB4P4NJY9mUU0=";
+    hash = "sha256-sccv3HtCgG/znZs/sfmeeOHK3xchv9zRrNX/SxyEbCQ=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 7557be5546c8934575e2d423fdaf53d248d49c8d Mon Sep 17 00:00:00 2001
From: Frido Friedemann <friede.mann@posteo.de>
Date: Sun, 14 Aug 2022 22:04:28 +0200
Subject: [PATCH 056/149] pythonPackages.notebook-shim: init at 0.1.0

---
 .../python-modules/notebook-shim/default.nix  | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/notebook-shim/default.nix

diff --git a/pkgs/development/python-modules/notebook-shim/default.nix b/pkgs/development/python-modules/notebook-shim/default.nix
new file mode 100644
index 000000000000..a37e0cb3c679
--- /dev/null
+++ b/pkgs/development/python-modules/notebook-shim/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, jupyter_server
+, pytestCheckHook
+, pytest-tornasync
+}:
+
+buildPythonPackage rec {
+  pname = "notebook-shim";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "jupyter";
+    repo = "notebook_shim";
+    rev = "v${version}";
+    sha256 = "sha256-5oIYj8SdC4E0N/yFxsmD2p4VkStHvqrVqAwb/htyPm4=";
+  };
+
+  propagatedBuildInputs = [ jupyter_server ];
+
+  preCheck = ''
+    mv notebook_shim/conftest.py notebook_shim/tests
+    cd notebook_shim/tests
+  '';
+
+  # TODO: understand & possibly fix why tests fail. On github most testfiles
+  # have been comitted with msgs "wip" though.
+  doCheck = false;
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-tornasync
+  ];
+
+  pythonImportsCheck = [ "notebook_shim" ];
+
+  meta = with lib; {
+    description = "Switch frontends to Jupyter Server";
+    longDescription = ''
+      This project provides a way for JupyterLab and other frontends to switch
+      to Jupyter Server for their Python Web application backend.
+    '';
+    homepage = "https://github.com/jupyter/notebook_shim";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ friedelino ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37e657c5f325..3e100ae8bf89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6085,6 +6085,8 @@ in {
 
   notebook = callPackage ../development/python-modules/notebook { };
 
+  notebook-shim = callPackage ../development/python-modules/notebook-shim { };
+
   notedown = callPackage ../development/python-modules/notedown { };
 
   notifications-python-client = callPackage ../development/python-modules/notifications-python-client { };

From e66376b18a9e07b40d84878643c8731eee50a02f Mon Sep 17 00:00:00 2001
From: Frido Friedemann <friede.mann@posteo.de>
Date: Sun, 14 Aug 2022 22:05:59 +0200
Subject: [PATCH 057/149] pythonPackages.nbclassic: fix build failure

---
 .../python-modules/nbclassic/default.nix      | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/nbclassic/default.nix b/pkgs/development/python-modules/nbclassic/default.nix
index fc311125c1d0..a1e16bc75219 100644
--- a/pkgs/development/python-modules/nbclassic/default.nix
+++ b/pkgs/development/python-modules/nbclassic/default.nix
@@ -1,8 +1,8 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
-, python
+, fetchPypi
 , notebook
+, notebook-shim
 , pythonOlder
 , jupyter_server
 , pytestCheckHook
@@ -14,23 +14,13 @@ buildPythonPackage rec {
   version = "0.4.3";
   disabled = pythonOlder "3.6";
 
-  # tests only on github
-  src = fetchFromGitHub {
-    owner = "jupyterlab";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-5sof5EOqzK7kNHSXp7eJl3ZagZRWF74e08ahqJId2Z8=";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "sha256-8DERss66ppuINwp7I7GbKzfJu3F2fxgozf16BH6ujt0=";
   };
 
-  propagatedBuildInputs = [ jupyter_server notebook ];
+  propagatedBuildInputs = [ jupyter_server notebook notebook-shim ];
 
-  preCheck = ''
-    cd nbclassic
-    mv conftest.py tests
-    cd tests
-
-    export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH
-  '';
   checkInputs = [
     pytestCheckHook
     pytest-tornasync

From bab6fd31cddf59760c86a620124fe064ef43fea3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 17 Aug 2022 19:53:24 +0100
Subject: [PATCH 058/149] cvise: drop tests broken by pytest-flake8 update

Commit https://github.com/NixOS/nixpkgs/pull/186102/commits/219b7104a3b49b4a9375ff791c7fbce3e8f504f2
marked pytest-flake8 as broken. Let's demove cvise tests to restore
cvise package until upstream sorts it out.
---
 pkgs/development/tools/misc/cvise/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix
index d6ad65164b74..6db4a89becbd 100644
--- a/pkgs/development/tools/misc/cvise/default.nix
+++ b/pkgs/development/tools/misc/cvise/default.nix
@@ -1,6 +1,6 @@
 { lib, buildPythonApplication, fetchFromGitHub, bash, cmake, flex
 , libclang, llvm, unifdef
-, chardet, pebble, psutil, pytestCheckHook, pytest-flake8
+, chardet, pebble, psutil
 }:
 
 buildPythonApplication rec {
@@ -22,7 +22,6 @@ buildPythonApplication rec {
   nativeBuildInputs = [ cmake flex llvm.dev ];
   buildInputs = [ bash libclang llvm llvm.dev unifdef ];
   propagatedBuildInputs = [ chardet pebble psutil ];
-  checkInputs = [ pytestCheckHook pytest-flake8 unifdef ];
 
   # 'cvise --command=...' generates a script with hardcoded shebang.
   postPatch = ''
@@ -30,14 +29,8 @@ buildPythonApplication rec {
       --replace "#!/bin/bash" "#!${bash}/bin/bash"
   '';
 
-  preCheck = ''
-    patchShebangs cvise.py
-  '';
-  disabledTests = [
-    # Needs gcc, fails when run noninteractively (without tty).
-    "test_simple_reduction"
-  ];
-
+  # pytest-flake8 is broken in nixpkgs: https://github.com/tholo/pytest-flake8/issues/87
+  doCheck = false;
   dontUsePipInstall = true;
   dontUseSetuptoolsBuild = true;
   dontUseSetuptoolsCheck = true;

From 2ea963c93075f25ea9cdfd16de476b84c33e2f70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 22:34:06 +0000
Subject: [PATCH 059/149] tickrs: 0.14.4 -> 0.14.6

---
 pkgs/applications/misc/tickrs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix
index e6476cb42212..68dc30c90080 100644
--- a/pkgs/applications/misc/tickrs/default.nix
+++ b/pkgs/applications/misc/tickrs/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tickrs";
-  version = "0.14.4";
+  version = "0.14.6";
 
   src = fetchFromGitHub {
     owner = "tarkah";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-OOsBo+NCfn++2XyfQVoeEPcbSv645Ng7g9s4W7X2xg4=";
+    sha256 = "sha256-tsPCx/4ap2udfZHRK5ebxRYEBYw2W6EgnDI6P3riV04=";
   };
 
-  cargoSha256 = "sha256-HAkJKqoz4vrY4mGFSz6sylV6DdrjWvPfwb4BiLWEyKY=";
+  cargoSha256 = "sha256-xpUI8IflLqBrwsU5YccGzQlPUJT46GJa5AdsIv9qfjU=";
 
   nativeBuildInputs = [ perl ];
 

From aab926cc66d4eba2a5cdf0a0a5623873214807af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 22:58:47 +0000
Subject: [PATCH 060/149] werf: 1.2.154 -> 1.2.160

---
 pkgs/applications/networking/cluster/werf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index c632df6396be..43c7b6b1396e 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "1.2.154";
+  version = "1.2.160";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    sha256 = "sha256-5tiJRxE8W2nvkQdJ3jL8P0+7LXEfNOdL15LdDjlDWpc=";
+    sha256 = "sha256-UeZpH6A/N+frShOOVeRCsIXdBKiI0chsxQvsGJF5JwE=";
   };
 
   vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ=";

From 7002f2f3c8c80ee7d0622d18e01e5bd48fa96d92 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 17 Aug 2022 10:55:13 +0800
Subject: [PATCH 061/149] spectra: init at 1.0.1

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

diff --git a/pkgs/development/libraries/spectra/default.nix b/pkgs/development/libraries/spectra/default.nix
new file mode 100644
index 000000000000..1fc3ccd75765
--- /dev/null
+++ b/pkgs/development/libraries/spectra/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, eigen
+}:
+
+stdenv.mkDerivation rec {
+  pname = "spectra";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "yixuan";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-HaJmMo4jYmO/j53/nHrL3bvdQMAvp4Nuhhe8Yc7pL88=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  propagatedBuildInputs = [ eigen ];
+
+  meta = with lib; {
+    homepage = "https://spectralib.org/";
+    description = "A C++ library for large scale eigenvalue problems, built on top of Eigen";
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ vonfry ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc770ddbc03d..b23f6a3d9bc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35593,6 +35593,8 @@ with pkgs;
 
   refind = callPackage ../tools/bootloaders/refind { };
 
+  spectra = callPackage ../development/libraries/spectra { };
+
   spectrojack = callPackage ../applications/audio/spectrojack { };
 
   sift = callPackage ../tools/text/sift { };

From 4db63c2da16c9bac08d42f993d9fc8cc05f6705c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 23:11:55 +0000
Subject: [PATCH 062/149] zellij: 0.31.1 -> 0.31.2

---
 pkgs/tools/misc/zellij/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index ac4d926a2eda..06fdaf193468 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -15,16 +15,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "zellij";
-  version = "0.31.1";
+  version = "0.31.2";
 
   src = fetchFromGitHub {
     owner = "zellij-org";
     repo = "zellij";
     rev = "v${version}";
-    sha256 = "sha256-8ISOyfLNtLW244HkCOpB38fhafnxRaOBBezpVz4Mb2o=";
+    sha256 = "sha256-btuBVG/ZF996RLTfB6HvMRuuZOwJGAMvoefVtw9SjME=";
   };
 
-  cargoSha256 = "sha256-lBmJL7p7mqfly6CmZBFR2FFD4QlAccCAYU251HuI9jY=";
+  cargoSha256 = "sha256-r5+BBiC2IS7DAKTwPNW6mM41nlIgSeP4cNPRWXNFkrU=";
 
   nativeBuildInputs = [
     mandown

From 5da692923a49e26cdf2b3c304a1a8349e494af07 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 18 Aug 2022 02:01:33 +0200
Subject: [PATCH 063/149] python3Packages.grpclib: init at 0.4.3

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

diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
new file mode 100644
index 000000000000..1eb93ece6d6c
--- /dev/null
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -0,0 +1,51 @@
+{ buildPythonPackage
+, fetchFromGitHub
+, lib
+, pythonOlder
+, h2
+, multidict
+, pytestCheckHook
+, pytest-asyncio
+, async-timeout
+, faker
+, googleapis-common-protos
+, certifi
+}:
+let
+  pname = "grpclib";
+  version = "0.4.3";
+in
+buildPythonPackage {
+  inherit pname version;
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "vmagamedov";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-zjctvsuX5yJl1EXIAaiukWGYJbdgU7OZllgOYAmp1b4=";
+  };
+
+  propagatedBuildInputs = [
+    h2
+    multidict
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    async-timeout
+    faker
+    googleapis-common-protos
+    certifi
+  ];
+
+  pythonImportsCheck = [ "grpclib" ];
+
+  meta = with lib; {
+    description = "Pure-Python gRPC implementation for asyncio";
+    homepage = "https://github.com/vmagamedov/grpclib";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nikstur ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37e657c5f325..7ec33a246c53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3944,6 +3944,8 @@ in {
 
   grpcio-tools = callPackage ../development/python-modules/grpcio-tools { };
 
+  grpclib = callPackage ../development/python-modules/grpclib { };
+
   gruut = callPackage ../development/python-modules/gruut { };
 
   gruut-ipa = callPackage ../development/python-modules/gruut-ipa {

From 90c6f12f46168866cf7d9ee1a37dbace28a200b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 00:15:34 +0000
Subject: [PATCH 064/149] python310Packages.papermill: 2.3.4 -> 2.4.0

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

diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index c9ef2298559f..8e1ab4d4a12b 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -23,11 +23,11 @@
 
 buildPythonPackage rec {
   pname = "papermill";
-  version = "2.3.4";
+  version = "2.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "be12d2728989c0ae17b42fcb05b623500004e94b34f56bd153355ccebb84a59a";
+    sha256 = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic=";
   };
 
   propagatedBuildInputs = [

From 12e34e003f6bf50868740113b40806659a7b0dbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Jul 2022 21:46:52 +0000
Subject: [PATCH 065/149] libzip: 1.8.0 -> 1.9.2

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

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index f794868baf0d..d3b7e5642546 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libzip";
-  version = "1.8.0";
+  version = "1.9.2";
 
   src = fetchurl {
     url = "https://libzip.org/download/${pname}-${version}.tar.gz";
-    sha256 = "17l3ygrnbszm3b99dxmw94wcaqpbljzg54h4c0y8ss8aij35bvih";
+    sha256 = "sha256-/Wp/dF3j1pz1YD7cnLM9KJDwGY5BUlXQmHoM8Q2CTG8=";
   };
 
   outputs = [ "out" "dev" "man" ];

From 802ea456991723a936e302b91d004345482b569a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Aug 2022 13:28:54 +0000
Subject: [PATCH 066/149] janet: 1.23.0 -> 1.24.0

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

diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix
index 2e502f35b301..718f13ad2e7d 100644
--- a/pkgs/development/interpreters/janet/default.nix
+++ b/pkgs/development/interpreters/janet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "janet";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "janet-lang";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-FQZ9I9ROC1gWGfMCxsNMN3g/arenRtC6LHsOIAKGyuE=";
+    sha256 = "sha256-scc29tS3jiGacHp90tGmn/qnbLscJ4sAOCm8IteXfh4=";
   };
 
   # This release fails the test suite on darwin, remove when debugged.

From a1c20c103503389bc1cc3c8e2c1ff6feb84080ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 00:23:08 +0000
Subject: [PATCH 067/149] python310Packages.peaqevcore: 5.2.0 -> 5.4.3

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

diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 96d33c64f661..1662366eb188 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "5.2.0";
+  version = "5.4.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8zllJh34tAymjW3OaFNiDuChdk/og09l51OFlt0jNqs=";
+    hash = "sha256-WeAYa1Iggog5VX1oiANZCeVpuEF5JdabdUjQ+fkAwxE=";
   };
 
   postPatch = ''

From 44b1a399b1180327e7a8035c1d2051ad32eaead2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 01:31:20 +0000
Subject: [PATCH 068/149] python310Packages.pypoolstation: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/development/python-modules/pypoolstation/default.nix b/pkgs/development/python-modules/pypoolstation/default.nix
index 5607bc0926a9..5c4703193af1 100644
--- a/pkgs/development/python-modules/pypoolstation/default.nix
+++ b/pkgs/development/python-modules/pypoolstation/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pypoolstation";
-  version = "0.4.8";
+  version = "0.4.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyPoolstation";
     inherit version;
-    sha256 = "sha256-6Fdam/LS3Nicrhe5jHHvaKCpE0HigfOVszjb5c1VM3Y=";
+    sha256 = "sha256-2smgsR5f2fzmutr4EjhyrFWrO9odTba0ux+0B6k3+9Y=";
   };
 
   nativeBuildInputs = [

From bcd52ecae0bdffba406ef9d18ec0451c1a687492 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 01:19:36 +0000
Subject: [PATCH 069/149] python310Packages.pymavlink: 2.4.31 -> 2.4.34

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

diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix
index 44abf56e7e47..2e71e58e7c30 100644
--- a/pkgs/development/python-modules/pymavlink/default.nix
+++ b/pkgs/development/python-modules/pymavlink/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pymavlink";
-  version = "2.4.31";
+  version = "2.4.34";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-p7cvwMpW1fS9Ml72vsD9L35wqPjtsQHW5lclw5SJ4P0=";
+    sha256 = "sha256-2JPBjEXiJWDJJPwS7SjNr3L4Ct+U44QaJiiv8MtSnEk=";
   };
 
   propagatedBuildInputs = [ future lxml ];

From 7ce46dd74dc7bd2b6ba6619eaa8bdc5e1da9e79c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 01:41:34 +0000
Subject: [PATCH 070/149] python310Packages.pysma: 0.6.11 -> 0.6.12

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

diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index efad8aaca948..5ec0aa44995e 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pysma";
-  version = "0.6.11";
+  version = "0.6.12";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-x0sFJAdueSny0XoaOYbYLN8ZRS5B/iEVT62mqd4Voe4=";
+    sha256 = "sha256-uxMxqx5qbahMvTm3akiOTODhKLNVhHzBAUsOcZo/35I=";
   };
 
   propagatedBuildInputs = [

From a6d96a709a1d0c64e361ae6a824ec4f62c426ad5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 02:21:02 +0000
Subject: [PATCH 071/149] python310Packages.qcengine: 0.24.0 -> 0.24.1

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

diff --git a/pkgs/development/python-modules/qcengine/default.nix b/pkgs/development/python-modules/qcengine/default.nix
index 2290bfbc3247..af842c6c9559 100644
--- a/pkgs/development/python-modules/qcengine/default.nix
+++ b/pkgs/development/python-modules/qcengine/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "qcengine";
-  version = "0.24.0";
+  version = "0.24.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-T6/gC3HHCnI3O1Gkj/MdistL93bwymtEfNF6PmA7TN0=";
+    hash = "sha256-KUOGbGQd1ffXNkQiW8yeUxValCOAfd8nBv9nnk9giVU=";
   };
 
   propagatedBuildInputs = [

From da87f771027c5fe2db7d93d4e56197849236dc5a Mon Sep 17 00:00:00 2001
From: Jiajie Chen <c@jia.je>
Date: Fri, 15 Jul 2022 16:47:19 +0800
Subject: [PATCH 072/149] cbmc: init at 5.63.0

Cadical is used as sat solver backend.

https://github.com/diffblue/cbmc/releases/tag/cbmc-5.63.0
---
 ...001-Do-not-download-sources-in-cmake.patch | 49 +++++++++++
 .../science/logic/cbmc/default.nix            | 82 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 133 insertions(+)
 create mode 100644 pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch
 create mode 100644 pkgs/applications/science/logic/cbmc/default.nix

diff --git a/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch
new file mode 100644
index 000000000000..78b2c9d3bb22
--- /dev/null
+++ b/pkgs/applications/science/logic/cbmc/0001-Do-not-download-sources-in-cmake.patch
@@ -0,0 +1,49 @@
+From fbc1488e8da0175e9c9bdf5892f8a65c71f2a266 Mon Sep 17 00:00:00 2001
+From: Jiajie Chen <c@jia.je>
+Date: Fri, 15 Jul 2022 18:33:15 +0800
+Subject: [PATCH] Do not download sources in cmake
+
+---
+ src/solvers/CMakeLists.txt | 20 +-------------------
+ 1 file changed, 1 insertion(+), 19 deletions(-)
+
+diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt
+index 744def486..5b719a78a 100644
+--- a/src/solvers/CMakeLists.txt
++++ b/src/solvers/CMakeLists.txt
+@@ -106,31 +106,13 @@ elseif("${sat_impl}" STREQUAL "glucose")
+ elseif("${sat_impl}" STREQUAL "cadical")
+     message(STATUS "Building solvers with cadical")
+ 
+-    download_project(PROJ cadical
+-        URL https://github.com/arminbiere/cadical/archive/rel-1.4.1.tar.gz
+-        PATCH_COMMAND true
+-        COMMAND CXX=${CMAKE_CXX_COMPILER} ./configure -O3 -s CXXFLAGS=-std=c++14
+-        URL_MD5 b44874501a175106424f4bd5de29aa59
+-    )
+-
+     message(STATUS "Building CaDiCaL")
+-    execute_process(COMMAND make -j WORKING_DIRECTORY ${cadical_SOURCE_DIR})
+ 
+     target_compile_definitions(solvers PUBLIC
+         SATCHECK_CADICAL HAVE_CADICAL
+     )
+ 
+-    add_library(cadical STATIC IMPORTED)
+-
+-    set_target_properties(
+-        cadical
+-        PROPERTIES IMPORTED_LOCATION ${cadical_SOURCE_DIR}/build/libcadical.a
+-    )
+-
+-    target_include_directories(solvers
+-      PUBLIC
+-      ${cadical_SOURCE_DIR}/src
+-    )
++    target_include_directories(solvers PUBLIC ${cadical_INCLUDE_DIR})
+ 
+     target_link_libraries(solvers cadical)
+ elseif("${sat_impl}" STREQUAL "ipasir-cadical")
+-- 
+2.35.1
+
diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix
new file mode 100644
index 000000000000..ba06a3e4b7a2
--- /dev/null
+++ b/pkgs/applications/science/logic/cbmc/default.nix
@@ -0,0 +1,82 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, testers
+, bison
+, cadical
+, cbmc
+, cmake
+, flex
+, makeWrapper
+, perl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cbmc";
+  version = "5.63.0";
+
+  src = fetchFromGitHub {
+    owner = "diffblue";
+    repo = pname;
+    rev = "${pname}-${version}";
+    sha256 = "sha256-4tn3wsmaYdo5/QaZc3MLxVGF0x8dmRKeygF/8A+Ww1o=";
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    perl
+    makeWrapper
+  ];
+
+  buildInputs = [ cadical ];
+
+  # do not download sources
+  # link existing cadical instead
+  patches = [
+    ./0001-Do-not-download-sources-in-cmake.patch
+  ];
+
+  postPatch = ''
+    # do not hardcode gcc
+    substituteInPlace "scripts/bash-autocomplete/extract_switches.sh" \
+      --replace "gcc" "$CC" \
+      --replace "g++" "$CXX"
+    # fix library_check.sh interpreter error
+    patchShebangs .
+  '' + lib.optionalString (!stdenv.cc.isGNU) ''
+    # goto-gcc rely on gcc
+    substituteInPlace "regression/CMakeLists.txt" \
+      --replace "add_subdirectory(goto-gcc)" ""
+  '';
+
+  postInstall = ''
+    # goto-cc expects ls_parse.py in PATH
+    mkdir -p $out/share/cbmc
+    mv $out/bin/ls_parse.py $out/share/cbmc/ls_parse.py
+    chmod +x $out/share/cbmc/ls_parse.py
+    wrapProgram $out/bin/goto-cc \
+      --prefix PATH : "$out/share/cbmc" \
+  '';
+
+  # fix "argument unused during compilation"
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
+    "-Wno-unused-command-line-argument";
+
+  # TODO: add jbmc support
+  cmakeFlags = [ "-DWITH_JBMC=OFF" "-Dsat_impl=cadical" "-Dcadical_INCLUDE_DIR=${cadical.dev}/include" ];
+
+  passthru.tests.version = testers.testVersion {
+    package = cbmc;
+    command = "cbmc --version";
+  };
+
+  meta = with lib; {
+    description = "CBMC is a Bounded Model Checker for C and C++ programs";
+    homepage = "http://www.cprover.org/cbmc/";
+    license = licenses.bsdOriginal;
+    maintainers = with maintainers; [ jiegec ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f896a18703d5..29b8db413d7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34247,6 +34247,8 @@ with pkgs;
 
   boogie = dotnetPackages.Boogie;
 
+  cbmc = callPackage ../applications/science/logic/cbmc { };
+
   cadical = callPackage ../applications/science/logic/cadical {};
 
   inherit (callPackage ./coq-packages.nix {

From cb37c6b9d57f097001923e60628705d92307ba4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 03:48:02 +0000
Subject: [PATCH 073/149] python310Packages.striprtf: 0.0.20 -> 0.0.21

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

diff --git a/pkgs/development/python-modules/striprtf/default.nix b/pkgs/development/python-modules/striprtf/default.nix
index 52fe3769e224..040985107003 100644
--- a/pkgs/development/python-modules/striprtf/default.nix
+++ b/pkgs/development/python-modules/striprtf/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "striprtf";
-  version = "0.0.20";
+  version = "0.0.21";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-8eMeMrazl1o9XcIyWICDg6ycRMtFMfgTUNz51w9hAmc=";
+    sha256 = "sha256-/wqYbdJ+OI/RTODnKB34e7zADHzCPEX0LkTausqFNtY=";
   };
 
   pythonImportsCheck = [

From 97b1fe315456e50bed39a41949d85cee06453a8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 04:10:43 +0000
Subject: [PATCH 074/149] python310Packages.trimesh: 3.13.4 -> 3.13.5

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

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 96ca562dcd84..38587c3f2261 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.13.4";
+  version = "3.13.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-NTHh5kWu3Nri+Yoi9yvkHlWRD3slYraktKfcah7CEY8=";
+    sha256 = "sha256-1+BycZ1fFEfbqoHs/TDnGZXc8IRzWzy2pZ2YkTOPMaA=";
   };
 
   propagatedBuildInputs = [ numpy ];

From 443ba65c4faabb1fd6bc1c39b2dccd9cc8ef8dea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 04:13:09 +0000
Subject: [PATCH 075/149] python310Packages.trytond: 6.4.3 -> 6.4.4

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

diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix
index df877a2e7026..6dfae0f22b75 100644
--- a/pkgs/development/python-modules/trytond/default.nix
+++ b/pkgs/development/python-modules/trytond/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "trytond";
-  version = "6.4.3";
+  version = "6.4.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-LzpEHUL1RUPtg4mQqViGHQ1iCfIwQ7KTlEcDZQfhHzA=";
+    sha256 = "sha256-eTYm3anMKhgoaB8t5jald5XRD3PIVijJP4vmh0pA9lE=";
   };
 
   propagatedBuildInputs = [

From 1c66729c007789e54478322e0c98f0361b93281b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 18 Aug 2022 06:30:45 +0100
Subject: [PATCH 076/149] pax-utils: fix cross-compilation (missing native C
 compiler)

Without the change cross-compilation fails as:

    $ nix build -f. pkgsCross.ppc64.pax-utils -L
    ...
    meson.build:149:2: ERROR: Tried to access compiler for language "c", not specified for build machine.
---
 pkgs/os-specific/linux/pax-utils/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index f074ab344ab2..844dc61dac37 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, buildPackages
 , docbook_xml_dtd_44
 , docbook_xsl
 , libcap
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ docbook_xml_dtd_44 docbook_xsl meson ninja pkg-config xmlto ];
   buildInputs = [ libcap ];
 

From 198a940c6190da94acdbe5c7f4ba2b8c6ee98748 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 18 Aug 2022 06:36:13 +0100
Subject: [PATCH 077/149] glibc: add a few TODOs aroung libgcc_s.so hack

Make it clearer why the hack is still there.
---
 pkgs/development/libraries/glibc/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index ba782321559d..f941f7be769d 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -64,8 +64,12 @@ callPackage ./common.nix { inherit stdenv; } {
     # store path than that determined when built (as a source for the
     # bootstrap-tools tarball)
     # Building from a proper gcc staying in the path where it was installed,
-    # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without
+    # libgcc_s will now be at {gcc}/lib, and gcc's libgcc will be found without
     # any special hack.
+    # TODO: remove this hack. Things that rely on this hack today:
+    # - dejagnu: during linux bootstrap tcl SIGSEGVs
+    # - clang-wrapper in cross-compilation
+    # Last attempt: https://github.com/NixOS/nixpkgs/pull/36948
     preInstall = ''
       if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
           mkdir -p $out/lib

From d8666c03281885412c0a07f6699983f9e30f22a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Thu, 18 Aug 2022 15:51:12 +1000
Subject: [PATCH 078/149] zellij: fix changelog location

---
 pkgs/tools/misc/zellij/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix
index ac4d926a2eda..b21beb9dbbdc 100644
--- a/pkgs/tools/misc/zellij/default.nix
+++ b/pkgs/tools/misc/zellij/default.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "A terminal workspace with batteries included";
     homepage = "https://zellij.dev/";
-    changelog = "https://github.com/zellij-org/zellij/blob/v${version}/Changelog.md";
+    changelog = "https://github.com/zellij-org/zellij/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ therealansh _0x4A6F abbe thehedgeh0g ];
   };

From d2a0defa04d490db7c0cd0c72448ef5273b1093d Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Thu, 18 Aug 2022 08:18:30 +0200
Subject: [PATCH 079/149] ungoogled-chromium: 104.0.5112.81 -> 104.0.5112.102

---
 .../networking/browsers/chromium/upstream-info.json       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index cda4a3738812..2a617587775c 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -45,8 +45,8 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "104.0.5112.81",
-    "sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y",
+    "version": "104.0.5112.102",
+    "sha256": "0sjpmfln6c96c2i83q8c2v1jfii8527951nbnyqi0g4wam5jqrfj",
     "sha256bin64": null,
     "deps": {
       "gn": {
@@ -56,8 +56,8 @@
         "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra"
       },
       "ungoogled-patches": {
-        "rev": "104.0.5112.81-1",
-        "sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w"
+        "rev": "104.0.5112.102-1",
+        "sha256": "06l6af4a6ywjn6x02dgb5ywk057p30rylrvr483iwvrj4jlhqvii"
       }
     }
   }

From a06e854f239c0cafc9e35cdaa233568fb3affeab Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 11 Aug 2022 08:43:27 +0200
Subject: [PATCH 080/149] ocamlPackages.cmdliner_1_1: disable for OCaml < 4.08

---
 pkgs/development/ocaml-modules/cmdliner/1_1.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
index 001d967fca1b..9e7f6db6e695 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
@@ -1,5 +1,8 @@
 { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
 
+lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
+  "cmdliner 1.1 is not available for OCaml ${ocaml.version}"
+
 stdenv.mkDerivation rec {
   pname = "cmdliner";
   version = "1.1.1";
@@ -9,7 +12,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-oa6Hw6eZQO+NHdWfdED3dtHckm4BmEbdMiAuRkYntfs=";
   };
 
-  minimalOCamlVersion = "4.08";
   nativeBuildInputs = [ ocaml ];
 
   makeFlags = [ "PREFIX=$(out)" ];

From ec8d3bc39b8c9b805a15ded2ce2b5e153d0736fe Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 11 Aug 2022 08:31:24 +0200
Subject: [PATCH 081/149] =?UTF-8?q?ocamlPackages.crunch:=203.1.0=20?=
 =?UTF-8?q?=E2=86=92=203.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/crunch/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix
index 07082b7f5d22..54f6639fbeba 100644
--- a/pkgs/development/tools/ocaml/crunch/default.nix
+++ b/pkgs/development/tools/ocaml/crunch/default.nix
@@ -1,18 +1,18 @@
-{ lib, buildDunePackage, fetchurl, ocaml, cmdliner, ptime }:
+{ lib, buildDunePackage, fetchurl, ocaml, cmdliner_1_1, ptime }:
 
 buildDunePackage rec {
 
   pname = "crunch";
-  version = "3.1.0";
-
-  useDune2 = true;
+  version = "3.3.1";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-v${version}.tbz";
-    sha256 = "0d26715a4h9r1wibnc12xy690m1kan7hrcgbb5qk8x78zsr67lnf";
+    url = "https://github.com/mirage/ocaml-crunch/releases/download/v${version}/crunch-${version}.tbz";
+    sha256 = "sha256-LFug1BELy7dzHLpOr7bESnSHw/iMGtR0AScbaf+o7Wo=";
   };
 
-  propagatedBuildInputs = [ cmdliner ptime ];
+  buildInputs = [ cmdliner_1_1 ];
+
+  propagatedBuildInputs = [ ptime ];
 
   outputs = [ "lib" "bin" "out" ];
 

From 86f9d4bdcd5a8e7206c86f0fcc6776816cc6681d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 18 Aug 2022 07:30:37 +0000
Subject: [PATCH 082/149] imagemagick: 7.1.0-45 -> 7.1.0-46

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 92b8164f8b65..5444bbc0bd41 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -46,13 +46,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "imagemagick";
-  version = "7.1.0-45";
+  version = "7.1.0-46";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     rev = version;
-    hash = "sha256-fiygwb15dbMyTZ62iWbhWaHpdmoK4rKeb46v0sojgpc=";
+    hash = "sha256-yts86tQMPgdF9Zk1vljVza21mlx1g3XcoHjvtsMoZhA=";
   };
 
   outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

From e5d7d6a7e436109a8e52d9b7a8a68a2d86e9f612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 18 Aug 2022 07:50:16 +0000
Subject: [PATCH 083/149] gpg-tui: 0.9.0 -> 0.9.1

https://github.com/orhun/gpg-tui/blob/v0.9.1/CHANGELOG.md
---
 pkgs/tools/security/gpg-tui/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix
index 7e4d6f672f7e..4ab4d468d068 100644
--- a/pkgs/tools/security/gpg-tui/default.nix
+++ b/pkgs/tools/security/gpg-tui/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gpg-tui";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "gpg-tui";
     rev = "v${version}";
-    hash = "sha256-iIMpAAIw6djLNP9lnrHV7D198VcHspQP4OHcr2LNKOA=";
+    hash = "sha256-eUUHH6bPfYjkHo7C7GWzewTpT8je7TQK9M8mTM5v59s=";
   };
 
-  cargoHash = "sha256-xrv1tFzPReHDA+gr/RPCvSM7Sa7v8OKAEY+fSUjPT50=";
+  cargoHash = "sha256-GtSvDfG9lRUirm4d6PSaOBLTHZJT2PH0Sx/9GVquX5M=";
 
   nativeBuildInputs = [
     gpgme # for gpgme-config

From 1f6892c38ab5a5f08d224cc42cd667cbb921ca51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Aug 2022 10:05:05 +0200
Subject: [PATCH 084/149] python310Packages.papermill:  add pythonImportsCheck

- disable on older Python releases
- add extra requirements
---
 .../python-modules/papermill/default.nix      | 73 ++++++++++++-------
 1 file changed, 46 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix
index 8e1ab4d4a12b..d9de15ad76ee 100644
--- a/pkgs/development/python-modules/papermill/default.nix
+++ b/pkgs/development/python-modules/papermill/default.nix
@@ -1,54 +1,69 @@
 { lib
-, buildPythonPackage
-, fetchPypi
 , ansiwrap
+, azure-datalake-store
+, azure-storage-blob
+, boto3
+, buildPythonPackage
 , click
-, future
-, pyyaml
-, nbformat
-, nbconvert
-, nbclient
-, six
-, tqdm
-, jupyter-client
-, requests
 , entrypoints
-, tenacity
-, futures ? null
-, backports_tempfile
-, isPy27
-, pytestCheckHook
+, fetchPypi
+, gcsfs
+, nbclient
+, nbformat
+, pyarrow
+, PyGithub
 , pytest-mock
+, pytestCheckHook
+, pythonOlder
+, pyyaml
+, requests
+, tenacity
+, tqdm
 }:
 
 buildPythonPackage rec {
   pname = "papermill";
   version = "2.4.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic=";
+    hash = "sha256-b4+KmwazlnfyB8CRAMjThrz1kvDLvdqfD1DoFEVpdic=";
   };
 
   propagatedBuildInputs = [
     ansiwrap
     click
-    future
     pyyaml
     nbformat
-    nbconvert
     nbclient
-    six
     tqdm
-    jupyter-client
     requests
     entrypoints
     tenacity
-  ] ++ lib.optionals isPy27 [
-    futures
-    backports_tempfile
   ];
 
+  passthru.optional-dependencies = {
+    azure = [
+      azure-datalake-store
+      azure-storage-blob
+    ];
+    gcs = [
+      gcsfs
+    ];
+    github = [
+      PyGithub
+    ];
+    hdfs = [
+      pyarrow
+    ];
+    s3 = [
+      boto3
+    ];
+  };
+
   checkInputs = [
     pytestCheckHook
     pytest-mock
@@ -58,13 +73,17 @@ buildPythonPackage rec {
     export HOME=$(mktemp -d)
   '';
 
-  # the test suite depends on cloud resources azure/aws
+  # The test suite depends on cloud resources azure/aws
   doCheck = false;
 
+  pythonImportsCheck = [
+    "papermill"
+  ];
+
   meta = with lib; {
-    description = "Parametrize and run Jupyter and nteract Notebooks";
+    description = "Parametrize and run Jupyter and interact with notebooks";
     homepage = "https://github.com/nteract/papermill";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 994890bfe6b4da65ad2670fa780527d478d14c70 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 18 Aug 2022 07:55:21 +0300
Subject: [PATCH 085/149] tempo: 1.4.1 -> 1.5.0

---
 pkgs/servers/tracing/tempo/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix
index 19f2df40ed45..d058a0b2931a 100644
--- a/pkgs/servers/tracing/tempo/default.nix
+++ b/pkgs/servers/tracing/tempo/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "tempo";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tempo";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-kxR+xwhthsK3gThs0jPJfWlsRG35kCuWvKH3Wr7ENTs=";
+    sha256 = "sha256-m7tfDd0Yjg4+VHZPxYJXEx2XNNodepMcPLucBjvd88s=";
   };
 
   vendorSha256 = null;
@@ -17,12 +17,19 @@ buildGoModule rec {
   subPackages = [
     "cmd/tempo-cli"
     "cmd/tempo-query"
-    # FIXME: build is broken upstream, enable for next release
-    # "cmd/tempo-serverless"
+    "cmd/tempo-serverless"
     "cmd/tempo-vulture"
     "cmd/tempo"
   ];
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Version=${version}"
+    "-X=main.Branch=<release>"
+    "-X=main.Revision=${version}"
+  ];
+
   # tests use docker
   doCheck = false;
 

From 8be789f7f121f140a86cfe7e3d28983835fee6a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 08:15:24 +0000
Subject: [PATCH 086/149] checkSSLCert: 2.36.0 -> 2.37.0

---
 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index b8e1c9e1ebfc..2d122bf58d2c 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "check_ssl_cert";
-  version = "2.36.0";
+  version = "2.37.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    hash = "sha256-J+sjJEZlkNWGAt66iwNmlIgqzRgp3nKO62FzSXN4cGE=";
+    hash = "sha256-+1Io0sA+ZaGPReNfCTEnTzG3o0R6XyvpyA8bhXpEduM=";
   };
 
   nativeBuildInputs = [

From 5369167b7dea306772b074756771ce7f15d71e21 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 18 Aug 2022 10:37:55 +0200
Subject: [PATCH 087/149] chromium: 104.0.5112.79 -> 104.0.5112.101

https://chromereleases.googleblog.com/2022/08/stable-channel-update-for-desktop_16.html

This update includes 11 security fixes. Google is aware that an exploit
for CVE-2022-2856 exists in the wild.

CVEs:
CVE-2022-2852 CVE-2022-2854 CVE-2022-2855 CVE-2022-2857 CVE-2022-2858
CVE-2022-2853 CVE-2022-2856 CVE-2022-2859 CVE-2022-2860 CVE-2022-2861
---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index cda4a3738812..12dc5b3edcbc 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -1,8 +1,8 @@
 {
   "stable": {
-    "version": "104.0.5112.79",
-    "sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw",
-    "sha256bin64": "1m09bbh6a4sm5i0n8z2wy0hb8s7w0c2d335mpyrmndzs45py5ggx",
+    "version": "104.0.5112.101",
+    "sha256": "0nrghgngxdn9richjnxii9y94dg5zpwc3gd3vx609r4xaphibw30",
+    "sha256bin64": "1cj2mi3g5wl376wc52jgqg28h7izbsqm2gji526zkhmgb7rwq4sw",
     "deps": {
       "gn": {
         "version": "2022-06-08",

From d0bbad1246388649ab824261abeee1012dff51b2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 18 Aug 2022 10:37:55 +0200
Subject: [PATCH 088/149] chromiumBeta: 105.0.5195.28 -> 105.0.5195.37

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index cda4a3738812..12ab654ccdeb 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
     }
   },
   "beta": {
-    "version": "105.0.5195.28",
-    "sha256": "14hy1f59ypsvqmrp0k4kv5cfcw48dizw4nkmigaxxv4bnmpwlcy1",
-    "sha256bin64": "0rgv1r94z91khzwmf1scnnsz9yqks6ygicl7bdsdbckw69njq91z",
+    "version": "105.0.5195.37",
+    "sha256": "0ffzphr66z3g3l695b5liswpfp0577knn06mzdmwq9x1lk87cwiq",
+    "sha256bin64": "1cfkjzqwj4s5djzl2rka9kbc28i6zph0xqv1534cb68hzgwy171a",
     "deps": {
       "gn": {
         "version": "2022-07-11",

From e54bfd3ed3159bfccdec20356d6b25889f572628 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 12 Aug 2022 11:20:05 +0200
Subject: [PATCH 089/149] =?UTF-8?q?coqPackages.coq-record-update:=200.3.0?=
 =?UTF-8?q?=20=E2=86=92=200.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/coq-modules/coq-record-update/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix
index 63b97b07dd7b..fcc7b0362a0b 100644
--- a/pkgs/development/coq-modules/coq-record-update/default.nix
+++ b/pkgs/development/coq-modules/coq-record-update/default.nix
@@ -1,12 +1,13 @@
-{ lib, mkCoqDerivation, coq, version ? null , paco, coq-ext-lib }:
+{ lib, mkCoqDerivation, coq, version ? null }:
 
 with lib; mkCoqDerivation rec {
   pname = "coq-record-update";
   owner = "tchajed";
   inherit version;
   defaultVersion = with versions; switch coq.coq-version [
-    { case = range "8.10" "8.16";  out = "0.3.0"; }
+    { case = range "8.10" "8.16";  out = "0.3.1"; }
   ] null;
+  release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk=";
   release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z";
   releaseRev = v: "v${v}";
   buildFlags = "NO_TEST=1";

From 8cecd7cb82a9a5094d783a6bb447cb5c68d5d0c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 08:51:28 +0000
Subject: [PATCH 090/149] git-machete: 3.11.6 -> 3.12.0

---
 .../version-management/git-and-tools/git-machete/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
index 9577d1c41fd0..b5c251f247af 100644
--- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.11.6";
+  version = "3.12.0";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-W2OYJO3UnBcZRoIyTRj3Wz7J91zDWrrYPH5OnYvXi24=";
+    sha256 = "sha256-o4OVA9cv+/JLiTUnDEAI/yj+YmOulFrX5XmlRZAb2vw=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 10881441a5bbde2c7bdcd49ed4aee2b08093dd5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 08:56:49 +0000
Subject: [PATCH 091/149] copilot-cli: 1.20.0 -> 1.21.0

---
 pkgs/tools/admin/copilot-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix
index c58adf042d71..149232c697a6 100644
--- a/pkgs/tools/admin/copilot-cli/default.nix
+++ b/pkgs/tools/admin/copilot-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "copilot-cli";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-l6XFaM5eShXrpuZgTfzceNu8U7Z5WnKBi/qoimj/8HM=";
+    sha256 = "sha256-zGmb3EvWkGGJuq9R3GWEfHZvFn7DMC6B6Onk06mFiWI=";
   };
 
-  vendorSha256 = "sha256-AXwiccfSxeX0NDIODEK+JvVjhcBNNpnZnLKGlDPWy48=";
+  vendorSha256 = "sha256-8avzCfCBSVLsWUgBBiD4pYTWrd2X2rdruU5v+AJ3EKY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 4e030e5221f7a3d2858cab0ae8b22e1a2174a95b Mon Sep 17 00:00:00 2001
From: Piper McCorkle <contact@piperswe.me>
Date: Thu, 18 Aug 2022 04:04:02 -0500
Subject: [PATCH 092/149] flyctl: add "fly" alias

This alias is installed by the upstream install script: https://fly.io/install.sh
---
 pkgs/development/web/flyctl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 5ecb5c5b9469..430621059893 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -42,6 +42,7 @@ buildGoModule rec {
       --bash <($out/bin/flyctl completion bash) \
       --fish <($out/bin/flyctl completion fish) \
       --zsh <($out/bin/flyctl completion zsh)
+     ln -s $out/bin/flyctl $out/bin/fly
   '';
 
   passthru.tests.version = testers.testVersion {

From 60e47734f65967fefaf64a2a84464c8f067491a9 Mon Sep 17 00:00:00 2001
From: Benno Bielmeier <nix@bbenno.com>
Date: Thu, 18 Aug 2022 11:15:09 +0200
Subject: [PATCH 093/149] kanboard: correct homepage url

The Kanboard GitHub Repo [1] references https://kanboard.org, not the
https://kanboard.net.

[1]: https://github.com/kanboard/kanboard
---
 pkgs/applications/misc/kanboard/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index 49e8688cb59c..10b08bed506d 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Kanban project management software";
-    homepage = "https://kanboard.net";
+    homepage = "https://kanboard.org";
     license = licenses.mit;
     maintainers = with maintainers; [ lheckemann ];
   };

From 8d92d42c5c6c19e3ef5d9e01f94bde763364c48b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 18 Aug 2022 11:34:06 +0200
Subject: [PATCH 094/149] nixos/sssd: fix typo

---
 nixos/modules/services/misc/sssd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 039c9737b1f4..299002d516da 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -6,7 +6,7 @@ let
 
   dataDir = "/var/lib/sssd";
   settingsFile = "${dataDir}/sssd.conf";
-  settingsFileUnsubstituted = pkgs.writeText "${dataDir}/sssd-unsubsituted.conf" cfg.config;
+  settingsFileUnsubstituted = pkgs.writeText "${dataDir}/sssd-unsubstituted.conf" cfg.config;
 in {
   options = {
     services.sssd = {

From 2f0bd926ea9c15b9b76c25410ce3dd7c2bdda869 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 18 Aug 2022 11:34:20 +0200
Subject: [PATCH 095/149] nixos/sssd-ldap: fix eval

Introduced by fd7d901133f9fbfc893cdb33f7d630846bb21f9c. The openldap
module now expects the database directory to be below
`/var/lib/openldap`, oterhwise it'll fail evaluation like this:

    Failed assertions:
    - Database dc=example,dc=org has `olcDbDirectory` (/var/db/openldap) that is not a subdirectory of
    `/var/lib/openldap/`.
---
 nixos/tests/sssd-ldap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index f816c0652cc5..2b328f71d17c 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -28,7 +28,7 @@ in import ./make-test-python.nix ({pkgs, ...}: {
             attrs = {
               objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ];
               olcDatabase = "{1}mdb";
-              olcDbDirectory = "/var/db/openldap";
+              olcDbDirectory = "/var/lib/openldap/db";
               olcSuffix = dbSuffix;
               olcRootDN = "cn=${ldapRootUser},${dbSuffix}";
               olcRootPW = ldapRootPassword;

From 204d32c5c1be0d172d7c6a1840334994979eb0d3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 18 Aug 2022 11:37:43 +0200
Subject: [PATCH 096/149] nixos/sssd-ldap: verify that passing secrets via env
 works

---
 nixos/tests/sssd-ldap.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index 2b328f71d17c..27dce6ceb98c 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -67,6 +67,8 @@ in import ./make-test-python.nix ({pkgs, ...}: {
 
     services.sssd = {
       enable = true;
+      # just for testing purposes, don't put this into the Nix store in production!
+      environmentFile = "${pkgs.writeText "ldap-root" "LDAP_BIND_PW=${ldapRootPassword}"}";
       config = ''
         [sssd]
         config_file_version = 2
@@ -80,7 +82,7 @@ in import ./make-test-python.nix ({pkgs, ...}: {
         ldap_search_base = ${dbSuffix}
         ldap_default_bind_dn = cn=${ldapRootUser},${dbSuffix}
         ldap_default_authtok_type = password
-        ldap_default_authtok = ${ldapRootPassword}
+        ldap_default_authtok = $LDAP_BIND_PW
       '';
     };
   };

From 5ec8223e637bf89fd6f8e122ce9f0ff7bde36204 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 18 Aug 2022 11:38:49 +0200
Subject: [PATCH 097/149] nixos/sssd: explain why we use EnvironmentFile=

---
 nixos/modules/services/misc/sssd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 299002d516da..60d4a799d5d2 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -99,6 +99,7 @@ in {
           Type = "forking";
           PIDFile = "/run/sssd.pid";
           StateDirectory = baseNameOf dataDir;
+          # We cannot use LoadCredential here because it's not available in ExecStartPre
           EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
         };
         preStart = ''

From 19b9cb7ce0ee247cc390a020e4d5c4458c5a706c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 07:04:45 +0000
Subject: [PATCH 098/149] lldpd: 1.0.14 -> 1.0.15

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

diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix
index f4830ad408ac..22ae4cb210c2 100644
--- a/pkgs/tools/networking/lldpd/default.nix
+++ b/pkgs/tools/networking/lldpd/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lldpd";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchurl {
     url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz";
-    sha256 = "sha256-p0gZIU8Ral28QHo9SQyqAbpAGiSVF6yCajdAWcEtEug=";
+    sha256 = "sha256-9/46EwvpihnEkUee9g82uO5Bqea8TX8sQQM/Y5VqMSY=";
   };
 
   configureFlags = [

From 7aeb316e7e6884aa4aa4291106f775fd07ab0598 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Aug 2022 18:06:03 +0300
Subject: [PATCH 099/149] linux: 5.15.60 -> 5.15.61

---
 pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix
index 636ec481748b..4bf8303b2a41 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.15.60";
+  version = "5.15.61";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0yi3bvqz4qn8nvgr910ic09zvpisafwi282j0y2gvbvgr7vlb59d";
+    sha256 = "0hpx0ziz162lc41jwi2ybj3qgidinjcsp71lchvmp6h0vyiddj9v";
   };
 } // (args.argsOverride or { }))

From 636c6b3fade74cbf9fdf66f6bebcd62930a89a64 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Aug 2022 18:06:09 +0300
Subject: [PATCH 100/149] linux: 5.18.17 -> 5.18.18

---
 pkgs/os-specific/linux/kernel/linux-5.18.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.18.nix b/pkgs/os-specific/linux/kernel/linux-5.18.nix
index ebba401dd671..096f197a1a1c 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.18.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.18.17";
+  version = "5.18.18";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0i7yms65b8kxjm92ahic0787vb9h7xblbwp1v6cq8zpns3ivv0ih";
+    sha256 = "0as0cslwz6zdiwd5wzcjggw3qpa9hzvfmxlhy72jdhn5vk47dhy1";
   };
 } // (args.argsOverride or { }))

From 7413d509cd3821ebc211645800e4e45b0ddf7a28 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Aug 2022 18:06:14 +0300
Subject: [PATCH 101/149] linux: 5.19.1 -> 5.19.2

---
 pkgs/os-specific/linux/kernel/linux-5.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix
index 79d106150b4b..09e226ba3410 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.19.1";
+  version = "5.19.2";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0mgak94i4z9s1kdyw211ks4si4ngaii71xdiin06pim2ds97pqpl";
+    sha256 = "0gg63y078k886clgfq4k5n7nh2r0359ksvf8wd06rv01alghmr28";
   };
 } // (args.argsOverride or { }))

From 4789b92366957e910e9c1e654d2e7a964b0a7cc4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 17 Aug 2022 18:07:04 +0300
Subject: [PATCH 102/149] linux/hardened/patches/5.4: 5.4.208-hardened1 ->
 5.4.210-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index 267de2fb7474..35ef199c9d6a 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -52,11 +52,11 @@
     "5.4": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-5.4.208-hardened1.patch",
-            "sha256": "0pknl9ac0qn8yig1hfm3hmlmvf5pxswymyilv0w3kcsacgg22xyi",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.208-hardened1/linux-hardened-5.4.208-hardened1.patch"
+            "name": "linux-hardened-5.4.210-hardened1.patch",
+            "sha256": "0qbz9h97m0lxa45j85sv2lhhmrlx9nv5z0bf5vdhyq6g0h7d2mm9",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.210-hardened1/linux-hardened-5.4.210-hardened1.patch"
         },
-        "sha256": "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh",
-        "version": "5.4.208"
+        "sha256": "13l8zh5balciqhi4k4328sznza30v8g871wxcqqka61cij3rc0wl",
+        "version": "5.4.210"
     }
 }

From 5f06e7ac034a2bebcbd625c55af2bb1839b90fd1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 18 Aug 2022 12:12:21 +0200
Subject: [PATCH 103/149] libportal: update patches

---
 pkgs/development/libraries/libportal/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libportal/default.nix b/pkgs/development/libraries/libportal/default.nix
index 29080f119cd4..93ca52c243c6 100644
--- a/pkgs/development/libraries/libportal/default.nix
+++ b/pkgs/development/libraries/libportal/default.nix
@@ -30,11 +30,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A=";
   };
 
+  # TODO: remove on 0.7
   patches = [
+    # https://github.com/flatpak/libportal/pull/107
     (fetchpatch {
-      name = "fix-build-on-darwin.patch";
-      url = "https://github.com/flatpak/libportal/pull/106/commits/73f63ee57669c4fa604a7772484cd235d4fb612c.patch";
-      sha256 = "sha256-c9WUQPhn4IA3X1ie7SwnxuZXdvpPkpGdU4xgDwKN/L0=";
+      name = "check-presence-of-sys-vfs-h.patch";
+      url = "https://github.com/flatpak/libportal/commit/e91a5d2ceb494ca0dd67295736e671b0142c7540.patch";
+      sha256 = "sha256-uFyhlU2fJgW4z0I31fABdc+pimLFYkqM4lggSIFs1tw=";
     })
   ];
 

From 69ce8a09493860112ed0447023418a82132977f0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 18 Aug 2022 11:12:44 +0100
Subject: [PATCH 104/149] mc, pkgsCross.ppc64.mc: fixx cross-build by adding
 PERL_FOR_BUILD

Without the change build system tries to execute perl for host (instead
of build) and fails as:

    install: cannot stat './mc.hlp.es': No such file or directory

The change pulls patch pending upstream inclusion where `PERL_FOR_BUILD`
is introduced to complement `PERL` for such cases.
---
 pkgs/applications/file-managers/mc/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix
index 6f80c2c5e928..0153b8fe93c6 100644
--- a/pkgs/applications/file-managers/mc/default.nix
+++ b/pkgs/applications/file-managers/mc/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchurl
+, buildPackages
 , pkg-config
 , glib
 , gpm
@@ -31,6 +32,15 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-6ZTZvppxcumsSkrWIQeSH2qjEuZosFbf5bi867r1OAM=";
   };
 
+  patches = [
+    # Add support for PERL_FOR_BUILD to fix cross-compilation:
+    #   https://midnight-commander.org/ticket/4399
+    (fetchurl {
+      url = "https://midnight-commander.org/raw-attachment/ticket/4399/0001-configure.ac-introduce-PERL_FOR_BUILD.patch";
+      hash = "sha256-i4cbg/pner+yPfgmP04DEIvpNDlM9YDca1TNBdhWhwI=";
+    })
+  ];
+
   nativeBuildInputs = [ pkg-config autoreconfHook unzip ]
     # The preFixup hook rewrites the binary, which invaliates the code
     # signature. Add the fixup hook to sign the output.
@@ -52,7 +62,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = [ "PERL=${perl}/bin/perl" ];
+  configureFlags = [
+    # used for vfs helpers at run time:
+    "PERL=${perl}/bin/perl"
+    # used for .hlp generation at build time:
+    "PERL_FOR_BUILD=${buildPackages.perl}/bin/perl"
+  ];
 
   postPatch = ''
     substituteInPlace src/filemanager/ext.c \

From e2773fb42bf8a5144449eb22d6943107514844e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 10:36:26 +0000
Subject: [PATCH 105/149] gitoxide: 0.13.0 -> 0.14.0

---
 pkgs/applications/version-management/gitoxide/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix
index 51463162743d..22004d76365e 100644
--- a/pkgs/applications/version-management/gitoxide/default.nix
+++ b/pkgs/applications/version-management/gitoxide/default.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gitoxide";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "gitoxide";
     rev = "v${version}";
-    sha256 = "sha256-NdZ39F6nSuLZNOdoxRs79OR6I3oFASXHzm/hecDyxNI=";
+    sha256 = "sha256-lppg5x2VMzRo4SqAFgtiklc1WfTXi/jty92Z91CxZPM=";
   };
 
-  cargoSha256 = "sha256-6uRLW1KJF0yskEfWm9ERQIDgVnerAhQFbMaxhnEDIOc=";
+  cargoSha256 = "sha256-j4riS3OzfbEriAlqcjq6GcyTrK5sjFEopMesmWTGxp4=";
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = if stdenv.isDarwin

From 6ff0b472f7fad88777b31c85a3c539101553858a Mon Sep 17 00:00:00 2001
From: Piper McCorkle <contact@piperswe.me>
Date: Thu, 18 Aug 2022 05:39:39 -0500
Subject: [PATCH 106/149] flyctl: fix indentation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Stanisław Pitucha <viraptor@gmail.com>
---
 pkgs/development/web/flyctl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index 430621059893..495f946fe267 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
       --bash <($out/bin/flyctl completion bash) \
       --fish <($out/bin/flyctl completion fish) \
       --zsh <($out/bin/flyctl completion zsh)
-     ln -s $out/bin/flyctl $out/bin/fly
+    ln -s $out/bin/flyctl $out/bin/fly
   '';
 
   passthru.tests.version = testers.testVersion {

From 7ea5e9dcab513884f913a3a8b21bc511866947ef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Aug 2022 12:45:25 +0200
Subject: [PATCH 107/149] python310Packages.censys: 2.1.7 -> 2.1.8

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

diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 432958255d2c..ee4ced91c6a9 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "censys";
-  version = "2.1.7";
+  version = "2.1.8";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "censys";
     repo = "censys-python";
     rev = "v${version}";
-    hash = "sha256-1GJef+6Aqah9W9yPwqD8QCh0sNn/X9UwlzmsCk51QMY=";
+    hash = "sha256-iPCFflibEqA286j+7Vp4ZQaO9e6Bp+o7A/a7DELJcxA=";
   };
 
   nativeBuildInputs = [

From 6d4104359eb3f9d6a340e8206a8f74a1c04d05be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Aug 2022 12:50:03 +0200
Subject: [PATCH 108/149] python310Packages.aiocoap: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/development/python-modules/aiocoap/default.nix b/pkgs/development/python-modules/aiocoap/default.nix
index 2e8fd124fa2b..db9cb191c9cf 100644
--- a/pkgs/development/python-modules/aiocoap/default.nix
+++ b/pkgs/development/python-modules/aiocoap/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "aiocoap";
-  version = "0.4.3";
+  version = "0.4.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "chrysn";
     repo = pname;
     rev = version;
-    sha256 = "sha256-fTRDx9VEXDoMKM78YYL+mBEdvhbLtHiHdo66kwRnNhA=";
+    sha256 = "sha256-m/tU1qf+CB9/2eoXktpBSgwjj8lMuMQ/WGYL6HhMNxA=";
   };
 
   propagatedBuildInputs = [

From 347e5f473e7de7856d364063d1d46f3b768b0463 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 18 Aug 2022 11:48:48 +0100
Subject: [PATCH 109/149] mc: stop retaining configure arguments in the final
 binary

Reduces closure size of cross-compiled binary a bit by not retaining
build-time perl and friends.

Before:

    $ nix path-info -Sh $(nix-build -A pkgsCross.ppc64.mc) | unnix
    /<<NIX>>/mc-powerpc64-unknown-linux-gnu-4.8.28   273.7M

After:

    $ nix path-info -Sh $(nix-build -A pkgsCross.ppc64.mc) | unnix
    /<<NIX>>/mc-powerpc64-unknown-linux-gnu-4.8.28   198.6M
---
 pkgs/applications/file-managers/mc/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/applications/file-managers/mc/default.nix
index 0153b8fe93c6..d261dab6e6e2 100644
--- a/pkgs/applications/file-managers/mc/default.nix
+++ b/pkgs/applications/file-managers/mc/default.nix
@@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
     "PERL=${perl}/bin/perl"
     # used for .hlp generation at build time:
     "PERL_FOR_BUILD=${buildPackages.perl}/bin/perl"
+
+    # configure arguments have a bunch of build-only dependencies.
+    # Avoid their retention in final closure.
+    "--disable-configure-args"
   ];
 
   postPatch = ''
@@ -77,11 +81,6 @@ stdenv.mkDerivation rec {
       --replace /bin/cat ${coreutils}/bin/cat
   '';
 
-  preFixup = ''
-    # remove unwanted build-dependency references
-    sed -i -e "s!PKG_CONFIG_PATH=''${PKG_CONFIG_PATH}!PKG_CONFIG_PATH=$(echo "$PKG_CONFIG_PATH" | sed -e 's/./0/g')!" $out/bin/mc
-  '';
-
   postFixup = lib.optionalString (!stdenv.isDarwin) ''
     # libX11.so is loaded dynamically so autopatch doesn't detect it
     patchelf \

From d31b3a3edd6af89c5a75276a3043048eb8d46a3c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Aug 2022 13:13:07 +0200
Subject: [PATCH 110/149] python310Packages.pyshark: remove stale comment

---
 pkgs/development/python-modules/pyshark/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index d92c58ec88bc..cadd47ca07b1 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -20,8 +20,6 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "KimiNewt";
     repo = pname;
-    # 0.4.5 was the last release which was tagged
-    # https://github.com/KimiNewt/pyshark/issues/541
     rev = "refs/tags/v${version}";
     hash = "sha256-byll2GWY2841AAf8Xh+KfaCOtMGVKabTsLCe3gCdZ1o=";
   };
@@ -36,7 +34,7 @@ buildPythonPackage rec {
   ];
 
   preCheck = ''
-    export HOME=$TMPDIR
+    export HOME=$(mktemp -d)
   '';
 
   checkInputs = [

From 600fb49fa1213784b66c3663a17263456debba0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Aug 2022 21:43:23 +0000
Subject: [PATCH 111/149] signal-cli: 0.10.10 -> 0.10.11

---
 .../networking/instant-messengers/signal-cli/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 633abdfa3ec8..dd2a34a60fa4 100644
--- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.10.10";
+  version = "0.10.11";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz";
-    sha256 = "sha256-VXL4eeBK8hY5gw8tAdqKQGOc+z1AOAPDyHfBe/fDONc=";
+    sha256 = "sha256-tBgtSYKSoyze9qFWpy6IUdwMU9KCLZGEIpOkjLdHsHM=";
   };
 
   buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];

From a9cd728f69a7267d15d004db99ba7e2c0aee89e3 Mon Sep 17 00:00:00 2001
From: MayNiklas <info@niklas-steffen.de>
Date: Thu, 18 Aug 2022 13:39:52 +0200
Subject: [PATCH 112/149] python3Packages.discordpy: 1.7.3 -> 2.0.0

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

diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index aa88147ae7fd..f4450f2fea51 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "discord.py";
-  version = "1.7.3";
+  version = "2.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "Rapptz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-eKXCzGFSzxpdZed4/4G6uJ96s5yCm6ci8K8XYR1zQlE=";
+    sha256 = "sha256-BhxXsNRgs/ihnlTxNwYTjRwPvneyDF8Q0wS3qr2BG9Q=";
   };
 
   propagatedBuildInputs = [
@@ -34,8 +34,6 @@ buildPythonPackage rec {
   patchPhase = ''
     substituteInPlace "discord/opus.py" \
       --replace "ctypes.util.find_library('opus')" "'${libopus}/lib/libopus.so.0'"
-    substituteInPlace requirements.txt \
-      --replace "aiohttp>=3.6.0,<3.8.0" "aiohttp>=3.6.0,<4"
   '' + lib.optionalString withVoice ''
     substituteInPlace "discord/player.py" \
       --replace "executable='ffmpeg'" "executable='${ffmpeg}/bin/ffmpeg'"

From 936f70de166eb2c6d0a32d53c31bc329477dcea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Thu, 18 Aug 2022 14:21:04 +0200
Subject: [PATCH 113/149] cvise: add tests back

---
 pkgs/development/tools/misc/cvise/default.nix | 60 +++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix
index 6db4a89becbd..47dde66e79cb 100644
--- a/pkgs/development/tools/misc/cvise/default.nix
+++ b/pkgs/development/tools/misc/cvise/default.nix
@@ -1,6 +1,16 @@
-{ lib, buildPythonApplication, fetchFromGitHub, bash, cmake, flex
-, libclang, llvm, unifdef
-, chardet, pebble, psutil
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, bash
+, cmake
+, flex
+, libclang
+, llvm
+, unifdef
+, chardet
+, pebble
+, psutil
+, pytestCheckHook
 }:
 
 buildPythonApplication rec {
@@ -19,18 +29,48 @@ buildPythonApplication rec {
     ./unifdef.patch
   ];
 
-  nativeBuildInputs = [ cmake flex llvm.dev ];
-  buildInputs = [ bash libclang llvm llvm.dev unifdef ];
-  propagatedBuildInputs = [ chardet pebble psutil ];
-
-  # 'cvise --command=...' generates a script with hardcoded shebang.
   postPatch = ''
+    # 'cvise --command=...' generates a script with hardcoded shebang.
     substituteInPlace cvise.py \
       --replace "#!/bin/bash" "#!${bash}/bin/bash"
+
+    substituteInPlace setup.cfg \
+      --replace "--flake8" ""
   '';
 
-  # pytest-flake8 is broken in nixpkgs: https://github.com/tholo/pytest-flake8/issues/87
-  doCheck = false;
+  nativeBuildInputs = [
+    cmake
+    flex
+    llvm.dev
+  ];
+
+  buildInputs = [
+    libclang
+    llvm
+    llvm.dev
+    unifdef
+  ];
+
+  propagatedBuildInputs = [
+    chardet
+    pebble
+    psutil
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    unifdef
+  ];
+
+  preCheck = ''
+    patchShebangs cvise.py
+  '';
+
+  disabledTests = [
+    # Needs gcc, fails when run noninteractively (without tty).
+    "test_simple_reduction"
+  ];
+
   dontUsePipInstall = true;
   dontUseSetuptoolsBuild = true;
   dontUseSetuptoolsCheck = true;

From b77f3507bb6f9d213c64c3374f70ae953725ea41 Mon Sep 17 00:00:00 2001
From: be7a <bela.stoyan@gmail.com>
Date: Thu, 18 Aug 2022 14:25:28 +0200
Subject: [PATCH 114/149] pferd: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/tools/misc/pferd/default.nix b/pkgs/tools/misc/pferd/default.nix
index 518547e18378..8bd95b6fc651 100644
--- a/pkgs/tools/misc/pferd/default.nix
+++ b/pkgs/tools/misc/pferd/default.nix
@@ -5,14 +5,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pferd";
-  version = "3.4.0";
+  version = "3.4.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Garmelon";
     repo = "PFERD";
     rev = "v${version}";
-    sha256 = "1nwrkc0z2zghy2nk9hfdrffg1k8anh3mn3hx31ql8xqwhv5ksh9g";
+    sha256 = "05f9b7wzld0jcalc7n5h2a6nqjr1w0fxwkd4cih6gkjc9117skii";
   };
 
   propagatedBuildInputs = with python3Packages; [

From a4d72ad6289a81b73e000617f9c9efc7f1d17499 Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Wed, 18 May 2022 09:41:54 -0400
Subject: [PATCH 115/149] nixos/keter: init

Enable keter module

Keter is an apploader which:
1. has the old app running on a port.
2. loads a new one, and wait for that to complete
3. switches the old with the new one once the new one finished loading.

It supports more functionality but this use case
is the primary one being used by supercede.

Adds keter as a module to nixos.
Currently keter is unusable with nix,
because it relies on bundeling of a tar and uploading that to a specific folder.
These expressions automate these devops tasks,
with especially nixops in mind.
This will work with versions above 1.8

The test seems to work.
This uses a new version of keter which has good
support for status code on error pages.
We're using this config at production at supercede
so it should be fine.

Squash log:
==========

mention keter in changelog

Update generated release notes

Always restart keter on failure

This is a little bit of extra stability in case keter crashes.
Which can happen under extreme conditions (DoS attacks).

Update nixos/doc/manual/release-notes/rl-2205.section.md

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

Update nixos/modules/module-list.nix

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

Remove sanitization

don't put domain in as a string

Update nixos/tests/keter.nix

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

add jappie as module maintainer

Use type path instead of two seperate options

Fix generated docs

added test machinery to figure out why it's failing

Fix the test, use console output

run nixpkgs-fmt on all modules

Inline config file.

This get's rid of a lot of inderection as well.

Run nix format

remove comment

simplify executable for test

delete config file

add config for keter root

Remove after redis clause

set keter root by default to /var/lib/keter

Update nixos/modules/services/web-servers/keter/default.nix

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

Update nixos/modules/services/web-servers/keter/default.nix

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

Update nixos/modules/services/web-servers/keter/default.nix

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

fix nit

add newlines

add default text and move description in a long description

Delete rather obvious comment

fix release db thing

remove longDescription and put it in a comment instead

change description of mkEnalbeOption

explain what keter does by using the hackage synopsis

set domain to keterDomain and same for executable

move comment to where it's happening

fix type error

add formatting better comment

try add seperate user for keter

Revert "try add seperate user for keter"

This reverts commit d3522d36c96117335bfa072e6f453406c244e940.

Doing this breaks the setup

set default to avoid needing cap_net_bind_service

remove weird comment

use example fields

eleborated on process leakage

Update nixos/modules/services/web-servers/keter/default.nix

Co-authored-by: ckie <25263210+ckiee@users.noreply.github.com>

run nixpkgs-fmt

update docs

Fix formatting, set keter package by default

format our little nixexpr

replace '' -> " where possible

drop indent for multiline string

make description much shorter

regen docs database
---
 .../from_md/release-notes/rl-2205.section.xml |   7 +
 .../manual/release-notes/rl-2205.section.md   |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/web-servers/keter/bundle.nix     |  40 +++++
 .../services/web-servers/keter/default.nix    | 162 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/keter.nix                         |  42 +++++
 7 files changed, 254 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/keter/bundle.nix
 create mode 100644 nixos/modules/services/web-servers/keter/default.nix
 create mode 100644 nixos/tests/keter.nix

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 5208671e4dab..3dc4a494588b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -2122,6 +2122,13 @@ sudo mkdir /var/lib/redis-peertube
 sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
 </programlisting>
       </listitem>
+      <listitem>
+        <para>
+          Added the <literal>keter</literal> NixOS module. Keter reverse
+          proxies requests to your loaded application based on virtual
+          hostnames.
+        </para>
+      </listitem>
       <listitem>
         <para>
           If you are using Wayland you can choose to use the Ozone
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index faf941f56996..f1f544035002 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -776,6 +776,7 @@ In addition to numerous new and upgraded packages, this release has the followin
   sudo mkdir /var/lib/redis-peertube
   sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb
   ```
+- Added the `keter` NixOS module. Keter reverse proxies requests to your loaded application based on virtual hostnames.
 
 - If you are using Wayland you can choose to use the Ozone Wayland support
   in Chrome and several Electron apps by setting the environment variable
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d67602a26761..08834022cf46 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1118,6 +1118,7 @@
   ./services/web-servers/pomerium.nix
   ./services/web-servers/unit/default.nix
   ./services/web-servers/tomcat.nix
+  ./services/web-servers/keter
   ./services/web-servers/traefik.nix
   ./services/web-servers/trafficserver/default.nix
   ./services/web-servers/ttyd.nix
diff --git a/nixos/modules/services/web-servers/keter/bundle.nix b/nixos/modules/services/web-servers/keter/bundle.nix
new file mode 100644
index 000000000000..32b08c3be206
--- /dev/null
+++ b/nixos/modules/services/web-servers/keter/bundle.nix
@@ -0,0 +1,40 @@
+/* This makes a keter bundle as described on the github page:
+  https://github.com/snoyberg/keter#bundling-your-app-for-keter
+*/
+{ keterDomain
+, keterExecutable
+, gnutar
+, writeTextFile
+, lib
+, stdenv
+, ...
+}:
+
+let
+  str.stanzas = [{
+    # we just use nix as an absolute path so we're not bundling any binaries
+    type = "webapp";
+    /* Note that we're not actually putting the executable in the bundle,
+      we already can use the nix store for copying, so we just
+      symlink to the app. */
+    exec = keterExecutable;
+    host = keterDomain;
+  }];
+  configFile = writeTextFile {
+    name = "keter.yml";
+    text = (lib.generators.toYAML { } str);
+  };
+
+in
+stdenv.mkDerivation {
+  name = "keter-bundle";
+  buildCommand = ''
+    mkdir -p config
+    cp ${configFile} config/keter.yaml
+
+    echo 'create a gzipped tarball'
+    mkdir -p $out
+    tar -zcvf $out/bundle.tar.gz.keter ./.
+  '';
+  buildInputs = [ gnutar ];
+}
diff --git a/nixos/modules/services/web-servers/keter/default.nix b/nixos/modules/services/web-servers/keter/default.nix
new file mode 100644
index 000000000000..83e221add37e
--- /dev/null
+++ b/nixos/modules/services/web-servers/keter/default.nix
@@ -0,0 +1,162 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.services.keter;
+in
+{
+  meta = {
+    maintainers = with lib.maintainers; [ jappie ];
+  };
+
+  options.services.keter = {
+    enable = lib.mkEnableOption ''keter, a web app deployment manager.
+Note that this module only support loading of webapps:
+Keep an old app running and swap the ports when the new one is booted.
+'';
+
+    keterRoot = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/keter";
+      description = "Mutable state folder for keter";
+    };
+
+    keterPackage = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.haskellPackages.keter;
+      defaultText = lib.literalExpression "pkgs.haskellPackages.keter";
+      description = "The keter package to be used";
+    };
+
+    globalKeterConfig = lib.mkOption {
+      type = lib.types.attrs;
+      default = {
+        ip-from-header = true;
+        listeners = [{
+          host = "*4";
+          port = 6981;
+        }];
+      };
+      # You want that ip-from-header in the nginx setup case
+      # so it's not set to 127.0.0.1.
+      # using a port above 1024 allows you to avoid needing CAP_NET_BIND_SERVICE
+      defaultText = lib.literalExpression ''
+        {
+          ip-from-header = true;
+          listeners = [{
+            host = "*4";
+            port = 6981;
+          }];
+        }
+      '';
+      description = "Global config for keter";
+    };
+
+    bundle = {
+      appName = lib.mkOption {
+        type = lib.types.str;
+        default = "myapp";
+        description = "The name keter assigns to this bundle";
+      };
+
+      executable = lib.mkOption {
+        type = lib.types.path;
+        description = "The executable to be run";
+      };
+
+      domain = lib.mkOption {
+        type = lib.types.str;
+        default = "example.com";
+        description = "The domain keter will bind to";
+      };
+
+      publicScript = lib.mkOption {
+        type = lib.types.str;
+        default = "";
+        description = ''
+          Allows loading of public environment variables,
+          these are emitted to the log so it shouldn't contain secrets.
+        '';
+        example = "ADMIN_EMAIL=hi@example.com";
+      };
+
+      secretScript = lib.mkOption {
+        type = lib.types.str;
+        default = "";
+        description = "Allows loading of private environment variables";
+        example = "MY_AWS_KEY=$(cat /run/keys/AWS_ACCESS_KEY_ID)";
+      };
+    };
+
+  };
+
+  config = lib.mkIf cfg.enable (
+    let
+      incoming = "${cfg.keterRoot}/incoming";
+
+
+      globalKeterConfigFile = pkgs.writeTextFile {
+        name = "keter-config.yml";
+        text = (lib.generators.toYAML { } (cfg.globalKeterConfig // { root = cfg.keterRoot; }));
+      };
+
+      # If things are expected to change often, put it in the bundle!
+      bundle = pkgs.callPackage ./bundle.nix
+        (cfg.bundle // { keterExecutable = executable; keterDomain = cfg.bundle.domain; });
+
+      # This indirection is required to ensure the nix path
+      # gets copied over to the target machine in remote deployments.
+      # Furthermore, it's important that we use exec to
+      # run the binary otherwise we get process leakage due to this
+      # being executed on every change.
+      executable = pkgs.writeShellScript "bundle-wrapper" ''
+        set -e
+        ${cfg.bundle.secretScript}
+        set -xe
+        ${cfg.bundle.publicScript}
+        exec ${cfg.bundle.executable}
+      '';
+
+    in
+    {
+      systemd.services.keter = {
+        description = "keter app loader";
+        script = ''
+          set -xe
+          mkdir -p ${incoming}
+          { tail -F ${cfg.keterRoot}/log/keter/current.log -n 0 & ${cfg.keterPackage}/bin/keter ${globalKeterConfigFile}; }
+        '';
+        wantedBy = [ "multi-user.target" "nginx.service" ];
+
+        serviceConfig = {
+          Restart = "always";
+          RestartSec = "10s";
+        };
+
+        after = [
+          "network.target"
+          "local-fs.target"
+          "postgresql.service"
+        ];
+      };
+
+      # On deploy this will load our app, by moving it into the incoming dir
+      # If the bundle content changes, this will run again.
+      # Because the bundle content contains the nix path to the exectuable,
+      # we inherit nix based cache busting.
+      systemd.services.load-keter-bundle = {
+        description = "load keter bundle into incoming folder";
+        after = [ "keter.service" ];
+        wantedBy = [ "multi-user.target" ];
+        # we can't override keter bundles because it'll stop the previous app
+        # https://github.com/snoyberg/keter#deploying
+        script = ''
+          set -xe
+          cp ${bundle}/bundle.tar.gz.keter ${incoming}/${cfg.bundle.appName}.keter
+        '';
+        path = [
+          executable
+          cfg.bundle.executable
+        ]; # this is a hack to get the executable copied over to the machine.
+      };
+    }
+  );
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1064d62da930..e6fd508100dd 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -264,6 +264,7 @@ in {
   kerberos = handleTest ./kerberos/default.nix {};
   kernel-generic = handleTest ./kernel-generic.nix {};
   kernel-latest-ath-user-regd = handleTest ./kernel-latest-ath-user-regd.nix {};
+  keter = handleTest ./keter.nix {};
   kexec = handleTest ./kexec.nix {};
   keycloak = discoverTests (import ./keycloak.nix);
   keymap = handleTest ./keymap.nix {};
diff --git a/nixos/tests/keter.nix b/nixos/tests/keter.nix
new file mode 100644
index 000000000000..0bfb96e1c324
--- /dev/null
+++ b/nixos/tests/keter.nix
@@ -0,0 +1,42 @@
+import ./make-test-python.nix ({ pkgs, ... }:
+let
+  port = 81;
+in
+{
+  name = "keter";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ jappie ];
+  };
+
+
+  nodes.machine = { config, pkgs, ... }: {
+    services.keter = {
+      enable = true;
+
+      globalKeterConfig = {
+        listeners = [{
+          host = "*4";
+          inherit port;
+        }];
+      };
+      bundle = {
+        appName = "test-bundle";
+        domain = "localhost";
+        executable = pkgs.writeShellScript "run" ''
+          ${pkgs.python3}/bin/python -m http.server $PORT
+        '';
+      };
+    };
+  };
+
+  testScript =
+    ''
+      machine.wait_for_unit("keter.service")
+
+      machine.wait_for_open_port(${toString port})
+      machine.wait_for_console_text("Activating app test-bundle with hosts: localhost")
+
+
+      machine.succeed("curl --fail http://localhost:${toString port}/")
+    '';
+})

From eb418053b23bd504ef80c55186e50dc974bd45a5 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 18 Aug 2022 15:12:22 +0200
Subject: [PATCH 116/149] python310Packages.typed-settings: Fix build

---
 .../python-modules/typed-settings/default.nix   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/typed-settings/default.nix b/pkgs/development/python-modules/typed-settings/default.nix
index 3a6ee309ff55..8d04df43efeb 100644
--- a/pkgs/development/python-modules/typed-settings/default.nix
+++ b/pkgs/development/python-modules/typed-settings/default.nix
@@ -8,6 +8,7 @@
 , toml
 , pytestCheckHook
 , click
+, click-option-group
 }:
 
 buildPythonPackage rec {
@@ -28,26 +29,20 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     attrs
     cattrs
+    click-option-group
     toml
   ];
 
-  preCheck = ''
-    pushd tests
-  '';
+  pytestFlagsArray = [
+    "tests"
+  ];
 
   checkInputs = [
     click
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # mismatches in click help output
-    "test_help"
-  ];
-
-  postCheck = ''
-    popd
-  '';
+  pythonImportsCheck = [ "typed_settings" ];
 
   meta = {
     description = "Typed settings based on attrs classes";

From 0e75512a1bbac97fb67bfa6bd54a8dd27dec0ce7 Mon Sep 17 00:00:00 2001
From: iko <ilyakooo0@gmail.com>
Date: Thu, 18 Aug 2022 13:24:36 +0000
Subject: [PATCH 117/149] clickable: init at 7.4.0 (#178760)

* clickable: init at 7.4.0

* Update default.nix

Co-authored-by: Jonas Heinrich <onny@project-insanity.org>
---
 pkgs/development/tools/clickable/default.nix | 49 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/tools/clickable/default.nix

diff --git a/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix
new file mode 100644
index 000000000000..6d3bc8663674
--- /dev/null
+++ b/pkgs/development/tools/clickable/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, fetchFromGitLab
+, buildPythonPackage
+, cookiecutter
+, requests
+, pyyaml
+, jsonschema
+, argcomplete
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "clickable";
+  version = "7.4.0";
+
+  src = fetchFromGitLab {
+    owner = "clickable";
+    repo = "clickable";
+    rev = "v${version}";
+    sha256 = "sha256-QS7vi0gUQbqqRYkZwD2B+zkt6DQ6AamQO7sihD8qWS0=";
+  };
+
+  propagatedBuildInputs = [
+    cookiecutter
+    requests
+    pyyaml
+    jsonschema
+    argcomplete
+  ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # Test require network connection
+    "test_cpp_plugin"
+    "test_html"
+    "test_python"
+    "test_qml_only"
+    "test_rust"
+  ];
+
+  meta = {
+    description = "A build system for Ubuntu Touch apps";
+    homepage = "https://clickable-ut.dev";
+    changelog = "https://clickable-ut.dev/en/latest/changelog.html";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ilyakooo0 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ba0c1feb777..ffb545896903 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12950,6 +12950,8 @@ with pkgs;
 
   clean = callPackage ../development/compilers/clean { };
 
+  clickable = python3Packages.callPackage ../development/tools/clickable { };
+
   closurecompiler = callPackage ../development/compilers/closure { };
 
   cmdstan = callPackage ../development/compilers/cmdstan { };

From d7728dfc671c56a1929665abd1e2fd07d64360e1 Mon Sep 17 00:00:00 2001
From: Evan Petousis <evan@petousis.net>
Date: Mon, 1 Aug 2022 18:05:58 +1000
Subject: [PATCH 118/149] buildDotnetModule: use platform-agnostic cp format

cp on macOS doesn't support the -T flag, which causes the fetch-deps
script to fail. Appending `/.` to the source argument replicates the
same functionality.
---
 pkgs/build-support/dotnet/build-dotnet-module/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 1a5d499929ac..5ccff2f2a198 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -145,7 +145,7 @@ in stdenvNoCC.mkDerivation (args // {
 
       store_src="${srcOnly args}"
       src="$(mktemp -d /tmp/${pname}.XXX)"
-      cp -rT "$store_src" "$src"
+      cp -r "$store_src/." "$src"
       chmod -R +w "$src"
 
       trap "rm -rf $src $HOME" EXIT

From c51e1a1fbae2bd14e0df183a50df6f1bd64780a3 Mon Sep 17 00:00:00 2001
From: Evan Petousis <evan@petousis.net>
Date: Mon, 1 Aug 2022 21:21:30 +1000
Subject: [PATCH 119/149] buildDotnetModule: use coreutils in fetch-deps

cp on macOS doesn't support the -T flag, which causes the fetch-deps
script to fail. Use Nix's coreutils to ensure the script works
consistently across all platforms.
---
 .../dotnet/build-dotnet-module/default.nix    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 5ccff2f2a198..b24b2f9d191b 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin }:
+{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }:
 
 { name ? "${args.pname}-${args.version}"
 , pname ? name
@@ -138,23 +138,23 @@ in stdenvNoCC.mkDerivation (args // {
       exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; };
     in writeScript "fetch-${pname}-deps" ''
       set -euo pipefail
-      cd "$(dirname "''${BASH_SOURCE[0]}")"
+      cd "$(${coreutils}/bin/dirname "''${BASH_SOURCE[0]}")"
 
-      export HOME=$(mktemp -d)
+      export HOME=$(${coreutils}/bin/mktemp -d)
       deps_file="/tmp/${pname}-deps.nix"
 
       store_src="${srcOnly args}"
-      src="$(mktemp -d /tmp/${pname}.XXX)"
-      cp -r "$store_src/." "$src"
-      chmod -R +w "$src"
+      src="$(${coreutils}/bin/mktemp -d /tmp/${pname}.XXX)"
+      ${coreutils}/bin/cp -rT "$store_src" "$src"
+      ${coreutils}/bin/chmod -R +w "$src"
 
-      trap "rm -rf $src $HOME" EXIT
+      trap "${coreutils}/bin/rm -rf $src $HOME" EXIT
       pushd "$src"
 
       export DOTNET_NOLOGO=1
       export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-      mkdir -p "$HOME/nuget_pkgs"
+      ${coreutils}/bin/mkdir -p "$HOME/nuget_pkgs"
 
       for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do
         ${dotnet-sdk}/bin/dotnet restore "$project" \
@@ -166,11 +166,11 @@ in stdenvNoCC.mkDerivation (args // {
           ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)}
       done
 
-      echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions"
+      ${coreutils}/bin/echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions"
 
-      echo "Writing lockfile..."
+      ${coreutils}/bin/echo "Writing lockfile..."
       ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file"
-      echo "Succesfully wrote lockfile to: $deps_file"
+      ${coreutils}/bin/echo "Succesfully wrote lockfile to: $deps_file"
     '';
   } // args.passthru or {};
 })

From fc6b3c45d5b8fd933e3c91d52ab1df149ca272f4 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 18 Aug 2022 15:45:20 +0200
Subject: [PATCH 120/149] python310Packages.xdis: Fix build

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

diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index 53ff69168a59..5039dc242f03 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-CRZG898xCwukq+9YVkyXMP8HcuJ9GtvDhy96kxvRFks=";
   };
 
+  postPatch = ''
+    # Our Python release is not in the test matrix
+    substituteInPlace xdis/magics.py \
+      --replace "3.10.4" "3.10.5 3.10.6"
+  '';
+
   propagatedBuildInputs = [
     click
     six
@@ -35,13 +41,19 @@ buildPythonPackage rec {
     "xdis"
   ];
 
+  # import file mismatch:
+  # imported module 'test_disasm' has this __file__ attribute:
+  #   /build/source/pytest/test_disasm.py
+  # which is not the same as the test file we want to collect:
+  #   /build/source/test_unit/test_disasm.py
   disabledTestPaths = [
-    # Our Python release is not in the test matrix
     "test_unit/test_disasm.py"
   ];
 
   disabledTests = [
+    # AssertionError: events did not match expectation
     "test_big_linenos"
+    # AssertionError: False is not true : PYTHON VERSION 4.0 is not in magic.magics.keys
     "test_basic"
   ];
 
@@ -49,6 +61,6 @@ buildPythonPackage rec {
     description = "Python cross-version byte-code disassembler and marshal routines";
     homepage = "https://github.com/rocky/python-xdis";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ onny ];
   };
 }

From b4de4dc3bfc5dbbd11a506814636969465c9ade4 Mon Sep 17 00:00:00 2001
From: Evan Petousis <evan@petousis.net>
Date: Thu, 18 Aug 2022 23:46:37 +1000
Subject: [PATCH 121/149] buildDotnetModule: set fetch-deps utils via PATH

---
 .../dotnet/build-dotnet-module/default.nix    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index b24b2f9d191b..62820e8d47ee 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -138,26 +138,28 @@ in stdenvNoCC.mkDerivation (args // {
       exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; };
     in writeScript "fetch-${pname}-deps" ''
       set -euo pipefail
-      cd "$(${coreutils}/bin/dirname "''${BASH_SOURCE[0]}")"
+      export PATH="${lib.makeBinPath [ coreutils dotnet-sdk nuget-to-nix ]}"
 
-      export HOME=$(${coreutils}/bin/mktemp -d)
+      cd "$(dirname "''${BASH_SOURCE[0]}")"
+
+      export HOME=$(mktemp -d)
       deps_file="/tmp/${pname}-deps.nix"
 
       store_src="${srcOnly args}"
-      src="$(${coreutils}/bin/mktemp -d /tmp/${pname}.XXX)"
-      ${coreutils}/bin/cp -rT "$store_src" "$src"
-      ${coreutils}/bin/chmod -R +w "$src"
+      src="$(mktemp -d /tmp/${pname}.XXX)"
+      cp -rT "$store_src" "$src"
+      chmod -R +w "$src"
 
-      trap "${coreutils}/bin/rm -rf $src $HOME" EXIT
+      trap "rm -rf $src $HOME" EXIT
       pushd "$src"
 
       export DOTNET_NOLOGO=1
       export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
-      ${coreutils}/bin/mkdir -p "$HOME/nuget_pkgs"
+      mkdir -p "$HOME/nuget_pkgs"
 
       for project in "${lib.concatStringsSep "\" \"" ((lib.toList projectFile) ++ lib.optionals (testProjectFile != "") (lib.toList testProjectFile))}"; do
-        ${dotnet-sdk}/bin/dotnet restore "$project" \
+        dotnet restore "$project" \
           ${lib.optionalString (!enableParallelBuilding) "--disable-parallel"} \
           -p:ContinuousIntegrationBuild=true \
           -p:Deterministic=true \
@@ -166,11 +168,11 @@ in stdenvNoCC.mkDerivation (args // {
           ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)}
       done
 
-      ${coreutils}/bin/echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions"
+      echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions"
 
-      ${coreutils}/bin/echo "Writing lockfile..."
-      ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file"
-      ${coreutils}/bin/echo "Succesfully wrote lockfile to: $deps_file"
+      echo "Writing lockfile..."
+      nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file"
+      echo "Succesfully wrote lockfile to: $deps_file"
     '';
   } // args.passthru or {};
 })

From 6dc1c73aba11efa3229659bcaf596b21ef6f80bd Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 12 Aug 2022 19:16:14 -0400
Subject: [PATCH 122/149] nixos/libvirtd: Do not add autostart network

This does make the out-of-the-box install perhaps a bit worse, since
networking may need to be manually configured. However, it makes it less
frustrating that upon every start of this service, a *removed* autostart
network will be re-added when removed by the user. See
https://github.com/NixOS/nixpkgs/issues/73418 for details.

Behavior from other distros:

- Adds autostart net on install: Fedora
- Does not add autostart net   : Debian, Arch

This does not break any existing installs since it does not affect any
autostart network already in-place.
---
 nixos/modules/virtualisation/libvirtd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index f7d0ef39c5af..817d7180a022 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -293,7 +293,7 @@ in
         # Copy default libvirt network config .xml files to /var/lib
         # Files modified by the user will not be overwritten
         for i in $(cd ${cfg.package}/var/lib && echo \
-            libvirt/qemu/networks/*.xml libvirt/qemu/networks/autostart/*.xml \
+            libvirt/qemu/networks/*.xml \
             libvirt/nwfilter/*.xml );
         do
             mkdir -p /var/lib/$(dirname $i) -m 755

From d77432260ad12ef8af9776c0d4d6ee4f52d21bfe Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 18 Aug 2022 15:51:15 +0200
Subject: [PATCH 123/149] dump_syms: 1.0.1 -> 2.0.0

https://github.com/mozilla/dump_syms/releases/tag/v2.0.0
---
 pkgs/development/tools/dump_syms/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix
index 8eae712191d9..4aff90f830a3 100644
--- a/pkgs/development/tools/dump_syms/default.nix
+++ b/pkgs/development/tools/dump_syms/default.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "dump_syms";
-  version = "1.0.1";
+  version = "2.0.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -20,10 +20,10 @@ rustPlatform.buildRustPackage {
     owner = "mozilla";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-2OSni0PA0LfamOqdFQTRLgolF55z13owgFrqYYHuNX0=";
+    hash = "sha256-ei/ORKKoh9rQg4xZ5j76qaplw1PyEV7ABkyL7e8WIlQ=";
   };
 
-  cargoSha256 = "sha256-ggJWweulbSJ8Femzv7uHLcrn1HTenw79AYIydE6y4ag=";
+  cargoSha256 = "sha256-t3AQW0j/L/qIUx6RJKqf+Fv/2BNWkWmTc0PDNFlZeaQ=";
 
   nativeBuildInputs = [
     pkg-config

From a3d14cefba0e7200269926b401d3ad2fee3e5e9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 14:37:36 +0000
Subject: [PATCH 124/149] python310Packages.asdf: 2.12.0 -> 2.12.1

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

diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix
index b34001d866eb..253ec1b71ce2 100644
--- a/pkgs/development/python-modules/asdf/default.nix
+++ b/pkgs/development/python-modules/asdf/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "asdf";
-  version = "2.12.0";
+  version = "2.12.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WRSDTQd7o79ouar9xka58nzl5W4cJBFn1GHe5DsQI+k=";
+    hash = "sha256-0qXRYWXKC17JiL1D+jjuGVoOGAJuGbJje7OZyd2k3o8=";
   };
 
   nativeBuildInputs = [

From 89f527384b6bea645ad0d8afedb5d2400f0596b3 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Thu, 18 Aug 2022 11:52:11 -0300
Subject: [PATCH 125/149] nixos/minio: fix startup issue

---
 nixos/modules/services/web-servers/minio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index f4fca2275e77..60e3068521c4 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -102,7 +102,7 @@ in
 
     systemd.services.minio = {
       description = "Minio Object Storage";
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --console-address ${cfg.consoleAddress} --config-dir=${cfg.configDir} ${toString cfg.dataDir}";

From 1393dba6109b8ad62a4fc2cbe144f7daff9d642b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 18 Aug 2022 17:04:23 +0200
Subject: [PATCH 126/149] nss_latest: 3.81 -> 3.82

https://github.com/nss-dev/nss/blob/master/doc/rst/releases/nss_3_82.rst
---
 pkgs/development/libraries/nss/latest.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix
index 4a793bd7cecc..f313cc328822 100644
--- a/pkgs/development/libraries/nss/latest.nix
+++ b/pkgs/development/libraries/nss/latest.nix
@@ -5,6 +5,6 @@
 #       Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
 
 import ./generic.nix {
-  version = "3.81";
-  hash = "sha256-qL9fO7YXBo1X57FfPZ1SjxCa8NV98uqrBRm2Qj7czKY=";
+  version = "3.82";
+  hash = "sha256-Mr9nO3LC+ZU+07THAzq/WmytMChUokrliMV1plZ8FXM=";
 }

From facd025b944491292dc6cd83a9dbc9e9c847d4cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Aug 2022 13:58:44 +0000
Subject: [PATCH 127/149] ldns: 1.8.1 -> 1.8.3

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

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 6712d7c6d3c0..ba0c5e606ffc 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ldns";
-  version = "1.8.1";
+  version = "1.8.3";
 
   src = fetchurl {
     url = "https://www.nlnetlabs.nl/downloads/ldns/${pname}-${version}.tar.gz";
-    sha256 = "sha256-lYIpq85NOqoZp1wNEnZmVksXIWkCGG6VLKSu9Hxtf6M=";
+    sha256 = "sha256-w/ct0QNrKQfjpW5qz537LlUSVrPBu9l4eULe7rcOeGA=";
   };
 
   postPatch = ''

From 71617faa487ab0d16b6cad3c20b8c4c79fb328e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Tue, 16 Aug 2022 14:12:25 +0200
Subject: [PATCH 128/149] vtm: 0.7.6 -> 0.8.0

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

diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix
index a2a52a260b60..982f383da304 100644
--- a/pkgs/tools/misc/vtm/default.nix
+++ b/pkgs/tools/misc/vtm/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vtm";
-  version = "0.7.6";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "netxs-group";
     repo = "vtm";
     rev = "v${version}";
-    sha256 = "sha256-YAS/HcgtA4Ms8EB7RRCg6ElBL4aI/FqXjqymHy/voRs=";
+    sha256 = "sha256-Ty7DC4ap2F+mPzr1xaL8XeLSjQaQQVX0oGAcPpkoag4=";
   };
 
   nativeBuildInputs = [ cmake ];

From fe4c35b4c2f2ebb2f56eb67c53609400e35b4ec0 Mon Sep 17 00:00:00 2001
From: Alexander Kiselyov <aleksandr.kiselyov@gmail.com>
Date: Thu, 18 Aug 2022 17:05:13 +0300
Subject: [PATCH 129/149] python3Packages.pydmd: fixed missing dependency

Inited `python3Packages.ezyrb` at 1.3.0.
---
 .../python-modules/ezyrb/default.nix          | 58 +++++++++++++++++++
 .../python-modules/pydmd/default.nix          |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/development/python-modules/ezyrb/default.nix

diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix
new file mode 100644
index 000000000000..dc46bcfcd957
--- /dev/null
+++ b/pkgs/development/python-modules/ezyrb/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, future
+, numpy
+, scipy
+, matplotlib
+, scikit-learn
+, pytorch
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "ezyrb";
+  version = "1.3.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "mathLab";
+    repo = "EZyRB";
+    rev = "v${version}";
+    sha256 = "sha256-tFkz+j97m+Bgk/87snQMXtgZnykiWYyWJJLaqwRKiaY=";
+  };
+
+  propagatedBuildInputs = [
+    future
+    numpy
+    scipy
+    matplotlib
+    scikit-learn
+    pytorch
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "ezyrb"
+  ];
+
+  disabledTestPaths = [
+    # Exclude long tests
+    "tests/test_podae.py"
+  ];
+
+  meta = with lib; {
+    description = "Easy Reduced Basis method";
+    homepage = "https://mathlab.github.io/EZyRB/";
+    downloadPage = "https://github.com/mathLab/EZyRB/releases";
+    license = licenses.mit;
+    maintainers = with maintainers; [ yl3dy ];
+  };
+}
diff --git a/pkgs/development/python-modules/pydmd/default.nix b/pkgs/development/python-modules/pydmd/default.nix
index 28d9eeaecd67..beb6ef710bbd 100644
--- a/pkgs/development/python-modules/pydmd/default.nix
+++ b/pkgs/development/python-modules/pydmd/default.nix
@@ -8,6 +8,7 @@
 , pytestCheckHook
 , pythonOlder
 , scipy
+, ezyrb
 }:
 
 buildPythonPackage rec {
@@ -29,6 +30,7 @@ buildPythonPackage rec {
     matplotlib
     numpy
     scipy
+    ezyrb
   ];
 
   checkInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 46e9039ee701..253dd10b8882 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3042,6 +3042,8 @@ in {
 
   ezdxf = callPackage ../development/python-modules/ezdxf { };
 
+  ezyrb = callPackage ../development/python-modules/ezyrb { };
+
   f90nml = callPackage ../development/python-modules/f90nml { };
 
   Fabric = callPackage ../development/python-modules/Fabric { };

From af3c62be07bfaabd6d658a8cbe5c43856142ab0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 18 Aug 2022 14:37:36 -0300
Subject: [PATCH 130/149] xfce.xfce4-screenshooter: 1.9.10 -> 1.9.11 (#186429)

* xfce.xfce4-screenshooter: reformat nix expression

* xfce.xfce4-screenshooter: 1.9.10 -> 1.9.11
---
 .../xfce4-screenshooter/default.nix           | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index 1e8a9230661f..7beeb0ff87f2 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -1,14 +1,31 @@
-{ lib, mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel, glib-networking }:
+{ lib
+, mkXfceDerivation
+, exo
+, glib-networking
+, gtk3
+, libsoup
+, libxfce4ui
+, libxfce4util
+, xfce4-panel
+}:
 
 mkXfceDerivation {
   category = "apps";
   pname = "xfce4-screenshooter";
-  version = "1.9.10";
+  version = "1.9.11";
   odd-unstable = false;
 
-  sha256 = "sha256-i3QdQij58JYv3fWdESUeTV0IW3A8RVGNtmuxUc6FUMg=";
+  sha256 = "sha256-sW0SEXypCcly7MlO9lnxHTkYwIiRt+gOME5UQ++Y3JQ=";
 
-  buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ];
+  buildInputs = [
+    exo
+    glib-networking
+    gtk3
+    libsoup
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+  ];
 
   meta = with lib; {
     description = "Screenshot utility for the Xfce desktop";

From d34f728c2fc35481a6259e1ad86154db151b63e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 18 Aug 2022 14:38:48 -0300
Subject: [PATCH 131/149] numix-icon-theme: 21.10.31 -> 22.08.16 (#187004)

* numix-icon-theme: reformat nix expression

* numix-icon-theme: add update script

* numix-icon-theme: 21.10.31 -> 22.08.16

* numix-icon-theme: add missing parent themes
---
 pkgs/data/icons/numix-icon-theme/default.nix | 30 ++++++++++++++++----
 pkgs/top-level/all-packages.nix              |  5 +++-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 576fa405e06f..18ba78ac24ec 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,25 +1,43 @@
-{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }:
+{ lib
+, stdenvNoCC
+, fetchFromGitHub
+, gtk3
+, adwaita-icon-theme
+, breeze-icons
+, gnome-icon-theme
+, hicolor-icon-theme
+, gitUpdater
+}:
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "21.10.31";
+  version = "22.08.16";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-wyVvXifdbKR2aiBMrki8y/H0khH4eFD1RHVSC+jAT28=";
+    sha256 = "sha256-EveIr5XYyQYhz0AqZQBql3j0LnD8taNdzB/6IV7Mz2k=";
   };
 
-  nativeBuildInputs = [ gtk3 ];
+  nativeBuildInputs = [
+    gtk3
+  ];
 
-  propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
+  propagatedBuildInputs = [
+    adwaita-icon-theme
+    breeze-icons
+    gnome-icon-theme
+    hicolor-icon-theme
+  ];
 
   dontDropIconThemeCache = true;
 
   installPhase = ''
     runHook preInstall
 
+    substituteInPlace Numix/index.theme --replace Breeze breeze
+
     mkdir -p $out/share/icons
     cp -a Numix{,-Light} $out/share/icons/
 
@@ -30,6 +48,8 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = gitUpdater { inherit pname version; };
+
   meta = with lib; {
     description = "Numix icon theme";
     homepage = "https://numixproject.github.io";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e754ac34c53a..182ca637e32d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25448,7 +25448,10 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  numix-icon-theme = callPackage ../data/icons/numix-icon-theme { };
+  numix-icon-theme = callPackage ../data/icons/numix-icon-theme {
+    inherit (gnome) adwaita-icon-theme;
+    inherit (plasma5Packages) breeze-icons;
+  };
 
   numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { };
 

From e59a9d1bed788d6a53011be17370476836d59007 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 18 Aug 2022 20:07:45 +0200
Subject: [PATCH 132/149] python310Packages.bluetooth-adapters: 0.1.3 -> 0.2.0

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

diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix
index 3de1597154d4..039470a7b3e8 100644
--- a/pkgs/development/python-modules/bluetooth-adapters/default.nix
+++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-adapters";
-  version = "0.1.3";
+  version = "0.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-c96HgcmyiDwvcq8OsZ5s65VmAihz6KtCviP2h6Iu1Fo=";
+    hash = "sha256-S6ZTUGBLCZ4gaiKTxC8xa4KDBl/zoZQ2vlFuXdcwLmk=";
   };
 
   postPatch = ''

From a5c8eb14e27831190687260a8266b881d784583c Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Thu, 18 Aug 2022 20:14:46 +0200
Subject: [PATCH 133/149] plex: 1.28.0.5999-97678ded3 -> 1.28.1.6104-788f82488

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index 8c2e178e05b8..5db0f12af878 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.28.0.5999-97678ded3";
+  version = "1.28.1.6104-788f82488";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "sha256-irHHEkbdRabzcNiemcFeFoDmB7LZqhFYMe+zVpMv5JQ=";
+    sha256 = "sha256-sAyZGdo6VuoQLKrFJVidDgY3c51e8FroXS5x170Hupw=";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "sha256-RxD0wLZ/Uw0niKZdAfEhDxnf2jZapbrjSjH3XerfTsM=";
+    sha256 = "sha256-Drf+b+nyj+yfXjFBji3Xwx2J+3CGXOaW01sxkgzMf9c=";
   };
 
   outputs = [ "out" "basedb" ];

From 6247b00637c93ae28f2e247cb62dc36e956818de Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Wed, 17 Aug 2022 10:48:54 -0600
Subject: [PATCH 134/149] ryujinx: Force display backend to X11

---
 pkgs/applications/emulators/ryujinx/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix
index bda8f40dfcc0..41348c9848c1 100644
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@@ -80,6 +80,11 @@ buildDotnetModule rec {
     ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux.
   ];
 
+  makeWrapperArgs = [
+    # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714
+    "--set GDK_BACKEND x11"
+  ];
+
   preInstall = ''
     # workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
     mkdir -p $out/lib/sndio-6

From 1528ce3063f211f809465af1ddc265c9e4e050cd Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Thu, 18 Aug 2022 13:49:45 -0600
Subject: [PATCH 135/149] nuget-to-nix: Make exclusion file optional

---
 pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
index ad75cf6574b7..ca0a63b3cd20 100755
--- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
@@ -10,7 +10,7 @@ if [ $# -eq 0 ]; then
 fi
 
 pkgs=$1
-exclusions=$2
+exclusions="${2:-/dev/null}"
 tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX)
 trap "rm -f ${tmpfile}" EXIT
 

From 3d07ae8afd3e6ccb2f95e42d898e2eaa271d6f9e Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Thu, 18 Aug 2022 13:49:45 -0600
Subject: [PATCH 136/149] build-dotnet-module: Allow specifying the output path
 of fetch-deps

---
 pkgs/build-support/dotnet/build-dotnet-module/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index 62820e8d47ee..bc50f1bd090c 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }:
+{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeShellScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin, coreutils }:
 
 { name ? "${args.pname}-${args.version}"
 , pname ? name
@@ -136,14 +136,14 @@ in stdenvNoCC.mkDerivation (args // {
 
     fetch-deps = let
       exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; };
-    in writeScript "fetch-${pname}-deps" ''
+    in writeShellScript "fetch-${pname}-deps" ''
       set -euo pipefail
       export PATH="${lib.makeBinPath [ coreutils dotnet-sdk nuget-to-nix ]}"
 
       cd "$(dirname "''${BASH_SOURCE[0]}")"
 
       export HOME=$(mktemp -d)
-      deps_file="/tmp/${pname}-deps.nix"
+      deps_file="''${1:-/tmp/${pname}-deps.nix}"
 
       store_src="${srcOnly args}"
       src="$(mktemp -d /tmp/${pname}.XXX)"

From 8711a6f35351bea17c6d27e486913aa060600b77 Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Thu, 18 Aug 2022 23:01:51 +0300
Subject: [PATCH 137/149] vimPlugins.trim-nvim: init at 2022-06-16 (#187295)

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index a6f5c1ba8ee0..3c67131f6e18 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -7673,6 +7673,18 @@ final: prev:
     meta.homepage = "https://github.com/tremor-rs/tremor-vim/";
   };
 
+  trim-nvim = buildVimPluginFrom2Nix {
+    pname = "trim.nvim";
+    version = "2022-06-16";
+    src = fetchFromGitHub {
+      owner = "cappyzawa";
+      repo = "trim.nvim";
+      rev = "ab366eb0dd7b3faeaf90a0ec40c993ff18d8c068";
+      sha256 = "0lxc593rys5yi35iabqgqxi18lsk2jp78f3wdksmkxclf9j7xmbw";
+    };
+    meta.homepage = "https://github.com/cappyzawa/trim.nvim/";
+  };
+
   trouble-nvim = buildVimPluginFrom2Nix {
     pname = "trouble.nvim";
     version = "2022-05-09";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2dd0297e293d..20ef2c08aee0 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -643,6 +643,7 @@ https://github.com/folke/tokyonight.nvim/,,
 https://github.com/markonm/traces.vim/,,
 https://github.com/tjdevries/train.nvim/,,
 https://github.com/tremor-rs/tremor-vim/,,
+https://github.com/cappyzawa/trim.nvim/,,
 https://github.com/folke/trouble.nvim/,,
 https://github.com/jgdavey/tslime.vim/,,
 https://github.com/Quramy/tsuquyomi/,,

From 48114aa4055af5474a4cfa5ae4c00bfde44d245c Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Thu, 18 Aug 2022 16:37:00 -0400
Subject: [PATCH 138/149] gitea: 1.17.0 -> 1.17.1

---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index c82951768cc6..99a6ffb585ad 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -14,12 +14,12 @@
 
 buildGoPackage rec {
   pname = "gitea";
-  version = "1.17.0";
+  version = "1.17.1";
 
   # not fetching directly from the git repo, because that lacks several vendor files for the web UI
   src = fetchurl {
     url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz";
-    sha256 = "sha256-oBbAg2xQ58dLBCjhcKMoUf32ckoFfnFQHL3z3pAKW1Y=";
+    sha256 = "sha256-ttfhsIiCl5VcqfK7ap/CA7bqXxrc4cTVIX+M2S4YanY=";
   };
 
   patches = [

From 34281ff4791d06b76ad877a73d0ba44d9bafdd16 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Thu, 18 Aug 2022 14:47:25 -0600
Subject: [PATCH 139/149] ryujinx: Migrate updater script to fetch-deps in
 buildDotnetModule

---
 pkgs/applications/emulators/ryujinx/updater.sh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh
index c403af37856a..5827271138d6 100755
--- a/pkgs/applications/emulators/ryujinx/updater.sh
+++ b/pkgs/applications/emulators/ryujinx/updater.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nuget-to-nix nix-prefetch-git jq dotnet-sdk_6
+#! nix-shell -I nixpkgs=./. -i bash -p coreutils gnused curl common-updater-scripts nix-prefetch-git jq
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
@@ -75,16 +75,4 @@ fi
 
 echo "building Nuget lockfile"
 
-STORE_SRC="$(nix-build . -A ryujinx.src --no-out-link)"
-SRC="$(mktemp -d /tmp/ryujinx-src.XXX)"
-cp -rT "$STORE_SRC" "$SRC"
-chmod -R +w "$SRC"
-pushd "$SRC"
-
-mkdir nuget_tmp.packages
-DOTNET_CLI_TELEMETRY_OPTOUT=1 dotnet restore Ryujinx.sln --packages nuget_tmp.packages
-
-nuget-to-nix ./nuget_tmp.packages >"$DEPS_FILE"
-
-popd
-rm -r "$SRC"
+$(nix-build -A ryujinx.fetch-deps --no-out-link) "$DEPS_FILE"

From fef7bfea9ffba16cf3f62e4e08f3e70d33b60748 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Thu, 18 Aug 2022 14:47:44 -0600
Subject: [PATCH 140/149] ryujinx: 1.1.213 -> 1.1.223

---
 pkgs/applications/emulators/ryujinx/default.nix | 6 +++---
 pkgs/applications/emulators/ryujinx/deps.nix    | 8 --------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix
index 41348c9848c1..9e919260590b 100644
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@@ -26,13 +26,13 @@
 
 buildDotnetModule rec {
   pname = "ryujinx";
-  version = "1.1.213"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.223"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
 
   src = fetchFromGitHub {
     owner = "Ryujinx";
     repo = "Ryujinx";
-    rev = "e8f1ca84277240c4d6215eb9cd85713aab73e2f7";
-    sha256 = "0ha5wn9h9rqxbkjbz7sm5m8q3rbsiiddh72wx0s3sga5w8054cb3";
+    rev = "951700fdd8f54fb34ffe8a3fb328a68b5bf37abe";
+    sha256 = "0kzchsxir8wh74rxvp582mci855hbd0vma6yhcc9vpz0zmhi2cpf";
   };
 
   projectFile = "Ryujinx.sln";
diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix
index e90144cfad71..4db1f8d2fec7 100644
--- a/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/pkgs/applications/emulators/ryujinx/deps.nix
@@ -41,9 +41,6 @@
   (fetchNuGet { pname = "LibHac"; version = "0.16.1"; sha256 = "131qnqa1asdmymwdvpjza6w646b05jzn1cxjdxgwh7qdcdb77xyx"; })
   (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; })
   (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0i00xs472gpxbrwx593z520sp8nv3lmqi8z3zrj9cshqckq8knnx"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1i66xw8h6qw1p0yf09hdy6l42bkhw3qi8q6zi7933mdkd4r3qr9n"; })
   (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; })
   (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; })
   (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; })
@@ -64,11 +61,6 @@
   (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; })
   (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; })
   (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.8.0"; sha256 = "1ln2mva7j2mpsj9rdhpk8vhm3pgd8wn563xqdcwd38avnhp74rm9"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.6"; sha256 = "12b6ya9q5wszfq6yp38lpan8zws95gbp1vs9pydk3v82gai336r3"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.6"; sha256 = "186ammhxnkh4m68f1s70rca23025lwzhxnc7m82wjg18rwz2vnkl"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.6"; sha256 = "0l15md6rzr2dvwvnk8xj1qz1dcjcbmp0aglnflrj8av60g5r1kwd"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; })
   (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
   (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
   (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })

From a8ac0c221a73b53de0aaa44eda9ae4b49e172724 Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Thu, 18 Aug 2022 13:49:45 -0600
Subject: [PATCH 141/149] ryujinx: Force SDL_VIDEODRIVER to x11

Even though it defaults to x11, the user's environment may have
it set to wayland which doesn't current work:

<https://github.com/NixOS/nixpkgs/pull/187070#discussion_r949522925>
---
 pkgs/applications/emulators/ryujinx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix
index 9e919260590b..b21bc5e5fa26 100644
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@@ -83,6 +83,7 @@ buildDotnetModule rec {
   makeWrapperArgs = [
     # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714
     "--set GDK_BACKEND x11"
+    "--set SDL_VIDEODRIVER x11"
   ];
 
   preInstall = ''

From 48eeb5ad17941a8c00247c6bab6d2b37baeec318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 18 Aug 2022 23:06:41 +0200
Subject: [PATCH 142/149] cpptoml: remove default outputs

---
 pkgs/development/libraries/cpptoml/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/cpptoml/default.nix b/pkgs/development/libraries/cpptoml/default.nix
index a3528444c6a1..888af1c18631 100644
--- a/pkgs/development/libraries/cpptoml/default.nix
+++ b/pkgs/development/libraries/cpptoml/default.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
     "-DCPPTOML_BUILD_EXAMPLES=OFF"
   ];
 
-  outputs = [ "out" ];
-
   meta = with lib; {
     description = "C++ TOML configuration library";
     homepage = "https://github.com/skystrife/cpptoml";

From 05766cd33c706c7795e1a8a09635d28ea29575ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 18 Aug 2022 23:07:40 +0200
Subject: [PATCH 143/149] pugixml: simplify outputs

---
 pkgs/development/libraries/pugixml/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index 73d890e03a41..0db6d5f98af8 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Udjx84mhLPJ1bU5WYDo73PAeeufS+vBLXZP0YbBvqLE=";
   };
 
-  outputs = if shared then [ "out" "dev" ] else [ "out" ];
+  outputs = [ "out" ] ++ lib.optionals shared [ "dev" ];
 
   nativeBuildInputs = [ cmake validatePkgConfig ];
 

From ecba86f62f8db56ddefe15d726a0592e7fa585cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 21:11:35 +0000
Subject: [PATCH 144/149] python310Packages.adafruit-platformdetect: 3.27.0 ->
 3.27.1

---
 .../python-modules/adafruit-platformdetect/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 69f87cc414b1..0cb34b22bd0b 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "adafruit-platformdetect";
-  version = "3.27.0";
+  version = "3.27.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "Adafruit-PlatformDetect";
     inherit version;
-    hash = "sha256-Ez3VQO52GgPhTXr1xlxr4BvouI41PVzppkutiqVjrUI=";
+    hash = "sha256-HAymQ08RauE8oATYzKE+UaqMsmNK3O+VyLLd6w/jPFc=";
   };
 
   nativeBuildInputs = [

From 7e533d199f5956f776686439f8006c2aa04b5461 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Thu, 18 Aug 2022 23:34:31 +0200
Subject: [PATCH 145/149] hebbot: init at 2.1 (#187178)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 maintainers/maintainer-list.nix        |  6 ++++
 pkgs/servers/matrix-hebbot/default.nix | 39 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/servers/matrix-hebbot/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2a13a6c429b7..be0cfb4930ca 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1359,6 +1359,12 @@
     githubId = 9315;
     name = "Zhong Jianxin";
   };
+  a-kenji = {
+    email = "aks.kenji@protonmail.com";
+    github = "a-kenji";
+    githubId = 65275785;
+    name = "Alexander Kenji Berthold";
+  };
   b4dm4n = {
     email = "fabianm88@gmail.com";
     github = "B4dM4n";
diff --git a/pkgs/servers/matrix-hebbot/default.nix b/pkgs/servers/matrix-hebbot/default.nix
new file mode 100644
index 000000000000..e84339e9f330
--- /dev/null
+++ b/pkgs/servers/matrix-hebbot/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, fetchFromGitHub
+, pkgs
+, stdenv
+, rustPlatform
+, pkg-config
+, cmake
+, openssl
+, autoconf
+, automake
+, Security
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "hebbot";
+  version = "2.1";
+
+  src = fetchFromGitHub {
+    owner = "haecker-felix";
+    repo = "hebbot";
+    rev = "v${version}";
+    sha256 = "sha256-zcsoTWpNonkgJLTC8S9Nubnzdhj5ROL/UGNWUsLxLgs=";
+  };
+
+  cargoSha256 = "sha256-ZNETA2JUZCS8/a2oeF+JCGVKbzeyhp51D0BmBTPToOw=";
+
+  nativeBuildInputs = [ pkg-config cmake ] ++
+    lib.optionals stdenv.isDarwin [ autoconf automake ];
+
+  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
+
+  meta = with lib; {
+    description = "A Matrix bot which can generate \"This Week in X\" like blog posts ";
+    homepage = "https://github.com/haecker-felix/hebbot";
+    changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v${version}";
+    license = with licenses; [ agpl3 ];
+    maintainers = with maintainers; [ a-kenji ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 447c57ec891e..f0f42fc7ef6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3988,6 +3988,10 @@ with pkgs;
 
   hebcal = callPackage ../tools/misc/hebcal {};
 
+  hebbot = callPackage ../servers/matrix-hebbot {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
+
   hexio = callPackage ../development/tools/hexio { };
 
   hexyl = callPackage ../tools/misc/hexyl { };

From 0e790351a047e1d19a3ee7e9aaff6180e2d24927 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81tila=20Saraiva?= <atilasaraiva@gmail.com>
Date: Thu, 18 Aug 2022 15:11:42 -0300
Subject: [PATCH 146/149] linuxPackages.rtl8188eus: unstable-2021-05-04 ->
 unstable-2022-03-19

---
 .../linux/rtl8188eus-aircrack/default.nix     | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix
index f9f3ce47cb32..0f2e00c8382f 100644
--- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix
+++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix
@@ -1,22 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, kernel, bc }:
+{ lib, stdenv, fetchFromGitHub, kernel, bc, fetchpatch }:
 
 stdenv.mkDerivation {
   pname = "rtl8188eus-aircrack";
-  version = "${kernel.version}-unstable-2021-05-04";
+  version = "${kernel.version}-unstable-2022-03-19";
 
   src = fetchFromGitHub {
     owner = "aircrack-ng";
     repo = "rtl8188eus";
-    rev = "6146193406b62e942d13d4d43580ed94ac70c218";
-    sha256 = "sha256-85STELbFB7QmTaM8GvJNlWvAg6KPAXeYRiMb4cGA6RY=";
+    rev = "0958f294f90b49d6bad4972b14f90676e5d858d3";
+    sha256 = "sha256-dkCcwvOLxqU1IZ/OXTp67akjWgsaH1Cq4N8d9slMRI8=";
   };
 
-  nativeBuildInputs = [ bc ];
-
-  buildInputs = kernel.moduleBuildDependencies;
-
-  hardeningDisable = [ "pic" ];
-
   prePatch = ''
     substituteInPlace ./Makefile \
       --replace /lib/modules/ "${kernel.dev}/lib/modules/" \
@@ -25,17 +19,30 @@ stdenv.mkDerivation {
       --replace '$(MODDESTDIR)' "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/aircrack-ng/rtl8188eus/commit/daa3a2e12290050be3af956915939a55aed50d5f.patch";
+      hash = "sha256-VsvaAhO74LzqUxbmdDT9qwVl6Y9lXfGfrHHK3SbnOVA=";
+    })
+  ];
+
+  hardeningDisable = [ "pic" ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ bc ];
+
+  buildInputs = kernel.moduleBuildDependencies;
+
   preInstall = ''
     mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
   '';
 
-  enableParallelBuilding = true;
-
   meta = with lib; {
     description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support";
     homepage = "https://github.com/aircrack-ng/rtl8188eus";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ fortuneteller2k ];
-    broken = kernel.kernelAtLeast "5.15" || kernel.isHardened;
+    broken = (lib.versionAtLeast kernel.version "5.17") || ((lib.versions.majorMinor kernel.version) == "5.4" && kernel.isHardened);
   };
 }

From fd36ac32c01f34897bbd8d04c2f2828b5e60d3f4 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 18 Aug 2022 22:08:12 +0000
Subject: [PATCH 147/149] Revert "clang_14: drop out-of-date armv7l patch"

This reverts commit f69c82f8ea515d6180decd3df4cc697a973fe807.
---
 .../llvm/14/compiler-rt/armv7l.patch          | 32 +++++++++++++++++++
 .../compilers/llvm/14/compiler-rt/default.nix |  3 +-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch

diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch
new file mode 100644
index 000000000000..120cfe6feb2a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch
@@ -0,0 +1,32 @@
+diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake
+--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake	2020-03-24 00:01:02.000000000 +0900
++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake	2020-05-10 03:42:00.883450706 +0900
+@@ -24,7 +24,7 @@
+ 
+ 
+ set(ARM64 aarch64)
+-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)
++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)
+ set(HEXAGON hexagon)
+ set(X86 i386)
+ set(X86_64 x86_64)
+diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt
+--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt	2020-03-24 00:01:02.000000000 +0900
++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt	2020-05-10 03:44:49.468579650 +0900
+@@ -474,6 +474,7 @@
+ set(armv7_SOURCES ${arm_SOURCES})
+ set(armv7s_SOURCES ${arm_SOURCES})
+ set(armv7k_SOURCES ${arm_SOURCES})
++set(armv7l_SOURCES ${arm_SOURCES})
+ set(arm64_SOURCES ${aarch64_SOURCES})
+ 
+ # macho_embedded archs
+@@ -595,7 +596,7 @@
+   foreach (arch ${BUILTIN_SUPPORTED_ARCH})
+     if (CAN_TARGET_${arch})
+       # For ARM archs, exclude any VFP builtins if VFP is not supported
+-      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
++      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")
+         string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")
+         check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)
+         if(NOT COMPILER_RT_HAS_${arch}_VFP)
diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix
index 508b9466e7b8..cc1a8dc0481f 100644
--- a/pkgs/development/compilers/llvm/14/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/14/compiler-rt/default.nix
@@ -73,7 +73,8 @@ stdenv.mkDerivation {
     # extra `/`.
     ./normalize-var.patch
   ] # Prevent a compilation error on darwin
-    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch;
+    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch
+    ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch;
 
   # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
   # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra

From d6636a5de6bb7d261adc2957c4a909ae035aae3b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 18 Aug 2022 22:09:11 +0000
Subject: [PATCH 148/149] llvmPackages_14.compiler-rt: fix aarch32 patch

This is just the same fix we did for LLVM 13 in
265ba73a782aab3049177ccf67e2612cb51b831f applied to LLVM 14.
---
 .../compilers/llvm/14/compiler-rt/armv7l.patch    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch
index 120cfe6feb2a..6818684e6a71 100644
--- a/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch
+++ b/pkgs/development/compilers/llvm/14/compiler-rt/armv7l.patch
@@ -1,19 +1,18 @@
 diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake
 --- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake	2020-03-24 00:01:02.000000000 +0900
 +++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake	2020-05-10 03:42:00.883450706 +0900
-@@ -24,7 +24,7 @@
- 
+@@ -37,6 +37,6 @@
  
  set(ARM64 aarch64)
--set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k)
-+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l)
+-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv8m.main armv8.1m.main)
++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l armv8m.main armv8.1m.main)
  set(HEXAGON hexagon)
  set(X86 i386)
  set(X86_64 x86_64)
 diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt
 --- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt	2020-03-24 00:01:02.000000000 +0900
 +++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt	2020-05-10 03:44:49.468579650 +0900
-@@ -474,6 +474,7 @@
+@@ -555,6 +555,7 @@
  set(armv7_SOURCES ${arm_SOURCES})
  set(armv7s_SOURCES ${arm_SOURCES})
  set(armv7k_SOURCES ${arm_SOURCES})
@@ -21,12 +20,12 @@ diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.s
  set(arm64_SOURCES ${aarch64_SOURCES})
  
  # macho_embedded archs
-@@ -595,7 +596,7 @@
+@@ -705,7 +705,7 @@
    foreach (arch ${BUILTIN_SUPPORTED_ARCH})
      if (CAN_TARGET_${arch})
        # For ARM archs, exclude any VFP builtins if VFP is not supported
--      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$")
-+      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$")
+-      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
++      if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em|armv8m.main|armv8.1m.main)$")
          string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}")
          check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP)
          if(NOT COMPILER_RT_HAS_${arch}_VFP)

From f04a9770e504ab92aa0872e2327c3da4d6e3da6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Aug 2022 10:27:47 +0000
Subject: [PATCH 149/149] ghr: 0.14.0 -> 0.15.0

---
 .../git-and-tools/ghr/default.nix             | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/git-and-tools/ghr/default.nix
index 5570dbf10148..b5188c97f07c 100644
--- a/pkgs/applications/version-management/git-and-tools/ghr/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghr/default.nix
@@ -1,25 +1,31 @@
-{ lib, buildGoModule, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, ghr
+}:
 
 buildGoModule rec {
   pname = "ghr";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "tcnksm";
     repo = "ghr";
     rev = "v${version}";
-    sha256 = "sha256-pF1TPvQLPa5BbXZ9rRCq7xWofXCBRa9CDgNxX/kaTMo=";
+    sha256 = "sha256-947hTRfx3GM6qKDYvlKEmofqPdcmwx9V/zISkcSKALM=";
   };
 
-  vendorSha256 = "sha256-+e9Q4Pw9pJyOXVz85KhOSuybj1PBcJi51fGR3a2Gixk=";
+  vendorSha256 = "sha256-OpWp3v1nxHJpEh2jW8MYnbaq66wx9b3DlaKzeti5N3w=";
 
   # Tests require a Github API token, and networking
   doCheck = false;
   doInstallCheck = true;
 
-  installCheckPhase = ''
-    $out/bin/ghr --version
-  '';
+  passthru.tests.testVersion = testers.testVersion {
+    package = ghr;
+    version = "ghr version v${version}";
+  };
 
   meta = with lib; {
     homepage = "https://github.com/tcnksm/ghr";