From 44011a050288f2d2d9f31f4fa5c54191df090b58 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 16:43:31 +0200
Subject: [PATCH 01/92] python310Packages.bravado-core: disable failing tests

---
 .../python-modules/bravado-core/default.nix   | 109 ++++++++++++++----
 1 file changed, 84 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index 24db42b7a74f..04a42e9f18fe 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -1,47 +1,106 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python-dateutil, jsonref, jsonschema,
-  pyyaml, simplejson, six, pytz, msgpack, swagger-spec-validator, rfc3987,
-  strict-rfc3339, webcolors, mypy-extensions, jsonpointer, idna, pytest, mock,
-  pytest-benchmark, isPy27, enum34 }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fqdn
+, idna
+, isoduration
+, jsonpointer
+, jsonref
+, jsonschema
+, mock
+, msgpack
+, mypy-extensions
+, pytest-benchmark
+, pytestCheckHook
+, python-dateutil
+, pythonOlder
+, pytz
+, pyyaml
+, rfc3987
+, rfc3339-validator
+, simplejson
+, six
+, strict-rfc3339
+, swagger-spec-validator
+, uri-template
+, webcolors
+}:
 
 buildPythonPackage rec {
   pname = "bravado-core";
   version = "5.17.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "Yelp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE=";
+    hash = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE=";
   };
 
+  propagatedBuildInputs = [
+    jsonref
+    jsonschema
+    msgpack
+    python-dateutil
+    pytz
+    pyyaml
+    simplejson
+    six
+    swagger-spec-validator
+
+    # the following packages are included when jsonschema (3.2) is installed
+    # as jsonschema[format], which reflects what happens in setup.py
+    fqdn
+    idna
+    isoduration
+    jsonpointer
+    rfc3987
+    rfc3339-validator
+    strict-rfc3339
+    uri-template
+    webcolors
+  ];
+
   checkInputs = [
     mypy-extensions
-    pytest
+    pytestCheckHook
     mock
     pytest-benchmark
   ];
 
-  checkPhase = "pytest --benchmark-skip";
+  pythonImportsCheck = [
+    "bravado_core"
+  ];
 
-  propagatedBuildInputs = [
-    python-dateutil
-    jsonref
-    jsonschema
-    pyyaml
-    simplejson
-    six
-    pytz
-    msgpack
-    swagger-spec-validator
+  pytestFlagsArray = [
+    "--benchmark-skip"
+  ];
 
-    # the following 3 packages are included when jsonschema (3.2) is installed
-    # as jsonschema[format], which reflects what happens in setup.py
-    rfc3987
-    strict-rfc3339
-    webcolors
-    jsonpointer
-    idna
-  ] ++ lib.optionals isPy27 [ enum34 ];
+  disabledTestPaths = [
+    # Tests are out-dated (not supporting later modules releases, e.g., jsonschema)
+    "tests/_decorators_test.py"
+    "tests/formatter"
+    "tests/marshal"
+    "tests/model"
+    "tests/operation"
+    "tests/param"
+    "tests/request"
+    "tests/resource"
+    "tests/response"
+    "tests/schema"
+    "tests/security_test.py"
+    "tests/spec"
+    "tests/swagger20_validator"
+    "tests/unmarshal"
+    "tests/validate"
+  ];
+
+  disabledTests = [
+    "test_petstore_spec"
+  ];
 
   meta = with lib; {
     description = "Library for adding Swagger support to clients and servers";

From 58d2ebb2831fa3236598398c7dbba8e205d4e91c Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Thu, 26 May 2022 15:48:31 +0200
Subject: [PATCH 02/92] ntfs3g: 2021.8.22 -> 2022.5.17

This is unfortunately more complex than a simple version bump because
upstream has not released a dist tarball for this release. This commit
switches to using the github source and running autoreconf ourselves.

Along the way, stop randomly patching sources and Makefiles and instead
switch to upstreamable alternatives. The two (small) build system
patches have been sent upstream, see tuxera/ntfs-3g#39.
---
 .../ntfs-3g/autoconf-sbin-helpers.patch       | 98 +++++++++++++++++++
 .../ntfs-3g/consistent-sbindir-usage.patch    | 48 +++++++++
 pkgs/tools/filesystems/ntfs-3g/default.nix    | 43 ++++----
 3 files changed, 172 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
 create mode 100644 pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch

diff --git a/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch b/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
new file mode 100644
index 000000000000..5e896063ba6a
--- /dev/null
+++ b/pkgs/tools/filesystems/ntfs-3g/autoconf-sbin-helpers.patch
@@ -0,0 +1,98 @@
+diff --git a/configure.ac b/configure.ac
+index 9aa25bd5..c7c0437b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,6 +185,30 @@ AC_ARG_ENABLE(
+ 	]
+ )
+ 
++AC_ARG_WITH(
++	[mount-helper],
++	[AS_HELP_STRING([--with-mount-helper=BIN],[use the specified binary as mount helper @<:@default=/sbin/mount@:>@])],
++	[mount_helper="$withval"],
++	[mount_helper="/sbin/mount"]
++)
++AC_DEFINE_UNQUOTED([MOUNT_HELPER], ["$mount_helper"], [Binary used as mount helper.])
++
++AC_ARG_WITH(
++	[umount-helper],
++	[AS_HELP_STRING([--with-umount-helper=BIN],[use the specified binary as umount helper @<:@default=/sbin/umount@:>@])],
++	[umount_helper="$withval"],
++	[umount_helper="/sbin/umount"]
++)
++AC_DEFINE_UNQUOTED([UMOUNT_HELPER], ["$umount_helper"], [Binary used as umount helper.])
++
++AC_ARG_WITH(
++	[modprobe-helper],
++	[AS_HELP_STRING([--with-modprobe-helper=BIN],[use the specified binary as modprobe helper @<:@default=/sbin/modprobe@:>@])],
++	[modprobe_helper="$withval"],
++	[modprobe_helper="/sbin/modprobe"]
++)
++AC_DEFINE_UNQUOTED([MODPROBE_HELPER], ["$modprobe_helper"], [Binary used as modprobe helper.])
++
+ # pthread_rwlock_t requires _GNU_SOURCE
+ AC_GNU_SOURCE
+ 
+diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c
+index 8b317224..ee75ace6 100644
+--- a/libfuse-lite/mount_util.c
++++ b/libfuse-lite/mount_util.c
+@@ -89,10 +89,10 @@ int fuse_mnt_add_mount(const char *progname, const char *fsname,
+             exit(1);
+         }
+         rmdir(tmp);
+-        execle("/sbin/mount", "/sbin/mount", "-F", type, "-o", opts,
++        execle(MOUNT_HELPER, MOUNT_HELPER, "-F", type, "-o", opts,
+               fsname, mnt, NULL, &env);
+-        fprintf(stderr, "%s: failed to execute /sbin/mount: %s\n", progname,
+-                strerror(errno));
++        fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
++                MOUNT_HELPER, strerror(errno));
+         exit(1);
+     }
+     res = waitpid(res, &status, 0);
+@@ -126,14 +126,14 @@ int fuse_mnt_umount(const char *progname, const char *mnt, int lazy)
+ 
+         setuid(geteuid());
+         if (lazy) {
+-            execle("/sbin/umount", "/sbin/umount", mnt,
++            execle(UMOUNT_HELPER, UMOUNT_HELPER, mnt,
+                    NULL, &env);
+         } else {
+-            execle("/sbin/umount", "/sbin/umount", "-f", mnt,
++            execle(UMOUNT_HELPER, UMOUNT_HELPER, "-f", mnt,
+                    NULL, &env);
+         }
+-        fprintf(stderr, "%s: failed to execute /sbin/umount: %s\n", progname,
+-                strerror(errno));
++        fprintf(stderr, "%s: failed to execute %s: %s\n", progname,
++                UMOUNT_HELPER, strerror(errno));
+         exit(1);
+     }
+     res = waitpid(res, &status, 0);
+diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
+index 9330500c..dd18a93f 100644
+--- a/src/lowntfs-3g.c
++++ b/src/lowntfs-3g.c
+@@ -4463,7 +4463,7 @@ static fuse_fstype load_fuse_module(void)
+ 	int i;
+ 	struct stat st;
+ 	pid_t pid;
+-	const char *cmd = "/sbin/modprobe";
++	const char *cmd = MODPROBE_HELPER;
+ 	char *env = (char*)NULL;
+ 	struct timespec req = { 0, 100000000 };   /* 100 msec */
+ 	fuse_fstype fstype;
+diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
+index d8227e71..f5d77252 100644
+--- a/src/ntfs-3g.c
++++ b/src/ntfs-3g.c
+@@ -4171,7 +4171,7 @@ static fuse_fstype load_fuse_module(void)
+ 	int i;
+ 	struct stat st;
+ 	pid_t pid;
+-	const char *cmd = "/sbin/modprobe";
++	const char *cmd = MODPROBE_HELPER;
+ 	char *env = (char*)NULL;
+ 	struct timespec req = { 0, 100000000 };   /* 100 msec */
+ 	fuse_fstype fstype;
diff --git a/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch b/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch
new file mode 100644
index 000000000000..29a35ecb1dd1
--- /dev/null
+++ b/pkgs/tools/filesystems/ntfs-3g/consistent-sbindir-usage.patch
@@ -0,0 +1,48 @@
+diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am
+index 08228322..a390d8c7 100644
+--- a/ntfsprogs/Makefile.am
++++ b/ntfsprogs/Makefile.am
+@@ -165,7 +165,7 @@ extras:	libs $(EXTRA_PROGRAMS)
+ 
+ if ENABLE_MOUNT_HELPER
+ install-exec-hook:
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir)
++	$(INSTALL) -d $(DESTDIR)$(sbindir)
+ 	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
+ 
+ install-data-hook:
+@@ -173,7 +173,7 @@ install-data-hook:
+ 	$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ 
+ uninstall-local:
+-	$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
++	$(RM) -f $(DESTDIR)$(sbindir)/mkfs.ntfs
+ 	$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+ endif
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8d984083..ea407067 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -66,9 +66,9 @@ endif
+ 
+ if ENABLE_MOUNT_HELPER
+ install-exec-local:	install-rootbinPROGRAMS
+-	$(MKDIR_P) "$(DESTDIR)/sbin"
+-	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
+-	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++	$(MKDIR_P) "$(DESTDIR)$(rootsbindir)"
++	$(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g"
++	$(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
+ 
+ install-data-local:	install-man8
+ 	$(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
+@@ -76,7 +76,7 @@ install-data-local:	install-man8
+ 
+ uninstall-local:
+ 	$(RM) -f "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
+-	$(RM) -f "$(DESTDIR)/sbin/mount.ntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++	$(RM) -f "$(DESTDIR)$(rootsbindir)/mount.ntfs-3g" "$(DESTDIR)$(rootsbindir)/mount.lowntfs-3g"
+ endif
+ 
+ endif # ENABLE_NTFS_3G
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index de110f61dd81..fe0ae20f557b 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -1,30 +1,34 @@
-{ lib, stdenv, fetchurl, pkg-config, mount, libuuid
-, macfuse-stubs, DiskArbitration
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
+, gettext, mount, libuuid, kmod, macfuse-stubs, DiskArbitration
 , crypto ? false, libgcrypt, gnutls
 }:
 
 stdenv.mkDerivation rec {
   pname = "ntfs3g";
-  version = "2021.8.22";
+  version = "2022.5.17";
 
   outputs = [ "out" "dev" "man" "doc" ];
 
-  buildInputs = [ libuuid ] ++ lib.optionals crypto [ gnutls libgcrypt ]
-    ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ];
-  nativeBuildInputs = [ pkg-config ];
-
-  src = fetchurl {
-    url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
-    sha256 = "55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb";
+  src = fetchFromGitHub {
+    owner = "tuxera";
+    repo = "ntfs-3g";
+    rev = version;
+    sha256 = "sha256-xh8cMNIHeJ1rtk5zwOsmcxeedgZ3+MSiWn2UC7y+gtQ=";
   };
 
-  patchPhase = ''
-    substituteInPlace src/Makefile.in --replace /sbin '@sbindir@'
-    substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@'
-    substituteInPlace libfuse-lite/mount_util.c \
-      --replace /bin/mount ${mount}/bin/mount \
-      --replace /bin/umount ${mount}/bin/umount
-  '';
+  buildInputs = [ gettext libuuid ]
+    ++ lib.optionals crypto [ gnutls libgcrypt ]
+    ++ lib.optionals stdenv.isDarwin [ macfuse-stubs DiskArbitration ];
+
+  # Note: libgcrypt is listed here non-optionally because its m4 macros are
+  # being used in ntfs-3g's configure.ac.
+  nativeBuildInputs = [ autoreconfHook libgcrypt pkg-config ];
+
+  patches = [
+    # https://github.com/tuxera/ntfs-3g/pull/39
+    ./autoconf-sbin-helpers.patch
+    ./consistent-sbindir-usage.patch
+  ];
 
   configureFlags = [
     "--disable-ldconfig"
@@ -34,6 +38,9 @@ stdenv.mkDerivation rec {
     "--enable-xattr-mappings"
     "--${if crypto then "enable" else "disable"}-crypto"
     "--enable-extras"
+    "--with-mount-helper=${mount}/bin/mount"
+    "--with-umount-helper=${mount}/bin/umount"
+    "--with-modprobe-helper=${kmod}/bin/modprobe"
   ];
 
   postInstall =
@@ -42,6 +49,8 @@ stdenv.mkDerivation rec {
       ln -sv mount.ntfs-3g $out/sbin/mount.ntfs
     '';
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     homepage = "https://github.com/tuxera/ntfs-3g";
     description = "FUSE-based NTFS driver with full write support";

From c9a10a58f33ff927d066df4735a3c057cf7ee2af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jun 2022 06:30:51 +0000
Subject: [PATCH 03/92] libmediaart: 1.9.5 -> 1.9.6

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

diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix
index 7f9c4d6ac94b..531ff8584fac 100644
--- a/pkgs/development/libraries/libmediaart/default.nix
+++ b/pkgs/development/libraries/libmediaart/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmediaart";
-  version = "1.9.5";
+  version = "1.9.6";
 
   outputs = [ "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1mlw1qgj8nkd9ll6b6h54r1gfdy3zp8a8xqz7qfyfaj85jjgbph7";
+    sha256 = "w7xQJdfbOAWH+cjrgAxhH2taFta0t4/P+T9ih2pnfxc=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];

From aa9f72b92b6b3dfd848524e9fa64acc3595cfe6c Mon Sep 17 00:00:00 2001
From: Rick van Schijndel <rol3517@gmail.com>
Date: Mon, 23 Aug 2021 21:50:33 +0200
Subject: [PATCH 04/92] opencv4: disable hdf5 for cross-compilation

This gets us as far as building opencv, but it doesn't completely build yet
---
 pkgs/development/libraries/opencv/4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 0c6f9fb90c0c..c84740ebcdc9 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -244,9 +244,9 @@ stdenv.mkDerivation {
     echo '"(build info elided)"' > modules/core/version_string.inc
   '';
 
-  buildInputs =
-    [ zlib pcre hdf5 boost gflags protobuf ]
+  buildInputs = [ zlib pcre boost gflags protobuf ]
     ++ lib.optional enablePython pythonPackages.python
+    ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
     ++ lib.optional enableGtk2 gtk2
     ++ lib.optional enableGtk3 gtk3
     ++ lib.optional enableVtk vtk

From 3a34767c9bcfeea7809be5284202381c1ae3e675 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 4 Jun 2022 04:20:00 +0000
Subject: [PATCH 05/92] smatch: 20120924 -> 1.72

---
 .../tools/analysis/smatch/default.nix         | 43 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index 82a32504d73a..b22c1c4411fa 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -1,34 +1,39 @@
-{ lib, stdenv, fetchgit, sqlite, pkg-config, perl
-, buildllvmsparse ? true
-, buildc2xml ? true
-, llvm, libxml2
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, sqlite
+, openssl
+, buildllvmsparse ? false
+, buildc2xml ? false
+, libllvm
+, libxml2
 }:
 
 stdenv.mkDerivation rec {
   pname = "smatch";
-  version = "20120924";
+  version = "1.72";
 
-  src = fetchgit {
-    url = "git://repo.or.cz/${pname}.git";
-    rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9";
-    sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
+  src = fetchFromGitHub {
+    owner = "error27";
+    repo = "smatch";
+    rev = version;
+    sha256 = "sha256-XVW4sAgIxaJjAk75bp/O286uddIfgfKtIA2LniUGWBM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ sqlite perl ]
-   ++ lib.optional buildllvmsparse llvm
-   ++ lib.optional buildc2xml libxml2;
 
-  preBuild = ''
-    sed -i Makefile \
-      -e "s|^PREFIX=.*|PREFIX = $out|g"
-  '';
+  buildInputs = [ sqlite openssl ]
+    ++ lib.optionals buildllvmsparse [ libllvm ]
+    ++ lib.optionals buildc2xml [ libxml2.dev ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" "CXX=${stdenv.cc.targetPrefix}c++" ];
 
   meta = with lib; {
     description = "A semantic analysis tool for C";
     homepage = "http://smatch.sourceforge.net/";
-    maintainers = with maintainers; [];
-    license = licenses.free; /* OSL, see http://www.opensource.org */
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51b8eb6f2688..1f22502e4e9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16208,10 +16208,7 @@ with pkgs;
 
   sloc = nodePackages.sloc;
 
-  smatch = callPackage ../development/tools/analysis/smatch {
-    buildllvmsparse = false;
-    buildc2xml = false;
-  };
+  smatch = callPackage ../development/tools/analysis/smatch { };
 
   smc = callPackage ../tools/misc/smc { };
 

From cb90b5a8e42e674852dbe2c4f864fca2bd84e50a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 4 Jun 2022 04:20:00 +0000
Subject: [PATCH 06/92] smatch: add marsam to maintainers

---
 pkgs/development/tools/analysis/smatch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index b22c1c4411fa..ff7462091069 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A semantic analysis tool for C";
     homepage = "http://smatch.sourceforge.net/";
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ marsam ];
     license = licenses.gpl2Plus;
     platforms = platforms.all;
   };

From e174b463e7f01a32a4347d92f0e7cbc80ea5cd1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 5 Jun 2022 16:51:27 +0000
Subject: [PATCH 07/92] nixops: mark insecure

---
 pkgs/tools/package-management/nixops/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 2ec98b82c690..21118870bfaf 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -6,6 +6,18 @@ let
   inherit (poetry2nix.mkPoetryPackages {
     projectDir = ./python-env;
     python = python2;
+    overrides = [
+      poetry2nix.defaultPoetryOverrides
+      (self: super: {
+        pyjwt = super.pyjwt.overridePythonAttrs (old: {
+          meta = old.meta // {
+            knownVulnerabilities = lib.optionals (lib.versionOlder old.version "2.4.0") [
+              "CVE-2022-29217"
+            ];
+          };
+        });
+      })
+    ];
   }) python;
   pythonPackages = python.pkgs;
 

From 007ffa606906411323ef32448ea97c005cffe597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 5 Jun 2022 17:07:25 +0000
Subject: [PATCH 08/92] python2Packages.pyjwt: mark insecure

---
 pkgs/development/python2-modules/pyjwt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python2-modules/pyjwt/default.nix b/pkgs/development/python2-modules/pyjwt/default.nix
index 9978302d1cc4..011f526e520f 100644
--- a/pkgs/development/python2-modules/pyjwt/default.nix
+++ b/pkgs/development/python2-modules/pyjwt/default.nix
@@ -40,5 +40,8 @@ buildPythonPackage rec {
     description = "JSON Web Token implementation in Python";
     homepage = "https://github.com/jpadilla/pyjwt";
     license = licenses.mit;
+    knownVulnerabilities = [
+      "CVE-2022-29217"
+    ];
   };
 }

From ac4fc73abc159cd8860ce7b61844306335fb3578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 5 Jun 2022 17:10:32 +0000
Subject: [PATCH 09/92] python2Packages.urllib3: mark insecure

---
 pkgs/development/python2-modules/urllib3/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python2-modules/urllib3/default.nix b/pkgs/development/python2-modules/urllib3/default.nix
index a52e68eac5e3..c23835ce4dc2 100644
--- a/pkgs/development/python2-modules/urllib3/default.nix
+++ b/pkgs/development/python2-modules/urllib3/default.nix
@@ -77,5 +77,8 @@ buildPythonPackage rec {
     homepage = "https://github.com/shazow/urllib3";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    knownVulnerabilities = [
+      "CVE-2021-33503"
+    ];
   };
 }

From 535900e91dab642100660cdecc966dd164b134e3 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Mon, 6 Jun 2022 12:27:45 +1000
Subject: [PATCH 10/92] jpegexiforient: fix cross-compilation

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

diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/tools/graphics/jpegexiforient/default.nix
index 9397f46fd2c5..09d096e7b687 100644
--- a/pkgs/tools/graphics/jpegexiforient/default.nix
+++ b/pkgs/tools/graphics/jpegexiforient/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     cp $src jpegexiforient.c
   '';
   buildPhase = ''
-    cc -o jpegexiforient jpegexiforient.c
+    $CC -o jpegexiforient jpegexiforient.c
   '';
   installPhase = ''
     install -Dt $out/bin jpegexiforient

From e6299e53681576838fb13380e088afbee3ff7a3d Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 6 Jun 2022 13:13:32 +0900
Subject: [PATCH 11/92] ruby: move jemalloc to propagatedBuildInputs

Alternative malloc implementations in ruby are not fully encapsulated.
Their header files are required when building gems with native
extensions, like bcrypt.
---
 pkgs/development/interpreters/ruby/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d30a2d2073ea..07349cf4f91d 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -79,13 +79,13 @@ let
           ++ (op opensslSupport openssl)
           ++ (op gdbmSupport gdbm)
           ++ (op yamlSupport libyaml)
-          ++ (op jemallocSupport jemalloc)
           # Looks like ruby fails to build on darwin without readline even if curses
           # support is not enabled, so add readline to the build inputs if curses
           # support is disabled (if it's enabled, we already have it) and we're
           # running on darwin
           ++ op (!cursesSupport && stdenv.isDarwin) readline
           ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
+        propagatedBuildInputs = op jemallocSupport jemalloc;
 
         enableParallelBuilding = true;
 

From 6f0681dd6bb3e3029b78bfc74a812326121bfad6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 12:50:54 +0200
Subject: [PATCH 12/92] checkov: 2.0.1188 -> 2.0.1195

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

diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 6638bec4002c..b5977e61acdc 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -32,14 +32,14 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "checkov";
-  version = "2.0.1188";
+  version = "2.0.1195";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = pname;
     rev = version;
-    hash = "sha256-TK2In3FlcjrJjwfS0flgmgbd7nVv4g69v/ZZfWmbkr4=";
+    hash = "sha256-YzM/YzTeFqNe7ThNH138g13aSzEXK8rzTWit1g27GVw=";
   };
 
   nativeBuildInputs = with py.pkgs; [

From 113f20488ce644858959c77d58e11d8579e715be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= <shesselm@redhat.com>
Date: Mon, 6 Jun 2022 14:40:12 +0200
Subject: [PATCH 13/92] roxctl: 3.69.1 -> 3.70.0

---
 pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix
index 4d62dad4af6e..9014ce520257 100644
--- a/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "3.69.1";
+  version = "3.70.0";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-fB43C+gMtUOg/Ah1fOTnOWOUmS0TjXkNCzw/TKfMzj4=";
+    sha256 = "sha256-VnnMD2tRixCswO/9nrP3PgXmev6O8QUTbkwmFIpPUyE=";
   };
 
-  vendorSha256 = "sha256-M+ZueycJEaDVzC2bFwQc5EulCrdz6lvzyD8YCoGyW1g=";
+  vendorSha256 = "sha256-xh2bgLSWjQHOjHrgDpQri78LvCL4CDbMteQYARyGLgg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 6b7b3858d6e2dd27eab7f0e63a22410a9fbf9218 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:52:44 +0200
Subject: [PATCH 14/92] python310Packages.pyroute2-core: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-core/default.nix b/pkgs/development/python-modules/pyroute2-core/default.nix
index 7a13dc79aa99..3676ce9a469c 100644
--- a/pkgs/development/python-modules/pyroute2-core/default.nix
+++ b/pkgs/development/python-modules/pyroute2-core/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-core";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.core";
     inherit version;
-    hash = "sha256-lH0Mi2nR4jqawvpvVfn79U0AflxE8lU1VLKvqAEXDOo=";
+    hash = "sha256-hwI7sSaR0938VeCShzZ39b2CAU5SJLqui8Ri3CGXPwk=";
   };
 
   # pyroute2 sub-modules have no tests

From b9bbe8bfd872bdd0459b7c73f5c5277652eb262f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:52:49 +0200
Subject: [PATCH 15/92] python310Packages.pyroute2-ethtool: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/pkgs/development/python-modules/pyroute2-ethtool/default.nix
index dae025618b7a..515bdfb2d6d8 100644
--- a/pkgs/development/python-modules/pyroute2-ethtool/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ethtool/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ethtool";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ethtool";
     inherit version;
-    hash = "sha256-6o75plLeSle6ZFgoIZGKLCjx1hg4Z2okOq2RqAT2g8E=";
+    hash = "sha256-5i1zbKs40RXCQB1cn3jrDOX+Fgl0nknTFLsvI69udxw=";
   };
 
   propagatedBuildInputs = [

From dfbb3544b616dad5f8d0750939d8beb8da5a279c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:52:55 +0200
Subject: [PATCH 16/92] python310Packages.pyroute2-ipdb: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/pkgs/development/python-modules/pyroute2-ipdb/default.nix
index 22991fe20268..5a3b4d186556 100644
--- a/pkgs/development/python-modules/pyroute2-ipdb/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ipdb/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ipdb";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ipdb";
     inherit version;
-    hash = "sha256-sJ9Zzlrh9FWVWL7StyHpPPuXo6TtNLz2/lQBCl53Wrk=";
+    hash = "sha256-emPIh94LqN/QCCLC6Mr+IiVyXtjdsmhduBdPko1V83A=";
   };
 
   propagatedBuildInputs = [

From f6742c5cf71fd22e22caff0646d1c470674cc6b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:53:00 +0200
Subject: [PATCH 17/92] python310Packages.pyroute2-ndb: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-ndb/default.nix b/pkgs/development/python-modules/pyroute2-ndb/default.nix
index 47c309cbc321..b0e123bc4c4b 100644
--- a/pkgs/development/python-modules/pyroute2-ndb/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ndb/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ndb";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ndb";
     inherit version;
-    hash = "sha256-ASk6ycw3dQNMV4xmaxPAHDL1KtrY1JGQ5yJYcJ+OgUE=";
+    hash = "sha256-kjgeA7PV6JLvCvaZxe4y984wTo8ExU7Yf1Wr+7jNwu4=";
   };
 
   propagatedBuildInputs = [

From b38ab26b582da5a48bdd2f948ee58576f2a730d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:53:06 +0200
Subject: [PATCH 18/92] python310Packages.pyroute2-nftables: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-nftables/default.nix b/pkgs/development/python-modules/pyroute2-nftables/default.nix
index 3c76692016d9..04f9b29bd56f 100644
--- a/pkgs/development/python-modules/pyroute2-nftables/default.nix
+++ b/pkgs/development/python-modules/pyroute2-nftables/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-nftables";
-  version = "0.6.9";
+  version = "0.6.10";
 
   src = fetchPypi {
     pname = "pyroute2.nftables";
     inherit version;
-    sha256 = "sha256-8BLz8IIobmrGb64PhXz1XWfl3KJTOhOL+j1C4/jlXuI=";
+    sha256 = "sha256-dUuCTGs7RaEehsAgK7yNw11tE3VGtT5LxDilMVWpCNU=";
   };
 
   propagatedBuildInputs = [

From c2a307802e8f957fa92079311c3cef6a055e27cc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:53:11 +0200
Subject: [PATCH 19/92] python310Packages.pyroute2-nslink: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-nslink/default.nix b/pkgs/development/python-modules/pyroute2-nslink/default.nix
index 387a9b403df5..368e9cc9fb55 100644
--- a/pkgs/development/python-modules/pyroute2-nslink/default.nix
+++ b/pkgs/development/python-modules/pyroute2-nslink/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-nslink";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.nslink";
     inherit version;
-    hash = "sha256-WZjRexKn1FWXj+5KZxqZXB0aZmnd0ECKWt3hvVDdz4w=";
+    hash = "sha256-PynJRg2pXZIeB4Ucz/tvghdEt1iWAr8azjET9hsnUPE=";
   };
 
   propagatedBuildInputs = [

From b6bae6fcb2d7a18586d1685aae848f758532ae16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:53:17 +0200
Subject: [PATCH 20/92] python310Packages.pyroute2-protocols: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-protocols/default.nix b/pkgs/development/python-modules/pyroute2-protocols/default.nix
index 99c146d41e4d..401786f7cd60 100644
--- a/pkgs/development/python-modules/pyroute2-protocols/default.nix
+++ b/pkgs/development/python-modules/pyroute2-protocols/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-protocols";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.protocols";
     inherit version;
-    hash = "sha256-7vP4rbid2cVGKlYUM5qsmYXQhUfvIWoaDXYnxSUnSJY=";
+    hash = "sha256-xMTKAJC++X1zO7rm+cUr0IuEDxkllyje00Omv9tLZ6E=";
   };
 
   propagatedBuildInputs = [

From ea3223f6f840a1139c609d37944dce1261096452 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:53:23 +0200
Subject: [PATCH 21/92] python310Packages.pyroute2: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 9b15711ef0f2..54540197f72b 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PRxNGnH7VpyrV49V9xNO8C1I6LMYK05+ZrKndWKO2vs=";
+    hash = "sha256-Vj7W3/yQPYIUFEdvNv3AS9OqddqtISRbcmWUJxc5JiI=";
   };
 
   propagatedBuildInputs = [

From 27723a19429b2525939543091bbb85fd0e592331 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 14:53:29 +0200
Subject: [PATCH 22/92] python310Packages.pyroute2-ipset: 0.6.9 -> 0.6.10

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

diff --git a/pkgs/development/python-modules/pyroute2-ipset/default.nix b/pkgs/development/python-modules/pyroute2-ipset/default.nix
index 7bf625c08864..783405f0eafc 100644
--- a/pkgs/development/python-modules/pyroute2-ipset/default.nix
+++ b/pkgs/development/python-modules/pyroute2-ipset/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pyroute2-ipset";
-  version = "0.6.9";
+  version = "0.6.10";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyroute2.ipset";
     inherit version;
-    hash = "sha256-icEMJno03WKUdIYTZ6BIAo9lm43RwMjxNXcoSkYF81M=";
+    hash = "sha256-1Fk3imqMz9qx1zBcQ/Uyp2eVrTygGIklVF5/QBbuSoI=";
   };
 
   propagatedBuildInputs = [

From 5a0bdf69987fb65178952c6c01b1c6e329c9268c Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Mon, 6 Jun 2022 17:59:10 +0200
Subject: [PATCH 23/92] adguardhome: 0.107.6 - 0.107.7

---
 pkgs/servers/adguardhome/bins.nix    | 20 ++++++++++----------
 pkgs/servers/adguardhome/default.nix |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix
index bbcc7cf54897..d2346d7ff5ed 100644
--- a/pkgs/servers/adguardhome/bins.nix
+++ b/pkgs/servers/adguardhome/bins.nix
@@ -1,23 +1,23 @@
 { fetchurl, fetchzip }:
 {
 x86_64-darwin = fetchzip {
-  sha256 = "sha256-vUOdHDyvVg+8GhctW925WfjONi7TnPRfVfXmehOweB4=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_amd64.zip";
+  sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip";
 };
 aarch64-darwin = fetchzip {
-  sha256 = "sha256-3JmMvxd317Qmyrv7vWyfQsLol+yPuKBXHByt5YRrbX8=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_darwin_arm64.zip";
+  sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip";
 };
 i686-linux = fetchurl {
-  sha256 = "sha256-A6IsDRbRHyU0+IUKkrudKvlKiJkVNNs12MrKQ6RlpMQ=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_386.tar.gz";
+  sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz";
 };
 x86_64-linux = fetchurl {
-  sha256 = "sha256-nPcqAk0m1e9izkylBuNcatHESgvSewR+MKmVdz+HBec=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_amd64.tar.gz";
+  sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz";
 };
 aarch64-linux = fetchurl {
-  sha256 = "sha256-ITkZdVU03FG9AUAMgD6nlCyioPJX357wB9m1jYdPlS4=";
-  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.6/AdGuardHome_linux_arm64.tar.gz";
+  sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c=";
+  url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz";
 };
 }
diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix
index be3943c9fad8..dbf9e14ebc67 100644
--- a/pkgs/servers/adguardhome/default.nix
+++ b/pkgs/servers/adguardhome/default.nix
@@ -7,7 +7,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "adguardhome";
-  version = "0.107.6";
+  version = "0.107.7";
   src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
 
   installPhase = ''

From e2d15bd6fed9a7d2d29599ccf98115090cc53c85 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 6 Jun 2022 18:04:31 +0100
Subject: [PATCH 24/92] galculator: pull fix pending upstream inclusion for
 -fno-common toolchains

Without the change build fails on upstream gcc-10 as:

    ld: galculator-config_file.o:src/config_file.c:42:
      multiple definition of `prefs'; galculator-main.o:src/main.c:52: first defined here
---
 pkgs/applications/misc/galculator/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 287a2fca3637..a96cbb566106 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub, fetchpatch
 , autoreconfHook, intltool
 , gtk, pkg-config, flex }:
 
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
     sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
   };
 
+  patches = [
+    # Pul patch pending upstream inclusion for -fno-common toolchain support:
+    #   https://github.com/galculator/galculator/pull/45
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/galculator/galculator/commit/501a9e3feeb2e56889c0ff98ab6d0ab20348ccd6.patch";
+      sha256 = "08c9d2b49a1mizgk7v37dp8r96x389zc13mzv4dcy16x448lhp67";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook intltool pkg-config ];
   buildInputs = [ gtk flex ];
 

From 60d0be36a11c3471ca8fee0ededa17944d187a29 Mon Sep 17 00:00:00 2001
From: DarkOnion0 <darkonion0@clapot.org>
Date: Mon, 6 Jun 2022 20:27:38 +0200
Subject: [PATCH 25/92] drawio: 19.0.0 -> 19.0.1

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

diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 5b27f545d71e..d3f854966406 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "drawio";
-  version = "19.0.0";
+  version = "19.0.1";
 
   src = fetchurl {
     url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
-    sha256 = "aabf2addc3182996c76a01df16024b77ae16a489e52cedf87bcfb14891f72118";
+    sha256 = "da9fb38970987b7d5b84fd0d91824f206ba7a3681a7354adc6d6e795c7613828";
   };
 
   nativeBuildInputs = [

From eaecf427885347b61618a4e826a0ba100d8e21a5 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Mon, 6 Jun 2022 23:10:36 +0300
Subject: [PATCH 26/92] terraform-lsp: use buildGoModule

---
 pkgs/development/tools/misc/terraform-lsp/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix
index d55367e70658..1f35f7696232 100644
--- a/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/pkgs/development/tools/misc/terraform-lsp/default.nix
@@ -1,6 +1,9 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "terraform-lsp";
   version = "0.0.12";
 
@@ -11,7 +14,7 @@ buildGoPackage rec {
     sha256 = "111350jbq0dp0qhk48j12hrlisd1fwzqpcv357igrbqf6ki7r78q";
   };
 
-  goPackagePath = "github.com/juliosueiras/terraform-lsp";
+  vendorSha256 = null;
 
   ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ];
 
@@ -19,6 +22,6 @@ buildGoPackage rec {
     description = "Language Server Protocol for Terraform";
     homepage = "https://github.com/juliosueiras/terraform-lsp";
     license = licenses.mit;
-    maintainers = [ maintainers.marsam ];
+    maintainers = with maintainers; [ marsam ];
   };
 }

From ac719acb8a3d8fb6996d7ddf01399934834321bb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 22:11:20 +0200
Subject: [PATCH 27/92] python310Packages.atenpdu: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/atenpdu/default.nix b/pkgs/development/python-modules/atenpdu/default.nix
index 4a8c0ff0f31a..4eed27b3cfd5 100644
--- a/pkgs/development/python-modules/atenpdu/default.nix
+++ b/pkgs/development/python-modules/atenpdu/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "atenpdu";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8=";
+    sha256 = "sha256-/duY1hS+RU/UAdcQoHF1+c99XaN74jj/0Hj/86U0kmo=";
   };
 
   propagatedBuildInputs = [ pysnmp ];

From 602e1cf735128404f2e3312154c07fd6e464419d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 22:29:37 +0200
Subject: [PATCH 28/92] python310Packages.yolink-api: 0.0.6 -> 0.0.7

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

diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix
index 44f2572bda57..5dcfb9030550 100644
--- a/pkgs/development/python-modules/yolink-api/default.nix
+++ b/pkgs/development/python-modules/yolink-api/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "yolink-api";
-  version = "0.0.6";
+  version = "0.0.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "YoSmart-Inc";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-e0WeQdxQYwaklXOlyUc22NvJraY/eG6HCLsI6/+A6vg=";
+    hash = "sha256-zdCHKckt28abeJ6PQjX50e/4wOl/xx0TKFEQaUIqrYo=";
   };
 
   propagatedBuildInputs = [

From 5821939268111b756473c531af325a509df219a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 22:30:37 +0200
Subject: [PATCH 29/92] python310Packages.twitterapi: 2.7.12 -> 2.7.13

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

diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix
index 313249e50d9c..ce123e5afc41 100644
--- a/pkgs/development/python-modules/twitterapi/default.nix
+++ b/pkgs/development/python-modules/twitterapi/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "twitterapi";
-  version = "2.7.12";
+  version = "2.7.13";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "geduldig";
     repo = "TwitterAPI";
     rev = "v${version}";
-    hash = "sha256-WqeoIZt2OGDXKPAbjm3cHI1kgiCEJC6+ROXXx4TR4b4=";
+    hash = "sha256-48Gphpo3tPcVEGNOSEb8mQaSQARQDCOGFyhGJ+i4BWI=";
   };
 
   propagatedBuildInputs = [

From a6f86e33fffb211210b19fabefd68f84c0d4ed7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 6 Jun 2022 22:57:03 +0200
Subject: [PATCH 30/92] python310Packages.pyeight: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix
index f84612716975..66cd3ac70c8b 100644
--- a/pkgs/development/python-modules/pyeight/default.nix
+++ b/pkgs/development/python-modules/pyeight/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyeight";
-  version = "0.2.0";
+  version = "0.3.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mezz64";
     repo = "pyEight";
     rev = version;
-    sha256 = "sha256-ERilZWroFaBCYjTfU7W0vegJaGibmJYVcgt0z84TPEI=";
+    sha256 = "sha256-H8f7990+ZKoOEzPgeYt4vMHCrcWwIa0X1gMh2qXBAoo=";
   };
 
   propagatedBuildInputs = [

From 9029cf19cb2b4190af19590426cf15c720eda0c9 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 6 Jun 2022 14:20:49 -0700
Subject: [PATCH 31/92] maintainers: add patricksjackson

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3c50a9c5b8d8..05955c00555a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9821,6 +9821,12 @@
     githubId = 6931743;
     name = "pasqui23";
   };
+  patricksjackson = {
+    email = "patrick@jackson.dev";
+    github = "patricksjackson";
+    githubId = 160646;
+    name = "Patrick Jackson";
+  };
   patryk27 = {
     email = "pwychowaniec@pm.me";
     github = "Patryk27";

From 31dc19919ae1546fb2237169e51114651c73ee9d Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick@jackson.dev>
Date: Mon, 6 Jun 2022 14:27:40 -0700
Subject: [PATCH 32/92] textadept: Merge back into a single version.

---
 .../editors/textadept/10/default.nix          | 51 -------------------
 .../editors/textadept/10/deps.nix             | 42 ---------------
 .../editors/textadept/{11 => }/default.nix    |  4 +-
 .../editors/textadept/{11 => }/deps.nix       |  0
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 pkgs/applications/editors/textadept/10/default.nix
 delete mode 100644 pkgs/applications/editors/textadept/10/deps.nix
 rename pkgs/applications/editors/textadept/{11 => }/default.nix (92%)
 rename pkgs/applications/editors/textadept/{11 => }/deps.nix (100%)

diff --git a/pkgs/applications/editors/textadept/10/default.nix b/pkgs/applications/editors/textadept/10/default.nix
deleted file mode 100644
index a45edc6c1a5d..000000000000
--- a/pkgs/applications/editors/textadept/10/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ lib, gcc10Stdenv, fetchhg, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }:
-
-gcc10Stdenv.mkDerivation rec {
-  version = "10.8";
-  pname = "textadept";
-
-  nativeBuildInputs = [ pkg-config unzip ];
-  buildInputs = [
-    gtk2 ncurses glib zip
-  ];
-
-  src = fetchhg {
-    url = "http://foicica.com/hg/textadept";
-    rev = "textadept_${version}";
-    sha256 = "sha256-dEZSx2tuHTWYhk9q5iGlrWTAvDvKaM8HaHwXcFcv33s=";
-  };
-
-  preConfigure =
-    lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params:
-      "ln -s ${fetchurl params} $PWD/src/${name}"
-    ) (import ./deps.nix)) + ''
-
-    cd src
-    make deps
-  '';
-
-  postBuild = ''
-    make curses
-  '';
-
-  preInstall = ''
-    mkdir -p $out/share/applications
-    mkdir -p $out/share/pixmaps
-  '';
-
-  postInstall = ''
-    make curses install PREFIX=$out MAKECMDGOALS=curses
-  '';
-
-  makeFlags = [
-    "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps"
-  ];
-
-  meta = with lib; {
-    description = "An extensible text editor based on Scintilla with Lua scripting";
-    homepage = "http://foicica.com/textadept";
-    license = licenses.mit;
-    maintainers = with maintainers; [ raskin mirrexagon ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/editors/textadept/10/deps.nix b/pkgs/applications/editors/textadept/10/deps.nix
deleted file mode 100644
index 3ab778dddb2a..000000000000
--- a/pkgs/applications/editors/textadept/10/deps.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "99fa62b828ee.zip" = {
-      url = "http://foicica.com/hg/scintilla/archive/99fa62b828ee.zip";
-      sha256 = "sha256-QO4iGhx72CfB1/0Pp/Qab92qm98VZn/EkrHZGndoHVc=";
-    };
-    "lua-5.3.5.tar.gz" = {
-      url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz";
-      sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc";
-    };
-    "lpeg-1.0.2.tar.gz" = {
-      url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz";
-      sha256 = "sha256-SNZldgUbbHg4j6rQm3BJMJMmRYj80PJY3aqxzdShX/4=";
-    };
-    "v1_7_0_2.zip" = {
-      url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip";
-      sha256 = "sha256-kXSriR8dOStCpYeyr7c3+VZez4qGDS5aK/9FeFj1hHg=";
-    };
-    "db67f8a489e8.zip" = {
-      url = "http://foicica.com/hg/gtdialog/archive/db67f8a489e8.zip";
-      sha256 = "sha256-UIvjbDrg3jyz7t2tm4y1zzH/TG6Kqaz3LE5y2U6OHuM=";
-    };
-    "cdk-5.0-20150928.tgz" = {
-      url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz";
-      sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
-    };
-    "libtermkey-0.20.tar.gz" = {
-      url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz";
-      sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc";
-    };
-    "pdcurs36.zip" = {
-      url = "http://prdownloads.sourceforge.net/pdcurses/pdcurs36.zip";
-      sha256 = "0y91zpygrxms7d1l5ksrz42bkvq8jd2xqlj5j7wgyxcl58chcw9b";
-    };
-    "bombay.zip" = {
-      url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip";
-      sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h";
-    };
-    "cloc-1.60.pl" = {
-      url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl";
-      sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a";
-    };
-}
diff --git a/pkgs/applications/editors/textadept/11/default.nix b/pkgs/applications/editors/textadept/default.nix
similarity index 92%
rename from pkgs/applications/editors/textadept/11/default.nix
rename to pkgs/applications/editors/textadept/default.nix
index 6b47ba461eb7..74298e059f7c 100644
--- a/pkgs/applications/editors/textadept/11/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "11.3";
-  pname = "textadept11";
+  pname = "textadept";
 
   nativeBuildInputs = [ pkg-config unzip zip ];
   buildInputs = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "An extensible text editor based on Scintilla with Lua scripting.";
     homepage = "http://foicica.com/textadept";
     license = licenses.mit;
-    maintainers = with maintainers; [ raskin mirrexagon ];
+    maintainers = with maintainers; [ raskin mirrexagon patricksjackson ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/editors/textadept/11/deps.nix b/pkgs/applications/editors/textadept/deps.nix
similarity index 100%
rename from pkgs/applications/editors/textadept/11/deps.nix
rename to pkgs/applications/editors/textadept/deps.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19165528cefc..720b35986b40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10847,9 +10847,7 @@ with pkgs;
 
   texstudio = libsForQt5.callPackage ../applications/editors/texstudio { };
 
-  textadept = callPackage ../applications/editors/textadept/10 { };
-
-  textadept11 = callPackage ../applications/editors/textadept/11 { stdenv = gcc10StdenvCompat; };
+  textadept = callPackage ../applications/editors/textadept { };
 
   texworks = libsForQt5.callPackage ../applications/editors/texworks { };
 

From 7708f1e48c77d663659b4b961f5976376820293f Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 7 Jun 2022 07:46:04 +1000
Subject: [PATCH 33/92] cri-o: 1.24.0 -> 1.24.1

https://github.com/cri-o/cri-o/releases/tag/v1.24.1
---
 pkgs/applications/virtualization/cri-o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix
index 0267a52a61e5..b234354f9fc2 100644
--- a/pkgs/applications/virtualization/cri-o/default.nix
+++ b/pkgs/applications/virtualization/cri-o/default.nix
@@ -15,13 +15,13 @@
 
 buildGoModule rec {
   pname = "cri-o";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchFromGitHub {
     owner = "cri-o";
     repo = "cri-o";
     rev = "v${version}";
-    sha256 = "sha256-LbLBG8nvEgSF5KAeAYnp7dM9cbqF078QpVai1iDx63U=";
+    sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E=";
   };
   vendorSha256 = null;
 

From 84883861f9f2dd8e85b56e4892072710829be4b6 Mon Sep 17 00:00:00 2001
From: wyndon <git_pzpbjt5v@riseup.net>
Date: Tue, 7 Jun 2022 00:07:10 +0200
Subject: [PATCH 34/92] httm: 0.10.16 -> 0.11.1

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

diff --git a/pkgs/tools/filesystems/httm/default.nix b/pkgs/tools/filesystems/httm/default.nix
index 2d26de2375a0..c44e75724c09 100644
--- a/pkgs/tools/filesystems/httm/default.nix
+++ b/pkgs/tools/filesystems/httm/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.10.16";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    sha256 = "09zdexeMu54Y/4HbieZ0EJLxhwCv7upRJxqVbqr2hUw=";
+    sha256 = "GNiqWm6MsgLYjrkrbIHgKxtLmE4IJntcLd9GVRu1v2A=";
   };
 
-  cargoSha256 = "SLEp88KwRg1RN78oX+fMYNR6ia9omrfH2bnJb+PrTAY=";
+  cargoSha256 = "87BkVAZ3BPtnuNUBTzdR4oiE0ZLIr5CacdYenU4V9qU=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    description = "Interactive, file-level ZFS Time Machine-like tool";
+    description = "Interactive, file-level Time Machine-like tool for ZFS/btrfs";
     homepage = "https://github.com/kimono-koans/httm";
     license = licenses.mpl20;
     platforms = platforms.unix;

From fd326d0d8c73404fc4bba1a299ac64cf81dfc7fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 7 Jun 2022 01:05:41 +0200
Subject: [PATCH 35/92] python3Packages.pyialarmxr-homeassistant: rename from
 pyialarmxr

---
 .../default.nix                                   | 15 +++++++--------
 pkgs/top-level/python-aliases.nix                 |  1 +
 pkgs/top-level/python-packages.nix                |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename pkgs/development/python-modules/{pyialarmxr => pyialarmxr-homeassistant}/default.nix (66%)

diff --git a/pkgs/development/python-modules/pyialarmxr/default.nix b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix
similarity index 66%
rename from pkgs/development/python-modules/pyialarmxr/default.nix
rename to pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix
index 0110411a193d..fea638f7a5f8 100644
--- a/pkgs/development/python-modules/pyialarmxr/default.nix
+++ b/pkgs/development/python-modules/pyialarmxr-homeassistant/default.nix
@@ -1,24 +1,23 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
+, fetchPypi
 , lxml
 , pythonOlder
 , xmltodict
 }:
 
 buildPythonPackage rec {
-  pname = "pyialarmxr";
+  pname = "pyialarmxr-homeassistant";
   version = "1.0.18";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
-  src = fetchFromGitHub {
-    owner = "bigmoby";
-    repo = pname;
-    rev = version;
-    hash = "sha256-Q1NsPLA1W4nxSG/9jlMf6BkC3ZrUrhl8oDX7U4aAjxM=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-aQHJiSmaGyABHP17oFH+6JQ9zNJ6pj2+PcE+gsRuhaQ=";
   };
+
   propagatedBuildInputs = [
     lxml
     xmltodict
@@ -33,7 +32,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library to interface with Antifurto365 iAlarmXR systems";
-    homepage = "https://github.com/bigmoby/pyialarmxr";
+    homepage = "https://pypi.org/project/pyialarmxr-homeassistant/";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 0e58d7b976c4..c84d0739d31f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -111,6 +111,7 @@ mapAliases ({
   pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
   pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
   pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
+  pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
   pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
   pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
   pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23bc0d21ff78..2e553cf8addf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7448,7 +7448,7 @@ in {
 
   pyialarm = callPackage ../development/python-modules/pyialarm { };
 
-  pyialarmxr = callPackage ../development/python-modules/pyialarmxr { };
+  pyialarmxr-homeassistant = callPackage ../development/python-modules/pyialarmxr-homeassistant { };
 
   pyicloud = callPackage ../development/python-modules/pyicloud { };
 

From d82ca8d422b30ff50505ac99eae0b95775e4dcd6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 7 Jun 2022 01:07:22 +0200
Subject: [PATCH 36/92] home-assistant: 2022.6.2 -> 2022.6.3

https://github.com/home-assistant/core/releases/tag/2022.6.3
---
 pkgs/servers/home-assistant/component-packages.nix | 4 ++--
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index e99a68e1fe5d..9cc272f62a43 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2022.6.2";
+  version = "2022.6.3";
   components = {
     "abode" = ps: with ps; [
       abodepy
@@ -1207,7 +1207,7 @@
       pyialarm
     ];
     "ialarm_xr" = ps: with ps; [
-      pyialarmxr
+      pyialarmxr-homeassistant
     ];
     "iammeter" = ps: with ps; [
     ]; # missing inputs: iammeter
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index f5664a3b385e..62d996bb9a32 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -166,7 +166,7 @@ let
   extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "2022.6.2";
+  hassVersion = "2022.6.3";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -184,7 +184,7 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = version;
-    hash = "sha256-M0wBvAdvoGrvJrE96ZM9+X1KMp796vtzbzIo8ScXcy8=";
+    hash = "sha256-dYJbYrOwjJ2OO+gYT9UmCam+gNvSycFGUEeHBoGTqSM=";
   };
 
   # leave this in, so users don't have to constantly update their downstream patch handling

From 826bef9b514bd5ceb5af55ccd79592778de03277 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Fri, 3 Jun 2022 02:29:53 +0000
Subject: [PATCH 37/92] prometheus-unifi-exporter: remove

prometheus-unifi-exporter is deprecated and archived by upstream.
---
 .../prometheus/unifi-exporter/default.nix     | 24 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix

diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
deleted file mode 100644
index b9971ab72280..000000000000
--- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "unifi-exporter";
-  version = "0.4.0+git1";
-  rev = "9a4e69fdea91dd0033bda4842998d751b40a6130";
-
-  goPackagePath = "github.com/mdlayher/unifi_exporter";
-
-  src= fetchFromGitHub {
-    inherit rev;
-    owner = "mdlayher";
-    repo = "unifi_exporter";
-    sha256 = "08zqvwvdqnc301f8jfh7bdvc138szw6xszx884b2v8w2x38w3rmn";
-  };
-
-  meta = with lib; {
-    description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices";
-    homepage = "https://github.com/mdlayher/unifi_exporter";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bachp globin ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7bfc9bfdc649..82cce1d0482d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1112,6 +1112,7 @@ mapAliases ({
   prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
   prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
   prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05
+  prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03
   proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
   pulseaudio-hsphfpd = throw "pulseaudio-hsphfpd upstream has been abandoned"; # Added 2022-03-23
   pulseaudio-modules-bt = throw "pulseaudio-modules-bt has been abandoned, and is superseded by pulseaudio's native bt functionality"; # Added 2022-04-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24744e9eefd4..76ba1ea8fe7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22473,7 +22473,6 @@ with pkgs;
   prometheus-unbound-exporter = callPackage ../servers/monitoring/prometheus/unbound-exporter.nix {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
-  prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
   prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
   prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix {
     inherit (darwin.apple_sdk.frameworks) Security;

From 1f9c7f33930a657c0c7b0500a097f8c38d474832 Mon Sep 17 00:00:00 2001
From: "Berk D. Demir" <bdd@mindcast.org>
Date: Tue, 7 Jun 2022 00:57:47 +0000
Subject: [PATCH 38/92] runitor: 0.10.0 -> 0.10.1

- New release fixing a nil dereference
- Remove patches that are already part of the new rel
- Rollback ldflags change from #175973
  The -s flag implies -w on every platform but Darwin.
---
 pkgs/tools/system/runitor/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/system/runitor/default.nix b/pkgs/tools/system/runitor/default.nix
index 965813f6e371..1108362010ca 100644
--- a/pkgs/tools/system/runitor/default.nix
+++ b/pkgs/tools/system/runitor/default.nix
@@ -2,26 +2,18 @@
 
 buildGoModule rec {
   pname = "runitor";
-  version = "0.10.0";
+  version = "0.10.1";
   vendorSha256 = null;
 
   src = fetchFromGitHub {
     owner = "bdd";
     repo = "runitor";
     rev = "v${version}";
-    sha256 = "sha256-96WKMeRkkG6en9JXaZjjnqeZOcLSII3knx8cdjTBAKw=";
+    sha256 = "sha256-qqfaA1WAHkuiyzyQbrSvnmwuRXElArErJ6PtLPOxzsg=";
   };
 
   ldflags = [
-    "-s" "-X main.Version=v${version}"
-  ];
-
-  patches = [
-    (fetchpatch {
-      name = "backport_TestPostRetries-timeout-fix.patch";
-      url = "https://github.com/bdd/runitor/commit/418142585a8387224825637cca3fe275d3c3d147.patch";
-      sha256 = "sha256-cl+KYoiHm2ioFuJVKokZkglIzL/NaEd5JNUuj4g8MUg=";
-    })
+    "-s" "-w" "-X main.Version=v${version}"
   ];
 
   passthru.tests.version = testers.testVersion {

From f9b9e8b16f26ffd7985a1b4987cd417d295e04cd Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Tue, 1 Mar 2022 01:18:21 -0500
Subject: [PATCH 39/92] rwc: init at 0.2

---
 pkgs/tools/system/rwc/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/system/rwc/default.nix

diff --git a/pkgs/tools/system/rwc/default.nix b/pkgs/tools/system/rwc/default.nix
new file mode 100644
index 000000000000..7180c2554702
--- /dev/null
+++ b/pkgs/tools/system/rwc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, lib }:
+
+stdenv.mkDerivation rec {
+  pname = "rwc";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "leahneukirchen";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-axHBkrbLEcYygCDofhqfIeZ5pv1sR34I5UgFUwVb2rI=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with lib; {
+    description = "Report when files are changed";
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ somasis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1c16e735d8..57c5df345c0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10042,6 +10042,8 @@ with pkgs;
 
   rw = callPackage ../tools/misc/rw { };
 
+  rwc = callPackage ../tools/system/rwc { };
+
   rxp = callPackage ../tools/text/xml/rxp { };
 
   rzip = callPackage ../tools/compression/rzip { };

From 22f30538f29181226cfd6e90cb1b75fd73f95c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= <kubukoz@gmail.com>
Date: Tue, 7 Jun 2022 04:00:36 +0200
Subject: [PATCH 40/92] scala-cli: 0.1.6 -> 0.1.7

---
 .../development/tools/build-managers/scala-cli/sources.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json
index eaa53705260a..464675569fd7 100644
--- a/pkgs/development/tools/build-managers/scala-cli/sources.json
+++ b/pkgs/development/tools/build-managers/scala-cli/sources.json
@@ -1,13 +1,13 @@
 {
-  "version": "0.1.6",
+  "version": "0.1.7",
   "assets": {
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "1wcm47x0w4gdhkqrqjn0qvgnn36c707mz9m260pdnnffja203vyr"
+      "sha256": "1sly3s9y742nms8kqwh2cikjkcnbkkafsql8sw2w2zr53z28g10v"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "1jwv67p2r6kxqlz8p2zvk5g5jdswl8cymj822b88lbp78a497kc6"
+      "sha256": "1lgcbxzhwqfnj6n81w1ssdcrn1j0c93chqgh0zzqi08w8wk3x4j5"
     }
   }
 }

From 17b53760f61e2f158024aef79d9aa29e65986301 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 03:15:42 +0000
Subject: [PATCH 41/92] fluxcd: 0.30.2 -> 0.31.0

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

diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix
index 21e2f00c3e2f..abe12ffff1a9 100644
--- a/pkgs/applications/networking/cluster/fluxcd/default.nix
+++ b/pkgs/applications/networking/cluster/fluxcd/default.nix
@@ -1,9 +1,9 @@
 { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }:
 
 let
-  version = "0.30.2";
-  sha256 = "0z4f0vf2n7vfp6ff0lxcl5qyl65ihd4absad8cd16hncz15nyjgl";
-  manifestsSha256 = "04dlxzlrhggq54nkywn9nwdagdn43f0rb7cjkqdn3hlm4hwd07pb";
+  version = "0.31.0";
+  sha256 = "073ij9mllxvw6rg8nm8pj6b8m5jzgbiihr9kknhhpp788wya155d";
+  manifestsSha256 = "0kp75h119l9051p2xcjfwcllk4hilmq25fcrx86bm0646krvk0pk";
 
   manifests = fetchzip {
     url =
@@ -23,7 +23,7 @@ in buildGoModule rec {
     inherit sha256;
   };
 
-  vendorSha256 = "sha256-POziJtCdD4klu23WuGmWdt72Ugr4KwCAjXRTCuzikSk=";
+  vendorSha256 = "sha256-XTtVSSqU2jWRZvudE6G5QaNaZxw3oESiMPnnQzDs/1w=";
 
   postUnpack = ''
     cp -r ${manifests} source/cmd/flux/manifests

From 1ee7ec898a9bff60589e9cfdecd7d9de00e1f3d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 05:51:46 +0000
Subject: [PATCH 42/92] python310Packages.google-cloud-websecurityscanner:
 1.7.1 -> 1.7.2

---
 .../google-cloud-websecurityscanner/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 2ea8de6f139f..b1d7c8d5da19 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc=";
+    sha256 = "sha256-JDuMhyk1018pMYNOhRVmP7XyF2wsK5temDTP5033Dxk=";
   };
 
   propagatedBuildInputs = [ google-api-core libcst proto-plus ];

From d29410881e176c7cec7b2cbdcba3251cfe04accc Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Tue, 7 Jun 2022 07:59:50 +0200
Subject: [PATCH 43/92] cargo-generate: 0.12.0 -> 0.14.0

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

diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix
index 0597b7abbecc..64a17d807112 100644
--- a/pkgs/development/tools/rust/cargo-generate/default.nix
+++ b/pkgs/development/tools/rust/cargo-generate/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-generate";
-  version = "0.12.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "ashleygwilliams";
     repo = "cargo-generate";
     rev = "v${version}";
-    sha256 = "sha256-VMcyBa8bjH4n8hKS+l5xcaQCBYkBVWjDV2uk4JmhxFs=";
+    sha256 = "sha256-OYYGOB1NfNnOl8bd8KozgMCyW4Gb39LoFtD80DPzpdw=";
   };
 
-  cargoSha256 = "sha256-9RMzvZLGRFGJ0Bw2is2aeRCoLzHsZZ6LCfoCTrKjHbo=";
+  cargoSha256 = "sha256-qmRKjPhPLpzVVuTHuoo0iTlX3BnT2Udo1kFXvA3zNQE=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 50cac6ed5ed534f8a1539349863599ade91295e7 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Sun, 31 Oct 2021 04:35:37 +0100
Subject: [PATCH 44/92] ocamlPackages.unix-errno: init at 0.6.1

---
 .../ocaml-modules/unix-errno/default.nix      | 22 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/unix-errno/default.nix

diff --git a/pkgs/development/ocaml-modules/unix-errno/default.nix b/pkgs/development/ocaml-modules/unix-errno/default.nix
new file mode 100644
index 000000000000..2b8deb6621d3
--- /dev/null
+++ b/pkgs/development/ocaml-modules/unix-errno/default.nix
@@ -0,0 +1,22 @@
+{ lib, buildDunePackage, fetchurl, ctypes, integers, result }:
+
+buildDunePackage rec {
+  pname = "unix-errno";
+  version = "0.6.1";
+
+  minimalOCamlVersion = "4.03.0"; # Specified to be 4.01.0, but it's actually 4.03
+
+  src = fetchurl {
+    url = "https://github.com/xapi-project/ocaml-unix-errno/releases/download/${version}/unix-errno-${version}.tbz";
+    sha256 = "sha256-jZqtHwUKTffjuOP2jdKKQRtEOBKyclhfeiPO96hEj4c=";
+  };
+
+  propagatedBuildInputs = [ ctypes integers result ];
+
+  meta = with lib; {
+    homepage = "https://github.com/xapi-project/ocaml-unix-errno"; # This is the repo used in the opam package
+    description = "Unix errno types, maps, and support for OCaml";
+    license = with licenses; [ isc lgpl21Only ]; # All the files indicate ISC, but there's an LGPL LICENSE file
+    maintainers = with maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d0c444f9680a..6a31c5524931 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1405,6 +1405,8 @@ let
 
     uecc = callPackage ../development/ocaml-modules/uecc { };
 
+    unix-errno = callPackage ../development/ocaml-modules/unix-errno { };
+
     utop = callPackage ../development/tools/ocaml/utop { };
 
     uuidm = callPackage ../development/ocaml-modules/uuidm { };

From cb26845685076ac02be9b9972a712d500fec9384 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Sun, 31 Oct 2021 04:37:19 +0100
Subject: [PATCH 45/92] ocamlPackages.posix-time2: init at 2.0.0

---
 pkgs/development/ocaml-modules/posix/time2.nix | 16 ++++++++++++++++
 pkgs/top-level/ocaml-packages.nix              |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/posix/time2.nix

diff --git a/pkgs/development/ocaml-modules/posix/time2.nix b/pkgs/development/ocaml-modules/posix/time2.nix
new file mode 100644
index 000000000000..b4601c162bd1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/posix/time2.nix
@@ -0,0 +1,16 @@
+{ lib, buildDunePackage, posix-base, posix-types, unix-errno }:
+
+buildDunePackage {
+  pname = "posix-time2";
+
+  inherit (posix-base) version src;
+
+  propagatedBuildInputs = [ posix-base posix-types unix-errno ];
+
+  doCheck = true;
+
+  meta = posix-base.meta // {
+    description = "posix-time2 provides the types and bindings for posix time APIs";
+    maintainers = with lib.maintainers; [ dandellion ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 6a31c5524931..053af5e6677b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1129,6 +1129,8 @@ let
 
     posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { };
 
+    posix-time2 = callPackage ../development/ocaml-modules/posix/time2.nix { };
+
     posix-types = callPackage ../development/ocaml-modules/posix/types.nix { };
 
     postgresql = callPackage ../development/ocaml-modules/postgresql {

From 7c3c0f1223680d4891df2178860415af3afa34aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 08:39:14 +0000
Subject: [PATCH 46/92] python310Packages.browser-cookie3: 0.14.1 -> 0.14.2

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

diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix
index fd0d21cc616a..a8b5d4e01441 100644
--- a/pkgs/development/python-modules/browser-cookie3/default.nix
+++ b/pkgs/development/python-modules/browser-cookie3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "browser-cookie3";
-  version = "0.14.1";
+  version = "0.14.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s=";
+    hash = "sha256-YR5NcDmbLlnhxcDuyM6hjjuL/Ozw79ytbCF4/nmSZmQ=";
   };
 
   propagatedBuildInputs = [

From ed2c6d7efbac9179a7cadf93f1fb5ad7e17dd4fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 08:47:31 +0000
Subject: [PATCH 47/92] python310Packages.oauthenticator: 14.2.0 -> 15.0.0

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

diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index 738f7fafca2a..bf2a30fb5b2a 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "oauthenticator";
-  version = "14.2.0";
+  version = "15.0.0";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4baa02ff2c159cbba06f8d07fe11a6e624285ca2f813b1258b4c68766c0ee46b";
+    sha256 = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y=";
   };
 
   propagatedBuildInputs = [

From 6d70d415da5470a1672f3b653ed37559c54b0103 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 08:53:34 +0000
Subject: [PATCH 48/92] python310Packages.aioairzone: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index 5c12501723df..1862c3e6a317 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "0.4.4";
+  version = "0.4.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "Noltari";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-fYhYqBnwvnfu2GbWUlmMmW/Xon3OE3fh+gGlnQRsCyA=";
+    hash = "sha256-sNlqG5A8a8AIgKc9xDAEwxBeKJ/HaW847BZR4WdcsrQ=";
   };
 
   propagatedBuildInputs = [

From be830ea4f7be96141e6ea4108538014f6b9447f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 08:56:35 +0000
Subject: [PATCH 49/92] python310Packages.google-cloud-runtimeconfig: 0.33.0 ->
 0.33.1

---
 .../python-modules/google-cloud-runtimeconfig/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
index fb581ee0c604..0ff3e076f2e9 100644
--- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
+++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-runtimeconfig";
-  version = "0.33.0";
+  version = "0.33.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cc85e5de7cdb58a27561885021ee6fcf1d9f89e0f0db7c371bdca9c54788dd15";
+    sha256 = "sha256-SKinB6fiBh+oe+lb2IGMD6248DDOrG7g3kiFpMGX4BU=";
   };
 
   propagatedBuildInputs = [ google-api-core google-cloud-core ];

From aa9b237e5d206735924c04a31b496c980b988764 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jun 2022 11:11:41 +0200
Subject: [PATCH 50/92] python310Packages.luxtronik: 0.3.13 -> 0.3.14

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

diff --git a/pkgs/development/python-modules/luxtronik/default.nix b/pkgs/development/python-modules/luxtronik/default.nix
index e8c72a5cf4cb..b1e74c9ba606 100644
--- a/pkgs/development/python-modules/luxtronik/default.nix
+++ b/pkgs/development/python-modules/luxtronik/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "luxtronik";
-  version = "0.3.13";
+  version = "0.3.14";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "Bouni";
     repo = "python-luxtronik";
     rev = version;
-    sha256 = "sha256-ULpi3oNJJe8H9z1C1nCNsR5eMmXQnXtbonrV9Ec2NyY=";
+    sha256 = "sha256-7TuvqOAb/MUumOF6BKTRLOJuvteqZPmFUXXsuwEpmOM=";
   };
 
   # Project has no tests

From 5b9de4e2bba96d26dcd23071ed33a17f47ddc1ff Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jun 2022 11:33:10 +0200
Subject: [PATCH 51/92] python310Packages.bravado-core: add input

---
 pkgs/development/python-modules/bravado-core/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix
index f58f42a9670f..eb0e03653e59 100644
--- a/pkgs/development/python-modules/bravado-core/default.nix
+++ b/pkgs/development/python-modules/bravado-core/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchFromGitHub
 , fqdn

From 4ac4c526996d6be5d02a609765c37f94d23e20fc Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Fri, 3 Jun 2022 23:17:01 +0200
Subject: [PATCH 52/92] liquidsoap: pin srt dependency

---
 pkgs/tools/audio/liquidsoap/full.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index a9319696a3a0..33e9831416f2 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, makeWrapper, fetchurl, which, pkg-config
 , fetchFromGitLab
+, fetchFromGitHub
 , ocamlPackages
 , libao, portaudio, alsa-lib, libpulseaudio, libjack2
 , libsamplerate, libmad, taglib, lame, libogg
@@ -24,7 +25,8 @@ in
 
 # Liquidsoap 1.4.2 is not compatible with menhir ≥ 20220210
 # Locally override menhir to an earlier version
-let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
+let
+  menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
     version = "20211128";
     src = fetchFromGitLab {
       domain = "gitlab.inria.fr";
@@ -41,6 +43,15 @@ let menhirLib = ocamlPackages.menhirLib.overrideAttrs (o: rec {
     inherit menhirLib menhirSdk;
   };
 
+  srt = ocamlPackages.srt.overrideAttrs (old: rec {
+    version = "0.1.1";
+    src = fetchFromGitHub {
+      owner = "savonet";
+      repo = "ocaml-srt";
+      rev = "v${version}";
+      sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
+    };
+  });
 in
 
 stdenv.mkDerivation {
@@ -82,7 +93,7 @@ stdenv.mkDerivation {
       ocamlPackages.xmlm ocamlPackages.ocaml_pcre
       ocamlPackages.camomile
       ocamlPackages.fdkaac
-      ocamlPackages.srt ocamlPackages.sedlex menhir menhirLib
+      srt ocamlPackages.sedlex menhir menhirLib
     ];
 
   hardeningDisable = [ "format" "fortify" ];

From ab7173f6db30fcffe01a23d85138449fa990cabf Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Sat, 30 Oct 2021 22:05:24 +0200
Subject: [PATCH 53/92] ocamlPackages.srt: 0.1.1 -> 0.2.1

---
 pkgs/development/ocaml-modules/srt/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix
index 7f0897ae6626..2755b06d9c71 100644
--- a/pkgs/development/ocaml-modules/srt/default.nix
+++ b/pkgs/development/ocaml-modules/srt/default.nix
@@ -6,25 +6,22 @@
 
 buildDunePackage rec {
   pname = "srt";
-  version = "0.1.1";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-srt";
     rev = "v${version}";
-    sha256 = "0xh89w4j7lljvpy2n08x6m9kw88f82snmzf23kp0gw637sjnrj6f";
+    sha256 = "sha256-rnM50IzeiKOrpFf79jTHp+fXn0tdx+vrLuD3kzqLh5g=";
   };
 
-  useDune2 = true;
-
   buildInputs = [ dune-configurator ];
   propagatedBuildInputs = [ posix-socket srt ];
 
-  meta = {
+  meta = with lib; {
     description = "OCaml bindings for the libsrt library";
     license = lib.licenses.gpl2Only;
     inherit (src.meta) homepage;
-    maintainers = [ lib.maintainers.vbgl ];
+    maintainers = with maintainers; [ vbgl dandellion ];
   };
-
 }

From 3c89903ac88953f8cfeef52f2de6319d367d2fcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 09:46:38 +0000
Subject: [PATCH 54/92] python310Packages.asdf: 2.11.1 -> 2.12.0

---
 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 658ec10a0ae2..b34001d866eb 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.11.1";
+  version = "2.12.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1uDRoS9nyZCLPdbiAQBADoiwqaVBzj1NMpZXdJQYoxQ=";
+    hash = "sha256-WRSDTQd7o79ouar9xka58nzl5W4cJBFn1GHe5DsQI+k=";
   };
 
   nativeBuildInputs = [

From d6ade044a4c6befabe7cd6084609c3d28372057d Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 7 Jun 2022 02:14:27 -0400
Subject: [PATCH 55/92] oil: 0.9.9 -> 0.10.1

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

diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix
index f99c285a4f0f..ac7ea03084c1 100644
--- a/pkgs/shells/oil/default.nix
+++ b/pkgs/shells/oil/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "oil";
-  version = "0.9.9";
+  version = "0.10.1";
 
   src = fetchurl {
     url = "https://www.oilshell.org/download/oil-${version}.tar.xz";
-    sha256 = "sha256-b2tMS5z4oejh3C/3vznIWhG4cd3anp5RuffhoORrKCQ=";
+    sha256 = "sha256-jI+QQ+jE3Qzd0b9VishVwBzDlFHCVKv8cZ0BsHnkd0Q=";
   };
 
   postPatch = ''

From f5ef819e24c45331636ad28861bce952f25b2fae Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 7 Jun 2022 06:53:15 -0400
Subject: [PATCH 56/92] mimir: switch pname to mimir

---
 nixos/modules/services/monitoring/mimir.nix  | 2 +-
 nixos/tests/all-tests.nix                    | 2 +-
 nixos/tests/{grafana-mimir.nix => mimir.nix} | 2 +-
 pkgs/servers/monitoring/mimir/default.nix    | 2 +-
 pkgs/top-level/aliases.nix                   | 1 +
 pkgs/top-level/all-packages.nix              | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename nixos/tests/{grafana-mimir.nix => mimir.nix} (98%)

diff --git a/nixos/modules/services/monitoring/mimir.nix b/nixos/modules/services/monitoring/mimir.nix
index f85f3ab02c37..83c0b23c59dd 100644
--- a/nixos/modules/services/monitoring/mimir.nix
+++ b/nixos/modules/services/monitoring/mimir.nix
@@ -53,7 +53,7 @@ in {
                else cfg.configFile;
       in
       {
-        ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}";
+        ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}";
         DynamicUser = true;
         Restart = "always";
         ProtectSystem = "full";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0f75548ff6fd..1064d62da930 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -170,7 +170,7 @@ in {
   frr = handleTest ./frr.nix {};
   fsck = handleTest ./fsck.nix {};
   ft2-clone = handleTest ./ft2-clone.nix {};
-  grafana-mimir = handleTest ./grafana-mimir.nix {};
+  mimir = handleTest ./mimir.nix {};
   gerrit = handleTest ./gerrit.nix {};
   geth = handleTest ./geth.nix {};
   ghostunnel = handleTest ./ghostunnel.nix {};
diff --git a/nixos/tests/grafana-mimir.nix b/nixos/tests/mimir.nix
similarity index 98%
rename from nixos/tests/grafana-mimir.nix
rename to nixos/tests/mimir.nix
index 0aafa956f0be..f1b30d261472 100644
--- a/nixos/tests/grafana-mimir.nix
+++ b/nixos/tests/mimir.nix
@@ -1,5 +1,5 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
-  name = "grafana-mimir";
+  name = "mimir";
   nodes = {
     server = { ... }: {
       environment.systemPackages = [ pkgs.jq ];
diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix
index 500ba3154753..9a837073eeed 100644
--- a/pkgs/servers/monitoring/mimir/default.nix
+++ b/pkgs/servers/monitoring/mimir/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   ];
 
   passthru.tests = {
-    inherit (nixosTests) grafana-mimir;
+    inherit (nixosTests) mimir;
   };
 
   ldflags = let t = "github.com/grafana/mimir/pkg/util/version";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 708d76f3da34..39e4a1ba9f39 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -538,6 +538,7 @@ mapAliases ({
   graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15
   graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15
   gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03
+  grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07
   gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
   grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
   gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1c16e735d8..ea41516e7b25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21795,7 +21795,7 @@ with pkgs;
 
   grafana-loki = callPackage ../servers/monitoring/loki { };
 
-  grafana-mimir = callPackage ../servers/monitoring/mimir { };
+  mimir = callPackage ../servers/monitoring/mimir { };
 
   promtail = grafana-loki.overrideAttrs (o: {
     pname = "promtail";

From 1d4bfa2a9d06ed73f415e8a8e1ad838771f63b9a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jun 2022 14:07:35 +0200
Subject: [PATCH 57/92] python310Packages.oauthenticator: add format

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

diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix
index bf2a30fb5b2a..b3a4c5db7a0e 100644
--- a/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/pkgs/development/python-modules/oauthenticator/default.nix
@@ -15,11 +15,13 @@
 buildPythonPackage rec {
   pname = "oauthenticator";
   version = "15.0.0";
+  format = "setuptools";
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y=";
+    hash = "sha256-d1toYgrufnVd10QhJ4nhQqyDRaq4CjWLDjC+7ABNp6Y=";
   };
 
   propagatedBuildInputs = [
@@ -37,12 +39,14 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
-    # Test are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
+    # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432
     "test_azuread"
     "test_mediawiki"
   ];
 
-  pythonImportsCheck = [ "oauthenticator" ];
+  pythonImportsCheck = [
+    "oauthenticator"
+  ];
 
   meta = with lib; {
     description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more.";

From 83ad4f2f938ec5daf2cc8d285f28c3ab2857e543 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 13:07:13 +0000
Subject: [PATCH 58/92] python310Packages.deezer-python: 5.3.2 -> 5.3.3

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

diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index ef8b091b0c4e..850d47cd026c 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "deezer-python";
-  version = "5.3.2";
+  version = "5.3.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "browniebroke";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-lOVHSYL57hwzvdC+pJFDkDGFuu29jdZ36BYscw82uDE=";
+    sha256 = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0=";
   };
 
   nativeBuildInputs = [

From 0907dc851fa2e56db75ae260a8ecc9880dc7b492 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sun, 5 Jun 2022 21:27:06 +0300
Subject: [PATCH 59/92] slack-term: use buildGoModule

---
 .../networking/instant-messengers/slack-term/default.nix  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index 30cc7396c562..e2135734bd7f 100644
--- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix
@@ -1,18 +1,16 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
-  # https://github.com/erroneousboat/slack-term
+buildGoModule rec {
   pname = "slack-term";
   version = "0.5.0";
 
-  goPackagePath = "github.com/erroneousboat/slack-term";
-
   src = fetchFromGitHub {
     owner = "erroneousboat";
     repo = "slack-term";
     rev = "v${version}";
     sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6";
   };
+  vendorSha256 = null;
 
   meta = with lib; {
     description = "Slack client for your terminal";

From cd4f6555edd34e95d4427efb51ff6589e68cb0be Mon Sep 17 00:00:00 2001
From: Mr Hedgehog <hedgehog@mrhedgehog.xyz>
Date: Thu, 2 Jun 2022 12:02:06 -0400
Subject: [PATCH 60/92] goresym: init at 1.2

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

diff --git a/pkgs/development/tools/goresym/default.nix b/pkgs/development/tools/goresym/default.nix
new file mode 100644
index 000000000000..b41811689675
--- /dev/null
+++ b/pkgs/development/tools/goresym/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, buildGoModule }:
+
+buildGoModule rec {
+  pname = "goresym";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "mandiant";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-XDy6qALE2xuOVQHuuvU/gOyTRZ/6CWpyjN3i7VmznoI=";
+  };
+
+  subPackages = [ "." ];
+
+  vendorSha256 = "sha256-dnQ/tP4RS6WkACobfW7jTTJSHbLrdlZDy1fmO65743Q=";
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Go symbol recovery tool";
+    homepage = "https://github.com/mandiant/GoReSym";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mrhedgehog ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a358298ae7a1..e460cfe8fe57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23560,6 +23560,8 @@ with pkgs;
 
   gore = callPackage ../development/tools/gore { };
 
+  goresym = callPackage ../development/tools/goresym { };
+
   gotests = callPackage ../development/tools/gotests { };
 
   gotestsum = callPackage ../development/tools/gotestsum { };

From 6f0b4a92dc262f68cdf235ebe231cabff6ef4c5d Mon Sep 17 00:00:00 2001
From: Simon Schoeters <b2282e9d-46e8-4ec4-946a-b6ad84078b1c@astil.be>
Date: Sat, 4 Jun 2022 14:53:26 +0200
Subject: [PATCH 61/92] bluewalker: init at 0.3.0

---
 pkgs/tools/bluetooth/bluewalker/default.nix | 29 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/bluetooth/bluewalker/default.nix

diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix
new file mode 100644
index 000000000000..8cdfca94e28e
--- /dev/null
+++ b/pkgs/tools/bluetooth/bluewalker/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildGoModule, fetchFromGitLab }:
+
+buildGoModule rec {
+  pname = "bluewalker";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    owner = "jtaimisto";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-spuJRiNiaBV4EsetUq8vUfR6ejUNZxLhVzS3AZZyrrQ=";
+  };
+
+  vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h";
+
+  ldflags = [ # omit some things for a smaller binary
+    "-w" # omit the DWARF symbol table
+    "-s" # omit symbol table and debug info
+  ];
+
+  meta = with lib; {
+    description = "Simple command line Bluetooth LE scanner";
+    homepage = src.meta.homepage;
+    changelog = "https://gitlab.com/jtaimisto/${pname}/-/raw/master/CHANGELOG";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ cimm ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e460cfe8fe57..5716dd88ed2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2710,6 +2710,8 @@ with pkgs;
 
   bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
 
+  bluewalker = callPackage ../tools/bluetooth/bluewalker { };
+
   blur-effect = callPackage ../tools/graphics/blur-effect { };
 
   bootiso = callPackage ../tools/cd-dvd/bootiso { };

From 55b2904c5ad89529365d957460f5558095ee9937 Mon Sep 17 00:00:00 2001
From: Simon Schoeters <b2282e9d-46e8-4ec4-946a-b6ad84078b1c@astil.be>
Date: Sat, 4 Jun 2022 14:54:35 +0200
Subject: [PATCH 62/92] Maintainers: add cimm

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fb4b37764e7e..b4c4029925f7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2334,6 +2334,12 @@
     githubId = 3956062;
     name = "Simon Lackerbauer";
   };
+  cimm = {
+    email = "8k9ft8m5gv@astil.be";
+    github = "cimm";
+    githubId = 68112;
+    name = "Simon";
+  };
   cirno-999 = {
     email = "reverene@protonmail.com";
     github = "cirno-999";

From 47d633a96803e6095012b10e16d7bfd50a34a245 Mon Sep 17 00:00:00 2001
From: Simon Schoeters <b2282e9d-46e8-4ec4-946a-b6ad84078b1c@astil.be>
Date: Sat, 4 Jun 2022 14:24:37 +0000
Subject: [PATCH 63/92] Remove obvious comments from ldflags

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 pkgs/tools/bluetooth/bluewalker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix
index 8cdfca94e28e..8aa113f04513 100644
--- a/pkgs/tools/bluetooth/bluewalker/default.nix
+++ b/pkgs/tools/bluetooth/bluewalker/default.nix
@@ -13,9 +13,9 @@ buildGoModule rec {
 
   vendorSha256 = "189qs6vmx63vwsjmc4qgf1y8xjsi7x6l1f5c3kd8j8jnagl26z4h";
 
-  ldflags = [ # omit some things for a smaller binary
-    "-w" # omit the DWARF symbol table
-    "-s" # omit symbol table and debug info
+  ldflags = [
+    "-w"
+    "-s"
   ];
 
   meta = with lib; {

From 2247e925d697cdfe529ccdbb021fc6ac90fe8b92 Mon Sep 17 00:00:00 2001
From: Simon Schoeters <b2282e9d-46e8-4ec4-946a-b6ad84078b1c@astil.be>
Date: Sat, 4 Jun 2022 14:25:22 +0000
Subject: [PATCH 64/92] Add homepage URL instead of variable

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 pkgs/tools/bluetooth/bluewalker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix
index 8aa113f04513..8063355b7059 100644
--- a/pkgs/tools/bluetooth/bluewalker/default.nix
+++ b/pkgs/tools/bluetooth/bluewalker/default.nix
@@ -20,7 +20,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Simple command line Bluetooth LE scanner";
-    homepage = src.meta.homepage;
+    homepage = "https://gitlab.com/jtaimisto/bluewalker";
     changelog = "https://gitlab.com/jtaimisto/${pname}/-/raw/master/CHANGELOG";
     license = licenses.bsd2;
     maintainers = with maintainers; [ cimm ];

From 92e2442544007ab5c341ee7ad31282344f60d2cc Mon Sep 17 00:00:00 2001
From: Simon Schoeters <b2282e9d-46e8-4ec4-946a-b6ad84078b1c@astil.be>
Date: Sat, 4 Jun 2022 14:26:14 +0000
Subject: [PATCH 65/92] Point changelog to tag instead of master

Co-authored-by: Fabian Affolter <mail@fabian-affolter.ch>
---
 pkgs/tools/bluetooth/bluewalker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/bluetooth/bluewalker/default.nix b/pkgs/tools/bluetooth/bluewalker/default.nix
index 8063355b7059..06241b1436ae 100644
--- a/pkgs/tools/bluetooth/bluewalker/default.nix
+++ b/pkgs/tools/bluetooth/bluewalker/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Simple command line Bluetooth LE scanner";
     homepage = "https://gitlab.com/jtaimisto/bluewalker";
-    changelog = "https://gitlab.com/jtaimisto/${pname}/-/raw/master/CHANGELOG";
+    changelog = "https://gitlab.com/jtaimisto/bluewalker/-/tags/v${version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ cimm ];
     platforms = platforms.linux;

From e78c2d05da0cd52fecc82db63a3002ae76859fce Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <poelzleithner@b1-systems.de>
Date: Mon, 16 May 2022 11:10:16 +0200
Subject: [PATCH 66/92] hedgedoc: ensure upload directory exists

Upload directory is not created when uploading, but will fail silently.
Ensure the upload directory is created.
---
 nixos/modules/services/web-apps/hedgedoc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix
index 13893cbf005a..22270609dbcc 100644
--- a/nixos/modules/services/web-apps/hedgedoc.nix
+++ b/nixos/modules/services/web-apps/hedgedoc.nix
@@ -1027,6 +1027,7 @@ in
         ${pkgs.envsubst}/bin/envsubst \
           -o ${cfg.workDir}/config.json \
           -i ${prettyJSON cfg.configuration}
+        mkdir -p ${cfg.configuration.uploadsPath}
       '';
       serviceConfig = {
         WorkingDirectory = cfg.workDir;

From 5c43c429b7ac1d006749c10e05a4a5e132885c64 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 16 Apr 2022 14:02:54 +0200
Subject: [PATCH 67/92] glances: 3.2.4.2 -> 3.2.5

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

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index b25065c5f1ff..b7e4cad122d7 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "3.2.4.2";
+  version = "3.2.5";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
     rev = "v${version}";
-    sha256 = "0gql61lrav3f7wbsvgc1d6vf8r0xi5xs9rz9d3sqw3wj5m90w0vq";
+    sha256 = "sha256-kTnUP7WvmEw4VazjLrGb0FhSdz+/OadzgwDXs1SA02o=";
   };
 
   # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply):

From 570d347c2ebf515bce37450bfd0e3bbf3746a9c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 14:28:49 +0000
Subject: [PATCH 68/92] python310Packages.fakeredis: 1.8 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index b42ecc5bd261..02f0d4927951 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "1.8";
+  version = "1.8.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,8 +24,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
-    rev = "v${version}";
-    hash = "sha256-HWt2EE25h8zUarknrNMBJmizP3rNM9W8IEUMxLyUii8=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU=";
   };
 
   nativeBuildInputs = [

From e93823409f9e6b8e878edf060b430a14353a28f9 Mon Sep 17 00:00:00 2001
From: Georg Haas <hax404foogit@hax404.de>
Date: Wed, 11 May 2022 11:54:05 +0200
Subject: [PATCH 69/92] wireshark: 3.6.3 -> 3.6.5

Changelogs:
 - https://www.wireshark.org/docs/relnotes/wireshark-3.6.4.html
 - https://www.wireshark.org/docs/relnotes/wireshark-3.6.5.html
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 0947686144e5..b74905586192 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -11,7 +11,7 @@ assert withQt  -> qt5  != null;
 with lib;
 
 let
-  version = "3.6.3";
+  version = "3.6.5";
   variant = if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "sha256-tgNkpMAGihCBGrP9B1ymwesOddRGACcbiKIO2Tou9jE=";
+    sha256 = "sha256-otdB1g/zUWE31LnzjNwH7uVKVuw2BG9MOv7mv7T26qE=";
   };
 
   cmakeFlags = [

From ee3b1e9a42b4024581fa2233529d06177137e2a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 14:46:33 +0000
Subject: [PATCH 70/92] python310Packages.google-cloud-os-config: 1.11.1 ->
 1.11.2

---
 .../python-modules/google-cloud-os-config/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 6f6223f1be98..d2235b44cf60 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-i4STXwnFyfXauRx4zvYMO1uWMechvNUOxolOcY3Z5us=";
+    sha256 = "sha256-n3bCKr+fszqHsi6uDmOXSfzoPP8JfpZRAGXIzE3gOVU=";
   };
 
   propagatedBuildInputs = [ google-api-core libcst proto-plus ];

From 43d4ddf28e0facf1e5b8e8cb3cd86871d250ab03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 7 Jun 2022 16:57:06 +0200
Subject: [PATCH 71/92] treewide: remove usage of runCommandNoCC aliases

---
 nixos/modules/hardware/gpgsmartcards.nix                      | 2 +-
 nixos/modules/programs/captive-browser.nix                    | 2 +-
 pkgs/build-support/trivial-builders.nix                       | 1 -
 pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix | 4 ++--
 pkgs/pkgs-lib/formats.nix                                     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/hardware/gpgsmartcards.nix b/nixos/modules/hardware/gpgsmartcards.nix
index 6e5fcda6b851..4c1d0cc5b2a3 100644
--- a/nixos/modules/hardware/gpgsmartcards.nix
+++ b/nixos/modules/hardware/gpgsmartcards.nix
@@ -19,7 +19,7 @@ let
   # per debian's udev deb hook (https://man7.org/linux/man-pages/man1/dh_installudev.1.html)
   destination = "60-scdaemon.rules";
 
-  scdaemonUdevRulesPkg = pkgs.runCommandNoCC "scdaemon-udev-rules" {} ''
+  scdaemonUdevRulesPkg = pkgs.runCommand "scdaemon-udev-rules" {} ''
     loc="$out/lib/udev/rules.d/"
     mkdir -p "''${loc}"
     cp "${scdaemonRules}" "''${loc}/${destination}"
diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix
index aad554c2bd66..1e5c6ff9b244 100644
--- a/nixos/modules/programs/captive-browser.nix
+++ b/nixos/modules/programs/captive-browser.nix
@@ -98,7 +98,7 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [
-      (pkgs.runCommandNoCC "captive-browser-desktop-item" { } ''
+      (pkgs.runCommand "captive-browser-desktop-item" { } ''
         install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
       '')
     ];
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1e04c9b0e293..c889b3865f65 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -10,7 +10,6 @@ rec {
   *
   * Examples:
   * runCommand "name" {envVariable = true;} ''echo hello > $out''
-  * runCommandNoCC "name" {envVariable = true;} ''echo hello > $out'' # equivalent to prior
   * runCommandCC "name" {} ''gcc -o myfile myfile.c; cp myfile $out'';
   *
   * The `*Local` variants force a derivation to be built locally,
diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
index 6782a7418a68..963e134075ed 100644
--- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix
@@ -1,5 +1,5 @@
-{ runCommandNoCC, cargo, neovim, rust-analyzer, rustc }:
-runCommandNoCC "test-neovim-rust-analyzer" {
+{ runCommand, cargo, neovim, rust-analyzer, rustc }:
+runCommand "test-neovim-rust-analyzer" {
   nativeBuildInputs = [ cargo neovim rust-analyzer rustc ];
 
   testRustSrc = /* rust */ ''
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index cb46b63dd0c4..fc52128a7e99 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -357,7 +357,7 @@ rec {
           } // lib.mapAttrs (_name: type: elixirOr type) lib.types;
         };
 
-      generate = name: value: pkgs.runCommandNoCC name
+      generate = name: value: pkgs.runCommand name
         {
           value = toConf value;
           passAsFile = [ "value" ];

From b46f168b21b5568134ec389f6be35c4a05ecf632 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 15:22:45 +0000
Subject: [PATCH 72/92] python310Packages.google-cloud-tasks: 2.9.0 -> 2.9.1

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

diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 6bc9353262fa..7f4c31419839 100644
--- a/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-tasks";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-MjXGDlqRDFn2whxnEm1lf0G+vU9U/S3BmNvi47aEJro=";
+    sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE=";
   };
 
   propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];

From 7881466e3a9a9a13ac7bd02e4c092fc570929503 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 6 Jun 2022 12:47:46 +0200
Subject: [PATCH 73/92] gnome-secrets: 6.4 -> 6.5

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

diff --git a/pkgs/applications/misc/gnome-secrets/default.nix b/pkgs/applications/misc/gnome-secrets/default.nix
index f937b1230266..6052cf70facb 100644
--- a/pkgs/applications/misc/gnome-secrets/default.nix
+++ b/pkgs/applications/misc/gnome-secrets/default.nix
@@ -16,7 +16,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gnome-secrets";
-  version = "6.4";
+  version = "6.5";
   format = "other";
   strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "World";
     repo = "secrets";
     rev = version;
-    sha256 = "sha256-qO2DJ/Eb9+G1R3un2+n9Tf6oxpGrEuH3SBrajQ9tCPU=";
+    sha256 = "sha256-Hy2W7cvvzVcKtd/KzTn81awoolnfM3ST0Nm70YBLTYY=";
   };
 
   nativeBuildInputs = [

From d55e34392a6bafb78e83d839d374b1263321b131 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 15:43:02 +0000
Subject: [PATCH 74/92] python310Packages.google-cloud-texttospeech: 2.11.0 ->
 2.11.1

---
 .../python-modules/google-cloud-texttospeech/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index a7c49f0cabe9..92d2272440e9 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-texttospeech";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-UJSP3a9G6k1arMpoh4/rWrnR4gYtPW6d6LGwWuk5WGg=";
+    sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc=";
   };
 
   propagatedBuildInputs = [ libcst google-api-core proto-plus ];

From 44ad98c77b4c2f80ae30904d0f92623ec2462bd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 15:46:55 +0000
Subject: [PATCH 75/92] python310Packages.google-cloud-asset: 3.9.0 -> 3.9.1

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

diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix
index 0e8281f41847..63b989f4faf0 100644
--- a/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/pkgs/development/python-modules/google-cloud-asset/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-asset";
-  version = "3.9.0";
+  version = "3.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DMRBAzGlByjcdLr/HnVxFxbNWK1TbYFpYKEjDdzfEeg=";
+    hash = "sha256-rGN3P4EfSs7bLLca4Y2J1jF1/wPR5Oc1d6iZFjeQHTM=";
   };
 
   propagatedBuildInputs = [

From bda2cc918684680a4cc6783c741b5fbd311b78aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 15:51:42 +0000
Subject: [PATCH 76/92] python310Packages.google-cloud-bigquery-datatransfer:
 3.6.1 -> 3.6.2

---
 .../google-cloud-bigquery-datatransfer/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 2717af605ef3..8f1266e92f52 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-datatransfer";
-  version = "3.6.1";
+  version = "3.6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
  
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk=";
+    hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94=";
   };
 
   propagatedBuildInputs = [

From c383e4e4d9001ef0939add3bcc4229f56e247834 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 15:55:57 +0000
Subject: [PATCH 77/92] python310Packages.google-cloud-bigquery-logging: 1.0.2
 -> 1.0.3

---
 .../python-modules/google-cloud-bigquery-logging/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index c26d7582c23d..59859e4ccea7 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-logging";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-i8Bh39MnQRQtE4WwDNhHdxFX2bGL6txT+sV8RcvXiZw=";
+    sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs=";
   };
 
   propagatedBuildInputs = [

From bafb8c89c2e93826ad98a78277a95390541f3a94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:00:12 +0000
Subject: [PATCH 78/92] python310Packages.google-cloud-bigquery-storage: 2.13.1
 -> 2.13.2

---
 .../python-modules/google-cloud-bigquery-storage/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
index 1b59bc8ddbf8..e013cac9f610 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-storage";
-  version = "2.13.1";
+  version = "2.13.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7a25148f635a04ca9ff568d47e64be275d3a4a3c90772524879e8f88f270d92d";
+    sha256 = "sha256-rEznNOgFrKfnOmlhexTTHmkKETRGE26SKSp04diz47I=";
   };
 
   propagatedBuildInputs = [

From 0d1a23594c00e0ec9da12fda282d324564178aef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:05:16 +0000
Subject: [PATCH 79/92] python310Packages.google-cloud-container: 2.10.7 ->
 2.10.8

---
 .../python-modules/google-cloud-container/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index ae3c6a8be74a..41b85f50a43e 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.10.7";
+  version = "2.10.8";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-I3oYldj915GBCX5VLEZRqGS7jMHWasQGVIvj50EUTK4=";
+    hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0=";
   };
 
   propagatedBuildInputs = [

From cc7252bc3f21b43fa60835630505c5682da40f6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:09:49 +0000
Subject: [PATCH 80/92] python310Packages.google-cloud-datacatalog: 3.8.0 ->
 3.8.1

---
 .../python-modules/google-cloud-datacatalog/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 304899f0c8ae..f38b604ddb39 100644
--- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datacatalog";
-  version = "3.8.0";
+  version = "3.8.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kGYfdvAnvdFm/1u0CS+n6rGKhV5GtGhW1zF7SVUu8PY=";
+    hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g=";
   };
 
   propagatedBuildInputs = [

From fac18419430ebf3da016be13bdee23e175960b1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:14:45 +0000
Subject: [PATCH 81/92] python310Packages.google-cloud-dataproc: 4.0.2 -> 4.0.3

---
 .../python-modules/google-cloud-dataproc/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 88d4e0bd6620..05b61dd958d2 100644
--- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dataproc";
-  version = "4.0.2";
+  version = "4.0.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-C2hAkWSb3h+lFC3pUIHlttme44Ugfae8opmFQbVWYTE=";
+    sha256 = "sha256-9PqMYqZpcy+Lv/3sh5Ru0X0wQWW5VW7CDsFGgHvErpU=";
   };
 
   propagatedBuildInputs = [

From f43b25729d7bb4bfb4077468a9e99f99af00de7f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 09:18:37 -0700
Subject: [PATCH 82/92] oh-my-zsh: 2022-06-05 -> 2022-06-06 (#176675)

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 70e296196b2e..60bf482a82e1 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -5,15 +5,15 @@
 , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
 
 stdenv.mkDerivation rec {
-  version = "2022-06-05";
+  version = "2022-06-06";
   pname = "oh-my-zsh";
-  rev = "6622210d7d4afe859f11c5d50c177bd5e500f2c6";
+  rev = "d41ca84af1271e8bfbe26f581cebe3b86521d0db";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    sha256 = "3+3ekdryhiILou+8yJpq7axS2PEHDCWnBCQ5373m1uo=";
+    sha256 = "87jAe5cEPj6e1raovj8sD4LZB1sfrSZkCleW8of2HP8=";
   };
 
   strictDeps = true;

From a3bd84cddeb5107def7242950896a1f091341740 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:19:21 +0000
Subject: [PATCH 83/92] python310Packages.google-cloud-datastore: 2.6.1 ->
 2.6.2

---
 .../python-modules/google-cloud-datastore/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 73c887748a04..2a04cca972f9 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc=";
+    sha256 = "sha256-Ie/SyTY8AkmDXRKWwZiukD76HpwJEtp7IBusWj+Y4HE=";
   };
 
   propagatedBuildInputs = [

From 771ec20c06de11939bfe86426aa420fa4d6778a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:23:48 +0000
Subject: [PATCH 84/92] python310Packages.google-cloud-dlp: 3.7.0 -> 3.7.1

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

diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 5dfc97686530..279893faf33e 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.7.0";
+  version = "3.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-aUabWEz+ou12Lgys7PZnldjHnifPWPPqO8iJqkDgx9U=";
+    hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU=";
   };
 
   propagatedBuildInputs = [

From 879a72800537ee5fef99ec7e8955f6ac43675c57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:28:15 +0000
Subject: [PATCH 85/92] python310Packages.google-cloud-error-reporting: 1.5.2
 -> 1.5.3

---
 .../python-modules/google-cloud-error-reporting/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 7ae7babaebf5..67351536ad7c 100644
--- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-error-reporting";
-  version = "1.5.2";
+  version = "1.5.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-wjRUPBZwyGP+2528vZ/x4EqiZwqH+9ZvK5rx4ISklHE=";
+    hash = "sha256-J+MzM6aaVy4xmlNUFhSOgAomT007p3ODYVXN71UmZJA=";
   };
 
   propagatedBuildInputs = [

From 6dd563f949e844a6d5935b60f410f1d3581cc84a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:32:40 +0000
Subject: [PATCH 86/92] python310Packages.google-cloud-iam: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index 26c89af2addb..c1d6152297fb 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam";
-  version = "2.6.1";
+  version = "2.6.2";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ=";
+    sha256 = "sha256-IOl5ZWekpiikOOMQ/afryiP+0lPLt4idSmVARRJj8LE=";
   };
 
   propagatedBuildInputs = [ google-api-core libcst proto-plus ];

From 41d0c6f080ca4a71ede96f0ba6de77c7c937af88 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 7 Jun 2022 18:43:17 +0200
Subject: [PATCH 87/92] python310Packages.deezer-python: update disabled

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

diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix
index 850d47cd026c..c94f3d205ce8 100644
--- a/pkgs/development/python-modules/deezer-python/default.nix
+++ b/pkgs/development/python-modules/deezer-python/default.nix
@@ -16,13 +16,13 @@ buildPythonPackage rec {
   version = "5.3.3";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "browniebroke";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0=";
+    hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0=";
   };
 
   nativeBuildInputs = [
@@ -46,7 +46,9 @@ buildPythonPackage rec {
       --replace " --cov=deezer" ""
   '';
 
-  pythonImportsCheck = [ "deezer" ];
+  pythonImportsCheck = [
+    "deezer"
+  ];
 
   meta = with lib; {
     description = "Python wrapper around the Deezer API";

From d06a2c8e25cfb7af3949b38631140bb0b304dfb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:44:31 +0000
Subject: [PATCH 88/92] python310Packages.google-cloud-iam-logging: 1.0.1 ->
 1.0.2

---
 .../python-modules/google-cloud-iam-logging/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index 017634fd5273..b867c40140ba 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam-logging";
-  version = "1.0.1";
+  version = "1.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY=";
+    hash = "sha256-f5ZETn1zLrC+1Gil47zzJGanx7cFBisdoFPoDe1FFwo=";
   };
 
   propagatedBuildInputs = [

From 0fa2f72a8f68d6d34c7053644277d60b90e0565d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:48:53 +0000
Subject: [PATCH 89/92] python310Packages.google-cloud-iot: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix
index d00d05f5431e..77dd863f2b52 100644
--- a/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iot/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iot";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-bZ2Zn4r+hQ2MfkgXmJPYWbKy3tYlTkYh6ohmWQA/75U=";
+    sha256 = "sha256-Y71v505bwXEV1u28WFAHs12Qx0tKY7BDjFCc+oBgZcw=";
   };
 
   propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

From 764dff4833642c7b6a3cc839d7eb1e713ff18f91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 16:53:08 +0000
Subject: [PATCH 90/92] python310Packages.google-cloud-kms: 2.11.1 -> 2.11.2

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

diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 6317d621a0b9..6a55519f79e9 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00=";
+    sha256 = "sha256-X95xD/L18dXPYxCbvxIPjaOolMSDr7vpyQnzb5oMFEQ=";
   };
 
   propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];

From 2ad850d21ff13198cf0f88e176a87897a11ff694 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Jun 2022 17:04:48 +0000
Subject: [PATCH 91/92] python310Packages.google-cloud-language: 2.4.2 -> 2.4.3

---
 .../python-modules/google-cloud-language/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix
index 2eb6869492f5..366341dc153d 100644
--- a/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/pkgs/development/python-modules/google-cloud-language/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-language";
-  version = "2.4.2";
+  version = "2.4.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-kxJySGikHdichitekEiPjzs48bDqWaXMBhmI6IAwKRM=";
+    sha256 = "sha256-1N5nnT22ILyaubDrpj2bS260AP4YrjrMQ0tgBA3OChg=";
   };
 
   propagatedBuildInputs = [

From 55cadbcfa313f4e160fbcf0fa751a6dc4e95e205 Mon Sep 17 00:00:00 2001
From: Eliza <4576666+elizagamedev@users.noreply.github.com>
Date: Tue, 7 Jun 2022 18:49:39 +0000
Subject: [PATCH 92/92] mujmap: 0.1.1 -> 0.2.0 (#176648)

---
 pkgs/applications/networking/mujmap/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mujmap/default.nix b/pkgs/applications/networking/mujmap/default.nix
index 247a8d589547..60f49163be73 100644
--- a/pkgs/applications/networking/mujmap/default.nix
+++ b/pkgs/applications/networking/mujmap/default.nix
@@ -8,23 +8,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mujmap";
-  version = "0.1.1";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "elizagamedev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-O5CbLgs+MkATPtess0gocgPB9kwD8FMR/urwm6jo2rA=";
+    sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
-  cargoSha256 = "sha256-nOZ+HnzXhVp+tLrNMZO1NmZIhIqlWz0fRMbHVIQkOxI=";
+  cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
 
   buildInputs = [
     notmuch
   ] ++ lib.optional stdenv.isDarwin Security;
 
   meta = with lib; {
-    description = "Bridge for synchronizing email and tags between JMAP and notmuch";
+    description = "JMAP integration for notmuch mail";
     homepage = "https://github.com/elizagamedev/mujmap/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ elizagamedev ];