From 464e69ef243a9846111bac8ba4b7e962c133fdaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 20 Oct 2023 00:17:23 -0400
Subject: [PATCH 01/27] dropbox: 111.3.447 -> 185.4.6054

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

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index cf2edf767316..fd48bc86a9b8 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "111.3.447";
+  version = "185.4.6054";
 
   arch = {
     x86_64-linux = "x86_64";
@@ -84,7 +84,7 @@ buildFHSEnv {
     description = "Online stored folders (daemon version)";
     homepage    = "http://www.dropbox.com/";
     license     = licenses.unfree;
-    maintainers = with maintainers; [ ttuegel ];
+    maintainers = with maintainers; [ eclairevoyant ttuegel ];
     platforms   = [ "i686-linux" "x86_64-linux" ];
     mainProgram = "dropbox";
   };

From 3439e8c114c6ab90e9040d10bd42dcb6b7e60109 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 20 Oct 2023 00:34:30 -0400
Subject: [PATCH 02/27] dropbox-cli: 2020.03.04 -> 2023.09.06

---
 pkgs/applications/networking/dropbox/cli.nix  |  14 +-
 .../networking/dropbox/nautilus-43.patch      | 195 ------------------
 2 files changed, 5 insertions(+), 204 deletions(-)
 delete mode 100644 pkgs/applications/networking/dropbox/nautilus-43.patch

diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index c6b0baa9d3f6..460780461a84 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -5,14 +5,14 @@
 , fetchurl
 , python3
 , dropbox
-, gtk3
+, gtk4
 , gnome
 , gdk-pixbuf
 , gobject-introspection
 }:
 
 let
-  version = "2020.03.04";
+  version = "2023.09.06";
   dropboxd = "${dropbox}/bin/dropbox";
 in
 stdenv.mkDerivation {
@@ -23,16 +23,12 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2";
-    sha256 = "1jjc835n2j61d23kvygdb4n4jsrw33r9mbwxrm4fqin6x01l2w7k";
+    hash = "sha256-kZMwj8Fn8Hf58C57wE025TlmiSs5TaKMGEzvb2QjgSw=";
   };
 
   strictDeps = true;
 
   patches = [
-    # Fix extension for Nautilus 43
-    # https://github.com/dropbox/nautilus-dropbox/pull/105
-    ./nautilus-43.patch
-
     (substituteAll {
       src = ./fix-cli-paths.patch;
       inherit dropboxd;
@@ -54,12 +50,12 @@ stdenv.mkDerivation {
 
   buildInputs = [
     python3
-    gtk3
+    gtk4
     gnome.nautilus
   ];
 
   configureFlags = [
-    "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0"
+    "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extension-4"
   ];
 
   makeFlags = [
diff --git a/pkgs/applications/networking/dropbox/nautilus-43.patch b/pkgs/applications/networking/dropbox/nautilus-43.patch
deleted file mode 100644
index b4b557843197..000000000000
--- a/pkgs/applications/networking/dropbox/nautilus-43.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 025289c..42b49fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -12,7 +12,7 @@ AM_CONFIG_HEADER(config.h)
- #AC_PROG_INTLTOOL([0.29])
- 
- # Dependency checks
--NAUTILUS_REQUIRED=2.16.0
-+NAUTILUS_REQUIRED=43.rc
- GLIB_REQUIRED=2.14.0
- 
- # Used programs
-@@ -26,8 +26,11 @@ if test "x$HAVE_PKGCONFIG" = "xno"; then
- 	AC_MSG_ERROR(you need to have pkgconfig installed !)
- fi
- 
--PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
-+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension-4 >= $NAUTILUS_REQUIRED)
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-+PKG_CHECK_MODULES(GTK, gtk4 >= 4.6.0)
-+
-+AC_SUBST(GTK_CFLAGS)
- 
- AC_PATH_PROG([PYTHON3], [python3])
- 
-@@ -84,10 +87,10 @@ AC_MSG_CHECKING([for nautilus extension directory])
- if test -n "$with_nautilus_extension_dir"; then
-     NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
- else
--    NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-+    NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension-4`
- fi
- if test -z "$NAUTILUS_EXTENSION_DIR"; then
--    NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
-+    NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-4'
- fi
- 
- AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 15d6687..c521ec5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -13,6 +13,7 @@ libnautilus_dropbox_la_CFLAGS = 	                \
- 	$(WARN_CFLAGS)                                  \
- 	$(DISABLE_DEPRECATED_CFLAGS)					\
- 	$(NAUTILUS_CFLAGS)                              \
-+	$(GTK_CFLAGS)                              \
- 	$(GLIB_CFLAGS)
- 
- if DEBUG
-diff --git a/src/dropbox.c b/src/dropbox.c
-index 0d59559..8162aa9 100644
---- a/src/dropbox.c
-+++ b/src/dropbox.c
-@@ -27,9 +27,6 @@
- 
- #include <glib-object.h>
- 
--#include <gdk/gdk.h>
--#include <gtk/gtk.h>
--
- #include "nautilus-dropbox.h"
- 
- static GType type_list[1];
-@@ -41,9 +38,6 @@ nautilus_module_initialize (GTypeModule *module) {
-   nautilus_dropbox_register_type (module);
-   type_list[0] = NAUTILUS_TYPE_DROPBOX;
- 
--  dropbox_use_nautilus_submenu_workaround
--    = (NAUTILUS_VERSION_MAJOR < 2 ||
--       (NAUTILUS_VERSION_MAJOR == 2 && NAUTILUS_VERSION_MINOR <= 22));
-   dropbox_use_operation_in_progress_workaround = TRUE;
- }
- 
-diff --git a/src/nautilus-dropbox.c b/src/nautilus-dropbox.c
-index c75ccbf..b9c10b4 100644
---- a/src/nautilus-dropbox.c
-+++ b/src/nautilus-dropbox.c
-@@ -37,9 +37,7 @@
- #include <glib-object.h>
- #include <gtk/gtk.h>
- 
--#include <libnautilus-extension/nautilus-extension-types.h>
--#include <libnautilus-extension/nautilus-menu-provider.h>
--#include <libnautilus-extension/nautilus-info-provider.h>
-+#include <nautilus-extension.h>
- 
- #include "g-util.h"
- #include "dropbox-command-client.h"
-@@ -49,7 +47,7 @@
- static char *emblems[] = {"dropbox-uptodate", "dropbox-syncing", "dropbox-unsyncable"};
- gchar *DEFAULT_EMBLEM_PATHS[2] = { EMBLEMDIR , NULL };
- 
--gboolean dropbox_use_nautilus_submenu_workaround;
-+
- gboolean dropbox_use_operation_in_progress_workaround;
- 
- static GType dropbox_type = 0;
-@@ -630,13 +628,6 @@ nautilus_dropbox_parse_menu(gchar			**options,
- 	g_object_set_property (G_OBJECT(item), "sensitive", &sensitive);
-       }
- 
--      /* taken from nautilus-file-repairer (http://repairer.kldp.net/):
--       * this code is a workaround for a bug of nautilus
--       * See: http://bugzilla.gnome.org/show_bug.cgi?id=508878 */
--      if (dropbox_use_nautilus_submenu_workaround) {
--	toret = g_list_append(toret, item);
--      }
--
-       g_object_unref(item);
-       g_string_free(new_action_string, TRUE);
-       ret++;
-@@ -661,7 +652,6 @@ get_file_items_callback(GHashTable *response, gpointer ud)
- 
- static GList *
- nautilus_dropbox_get_file_items(NautilusMenuProvider *provider,
--                                GtkWidget            *window,
- 				GList                *files)
- {
-   /*
-@@ -778,14 +768,13 @@ add_emblem_paths(GHashTable* emblem_paths_response)
- 
-   gchar **emblem_paths_list;
-   int i;
--
--  GtkIconTheme *theme = gtk_icon_theme_get_default();
-+  GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
- 
-   if (emblem_paths_response &&
-       (emblem_paths_list = g_hash_table_lookup(emblem_paths_response, "path"))) {
-       for (i = 0; emblem_paths_list[i] != NULL; i++) {
- 	if (emblem_paths_list[i][0])
--	  gtk_icon_theme_append_search_path(theme, emblem_paths_list[i]);
-+	  gtk_icon_theme_add_search_path(theme, emblem_paths_list[i]);
-       }
-   }
-   g_hash_table_unref(emblem_paths_response);
-@@ -804,15 +793,14 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
-       goto exit;
- 
-   // We need to remove the old paths.
--  GtkIconTheme * icon_theme = gtk_icon_theme_get_default();
-   gchar ** paths;
--  gint path_count;
-+  GtkIconTheme *theme = gtk_icon_theme_get_for_display (gdk_display_get_default ());
- 
--  gtk_icon_theme_get_search_path(icon_theme, &paths, &path_count);
-+  paths = gtk_icon_theme_get_search_path(theme);
- 
-   gint i, j, out = 0;
-   gboolean found = FALSE;
--  for (i = 0; i < path_count; i++) {
-+  for (i = 0; paths[i] != NULL; i++) {
-       gboolean keep = TRUE;
-       for (j = 0; emblem_paths_list[j] != NULL; j++) {
- 	  if (emblem_paths_list[j][0]) {
-@@ -834,7 +822,7 @@ remove_emblem_paths(GHashTable* emblem_paths_response)
-      accomodate the changes */
-   if (found) {
-     paths[out] = NULL; /* Clear the last one */
--    gtk_icon_theme_set_search_path(icon_theme, (const gchar **)paths, out);
-+    gtk_icon_theme_set_search_path(theme, (const gchar **)paths);
-   }
- 
-   g_strfreev(paths);
-@@ -888,13 +876,13 @@ on_disconnect(NautilusDropbox *cvs) {
- 
- 
- static void
--nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderIface *iface) {
-+nautilus_dropbox_menu_provider_iface_init (NautilusMenuProviderInterface *iface) {
-   iface->get_file_items = nautilus_dropbox_get_file_items;
-   return;
- }
- 
- static void
--nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderIface *iface) {
-+nautilus_dropbox_info_provider_iface_init (NautilusInfoProviderInterface *iface) {
-   iface->update_file_info = nautilus_dropbox_update_file_info;
-   iface->cancel_update = nautilus_dropbox_cancel_update;
-   return;
-diff --git a/src/nautilus-dropbox.h b/src/nautilus-dropbox.h
-index 65734be..44faa27 100644
---- a/src/nautilus-dropbox.h
-+++ b/src/nautilus-dropbox.h
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <glib-object.h>
- 
--#include <libnautilus-extension/nautilus-info-provider.h>
-+#include <nautilus-extension.h>
- 
- #include "dropbox-command-client.h"
- #include "nautilus-dropbox-hooks.h"

From fa7406f51fc948c8ca871a276b67078a7b9bc48c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 20 Oct 2023 00:34:56 -0400
Subject: [PATCH 03/27] dropbox-cli: add meta.mainProgram

---
 pkgs/applications/networking/dropbox/cli.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index 460780461a84..38c522056376 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -66,6 +66,8 @@ stdenv.mkDerivation {
     homepage = "https://www.dropbox.com";
     description = "Command line client for the dropbox daemon";
     license = lib.licenses.gpl3Plus;
+    mainProgram = "dropbox";
+    maintainers = with lib.maintainers; [ eclairevoyant ];
     # NOTE: Dropbox itself only works on linux, so this is ok.
     platforms = lib.platforms.linux;
   };

From 519c0379727694ab898fc4116e527b347595bf5b Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Tue, 31 Oct 2023 05:03:44 +0000
Subject: [PATCH 04/27] direwolf: remove fix-strlcpy-usage patch

As of direwolf 1.7, this patch is no longer required and has been fixed
upstream.
---
 pkgs/applications/radio/direwolf/default.nix  |  2 -
 .../radio/direwolf/fix-strlcpy-usage.patch    | 89 -------------------
 2 files changed, 91 deletions(-)
 delete mode 100644 pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch

diff --git a/pkgs/applications/radio/direwolf/default.nix b/pkgs/applications/radio/direwolf/default.nix
index 00b47c43eb03..99503d5d0365 100644
--- a/pkgs/applications/radio/direwolf/default.nix
+++ b/pkgs/applications/radio/direwolf/default.nix
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-Vbxc6a6CK+wrBfs15dtjfRa1LJDKKyHMrg8tqsF7EX4=";
   };
 
-  patches = [ ./fix-strlcpy-usage.patch ];
-
   nativeBuildInputs = [ cmake ];
 
   strictDeps = true;
diff --git a/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch b/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch
deleted file mode 100644
index e4061b6287f9..000000000000
--- a/pkgs/applications/radio/direwolf/fix-strlcpy-usage.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-strlcpy is now part of glibc, so there's absolutely no reason for a custom implementation, especially
-one with printf debugging. Hence, removing all of that.
-
-See also https://hydra.nixos.org/build/230546596
-See glibc commit 454a20c8756c9c1d55419153255fc7692b3d2199
-
-diff --git a/external/misc/strlcpy.c b/external/misc/strlcpy.c
-index ff18800..b1cb443 100644
---- a/external/misc/strlcpy.c
-+++ b/external/misc/strlcpy.c
-@@ -56,65 +56,3 @@
- 
- #include "textcolor.h"
- 
--/*
-- * Copy src to string dst of size siz.  At most siz-1 characters
-- * will be copied.  Always NUL terminates (unless siz == 0).
-- * Returns strlen(src); if retval >= siz, truncation occurred.
-- */
--
--#if DEBUG_STRL
--size_t strlcpy_debug(char *__restrict__ dst, const char *__restrict__ src, size_t siz, const char *file, const char *func, int line)
--#else
--size_t strlcpy_debug(char *__restrict__ dst, const char *__restrict__ src, size_t siz)
--#endif
--{
--	char *d = dst;
--	const char *s = src;
--	size_t n = siz;
--	size_t retval;
--
--#if DEBUG_STRL
--	if (dst == NULL) {
--		text_color_set (DW_COLOR_ERROR);
--		dw_printf ("ERROR: strlcpy dst is NULL.  (%s %s %d)\n", file, func, line);
--		return (0);
--	}
--	if (src == NULL) {
--		text_color_set (DW_COLOR_ERROR);
--		dw_printf ("ERROR: strlcpy src is NULL.  (%s %s %d)\n", file, func, line);
--		return (0);
--	}
--	if (siz == 1 || siz == 4) {
--		text_color_set (DW_COLOR_ERROR);
--		dw_printf ("Suspicious strlcpy siz.  Is it using sizeof a pointer variable?  (%s %s %d)\n", file, func, line);
--	}
--#endif
--
--	/* Copy as many bytes as will fit */
--	if (n != 0 && --n != 0) {
--		do {
--			if ((*d++ = *s++) == 0)
--				break;
--		} while (--n != 0);
--	}
--
--	/* Not enough room in dst, add NUL and traverse rest of src */
--	if (n == 0) {
--		if (siz != 0)
--			*d = '\0';		/* NUL-terminate dst */
--		while (*s++)
--			;
--	}
--
--	retval = s - src - 1;	/* count does not include NUL */
--
--#if DEBUG_STRL
--	if (retval >= siz) {
--		text_color_set (DW_COLOR_ERROR);
--		dw_printf ("WARNING: strlcpy result length %d exceeds maximum length %d.  (%s %s %d)\n",
--				(int)retval, (int)(siz-1), file, func, line);
--	}
--#endif
--	return (retval);
--}
--
-diff --git a/src/direwolf.h b/src/direwolf.h
-index 69b0952..6f9ec1a 100644
---- a/src/direwolf.h
-+++ b/src/direwolf.h
-@@ -328,7 +328,7 @@ char *strcasestr(const char *S, const char *FIND);
- #endif
- #endif
- 
--#define DEBUG_STRL 1	// Extra Debug version when using our own strlcpy, strlcat.
-+#define DEBUG_STRL 0	// Extra Debug version when using our own strlcpy, strlcat.
- 			// Should be ignored if not supplying our own.
- 
- #ifndef HAVE_STRLCPY	// Need to supply our own.

From 893bdcb8b46db90f4b2e1c43b881bf386531b929 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 2 Nov 2023 12:33:28 +0100
Subject: [PATCH 05/27] python311Packages.homeassistant-stubs: 2023.10.5 ->
 2023.11.0

https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.11.0
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 1397abf61cec..292f38b2e8b6 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2023.10.5";
+  version = "2023.11.0";
   format = "pyproject";
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-QCdNvEs2LFF43lWLLFX+9VMfQFg1oWUCh/cgxdBQV8w=";
+    hash = "sha256-/yiTNsr22X8orQ8sni50/FeWWZL9OyVZvTngeaGv5SI=";
   };
 
   nativeBuildInputs = [

From a507b4c6e2c08f54d8c1187c31baf58b1edec914 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 12:15:05 +0000
Subject: [PATCH 06/27] kubernetes-polaris: 8.5.1 -> 8.5.2

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

diff --git a/pkgs/tools/security/kubernetes-polaris/default.nix b/pkgs/tools/security/kubernetes-polaris/default.nix
index c8f8dbf07b87..8abcb66f7ade 100644
--- a/pkgs/tools/security/kubernetes-polaris/default.nix
+++ b/pkgs/tools/security/kubernetes-polaris/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubernetes-polaris";
-  version = "8.5.1";
+  version = "8.5.2";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "polaris";
     rev = version;
-    sha256 = "sha256-cfasYaZvUF5Ptc/BDVhafQ8wP6FA5msY+2IaeqmOvD8=";
+    sha256 = "sha256-k4t/qCRLUMoFmALt++1sA127D4tacYoDb/fWfoudOc8=";
   };
 
   vendorHash = "sha256-ZWetW+Xar4BXXlR0iG+O/NRqYk41x+PPVCGis2W2Nkk=";

From 39702841e26368394b2270a7f5744044de6d4ece Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 12:15:26 +0000
Subject: [PATCH 07/27] kyverno: 1.10.3 -> 1.10.4

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

diff --git a/pkgs/applications/networking/cluster/kyverno/default.nix b/pkgs/applications/networking/cluster/kyverno/default.nix
index f0f7c2135ec9..7a45eea58c42 100644
--- a/pkgs/applications/networking/cluster/kyverno/default.nix
+++ b/pkgs/applications/networking/cluster/kyverno/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kyverno";
-  version = "1.10.3";
+  version = "1.10.4";
 
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
     rev = "v${version}";
-    sha256 = "sha256-SRDabFN0ITXwHzvE5m3pIAk42kQa2yINpT64x+k3r3g=";
+    sha256 = "sha256-Qcy+LGvoDJZ+zpIJvC8P0c5pl6GpiDuq7sWdrdMojmg=";
   };
 
   ldflags = [
@@ -18,7 +18,7 @@ buildGoModule rec {
     "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00"
   ];
 
-  vendorHash = "sha256-YFlf0lqG4vWn9d5RAvi12ti/wV+qvsHWn123hhfmxRU=";
+  vendorHash = "sha256-6JM5r/MUETmlMB/8Z82mpUe8bAym9ekb1HL24ik2OlE=";
 
   subPackages = [ "cmd/cli/kubectl-kyverno" ];
 

From 5480ad590da1b979baa9912cf3e7d12a2271e6bf Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 2 Nov 2023 08:29:30 -0400
Subject: [PATCH 08/27] dbip-country-lite: 2023-10 -> 2023-11

---
 pkgs/data/misc/dbip-country-lite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix
index 8774f812ecef..eefd161632d8 100644
--- a/pkgs/data/misc/dbip-country-lite/default.nix
+++ b/pkgs/data/misc/dbip-country-lite/default.nix
@@ -5,11 +5,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2023-10";
+  version = "2023-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-PQn8dyx4l3r7N52rv/Woth6J61+WvVL+SHKMkVVtFsw=";
+    hash = "sha256-Nyje7hf5UdCMHbqZoLpHclDDa4pz+BAyqJcsmPBfSG8=";
   };
 
   dontUnpack = true;

From 5310e46e60079e4378a52be44a28b02e473cedd9 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 2 Nov 2023 08:31:57 -0400
Subject: [PATCH 09/27] python311Packages.edk2-pytool-library: 0.19.2 -> 0.19.4

Diff: https://github.com/tianocore/edk2-pytool-library/compare/v0.19.2...v0.19.4

Changelog: https://github.com/tianocore/edk2-pytool-library/releases/tag/v0.19.4
---
 .../python-modules/edk2-pytool-library/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index fb4c4561388a..61d802ba5c15 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.19.2";
+  version = "0.19.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     rev = "v${version}";
-    hash = "sha256-EoBv7mxdT6G1n9as0V8Ad5QckMkqgC2GvcjRDc1+RzA=";
+    hash = "sha256-7pTi3pDD7245hbWqINchZNImv53a4afzaydE7vTtbVw=";
   };
 
   nativeBuildInputs = [

From eadd2956888aa976b4f62111c38c2fd7164282e0 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Thu, 2 Nov 2023 08:36:53 -0400
Subject: [PATCH 10/27] v2ray-domain-list-community: 20231030084219 ->
 20231031055637

Diff: https://github.com/v2fly/domain-list-community/compare/20231030084219...20231031055637
---
 pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix
index 4d81e0386a37..40cce28dc5d2 100644
--- a/pkgs/data/misc/v2ray-domain-list-community/default.nix
+++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix
@@ -3,12 +3,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20231030084219";
+    version = "20231031055637";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-5FVHjK68weGWjla8MBS1D/Ks5PjzBKLv/TeyjBSgYFw=";
+      hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k=";
     };
     vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ=";
     meta = with lib; {

From 77da70ac0751786669567ebd65d02599c6aa8951 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 2 Nov 2023 09:27:59 -0400
Subject: [PATCH 11/27] typos: 1.16.21 -> 1.16.22

Diff: https://github.com/crate-ci/typos/compare/v1.16.21...v1.16.22

Changelog: https://github.com/crate-ci/typos/blob/v1.16.22/CHANGELOG.md
---
 pkgs/development/tools/typos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix
index c92c47ad8ac0..e51ff3fa87da 100644
--- a/pkgs/development/tools/typos/default.nix
+++ b/pkgs/development/tools/typos/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.16.21";
+  version = "1.16.22";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tXrkKDrWqhckb0TS/wvx1L5aGYRltPIJIPLKvbQk2l8=";
+    hash = "sha256-twOgVIdqbOKmrAWNL8uRb+8cVSJXnvNF4rM109ymCz8=";
   };
 
-  cargoHash = "sha256-Zcrx/HSYhHFgDmlbaVy1L7sCbRUeG8XgDWE0OrQdajs=";
+  cargoHash = "sha256-Gk3gAd5u3PgkV2hf3dzWeTuiiIqLMZ3gZcLIKsvxvCY=";
 
   meta = with lib; {
     description = "Source code spell checker";

From 594ab695588b3509f84d86e769d63141360d3519 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 13:37:25 +0000
Subject: [PATCH 12/27] ydict: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/applications/misc/ydict/default.nix b/pkgs/applications/misc/ydict/default.nix
index 93b06323e0f4..1c57456f4a19 100644
--- a/pkgs/applications/misc/ydict/default.nix
+++ b/pkgs/applications/misc/ydict/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "ydict";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "TimothyYe";
     repo = "ydict";
     rev = "v${version}";
-    sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M=";
+    sha256 = "sha256-FcrkfWE1m5OveK4YPgVmUbL/jkh2NEs9bfeCHm2H9P8=";
   };
 
   vendorHash = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs=";

From b04bc77e564fcfa507f25cd08c6b3e499b04aa87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 14:48:17 +0000
Subject: [PATCH 13/27] faudio: 23.10 -> 23.11

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

diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index 2c23409dc869..8389640e4e59 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "faudio";
-  version = "23.10";
+  version = "23.11";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "sha256-h4wPUUYG8IZr2jHUlKFO2K3QKGiX9AzyLc2Ma5hR8Tk=";
+    sha256 = "sha256-iK0cjhq16DU/77p0cM3SMk+gE1PQV0zd96a3kxwXNLk=";
   };
 
   nativeBuildInputs = [cmake];

From b867bc357aa5c3825b1effecf485635c963f4863 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 2 Nov 2023 14:58:13 +0000
Subject: [PATCH 14/27] zsnes: amend fortify3 patch and fix initialization

I was too eager fixing out-of-bounds access and did not notice that
loop increment is `+= 4` instead of `+= 1`. The loop condition was fine
as is.
---
 pkgs/applications/emulators/zsnes/fortify3.patch | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/applications/emulators/zsnes/fortify3.patch b/pkgs/applications/emulators/zsnes/fortify3.patch
index 83a67b8b7e87..cbd55a1c7af1 100644
--- a/pkgs/applications/emulators/zsnes/fortify3.patch
+++ b/pkgs/applications/emulators/zsnes/fortify3.patch
@@ -18,12 +18,3 @@ Detected by _FORTIFY_SOURCE=3:
  extern unsigned char SPCRAM[65472];
  unsigned char *SPCState = SPCRAM;
  
-@@ -1456,7 +1456,7 @@ void clearmem()
-   memset(pal16b, 0, 1024);
-   memset(pal16bcl, 0, 1024);
-   memset(pal16bclha, 0, 1024);
--  for (i=0 ; i<1024 ; i+=4)
-+  for (i=0 ; i<1024-4 ; i+=4)
-   {
-     memset(pal16bxcl+i, 255, 2);
-     memset(pal16bxcl+i+2, 0, 2);

From 11484de4c5c238af987f622dfd596a1966cb1bed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 15:00:17 +0000
Subject: [PATCH 15/27] nexttrace: 1.2.2.2 -> 1.2.3.1

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

diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix
index 844d2123b272..c4f033184ebe 100644
--- a/pkgs/tools/networking/nexttrace/default.nix
+++ b/pkgs/tools/networking/nexttrace/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "nexttrace";
-  version = "1.2.2.2";
+  version = "1.2.3.1";
 
   src = fetchFromGitHub {
     owner = "nxtrace";
     repo = "NTrace-core";
     rev = "v${version}";
-    sha256 = "sha256-a9l6nsrbgwmk6cq/rPBwPwZ8yhH35VxKmn9x5PgcqGI=";
+    sha256 = "sha256-uY3Cjemv+iFOrWm7lXzRprIljqHCLWOF6DyDURrH39g=";
   };
-  vendorHash = "sha256-YAmGvmHkR1G2MLlDja5aPJqX2F3etogebasqD72YJ3M=";
+  vendorHash = "sha256-sugEN7sKBwEKsfX1MBwOiyH1aq1995HL+Yv7Q8XaPAo=";
 
   doCheck = false; # Tests require a network connection.
 

From 8b87e7ec165373dbfe2d62e69b5960da7fd7b2c8 Mon Sep 17 00:00:00 2001
From: oluceps <i@oluceps.uk>
Date: Mon, 30 Oct 2023 14:23:30 +0800
Subject: [PATCH 16/27] hysteria: 2.1.1 -> 2.2.0

---
 pkgs/tools/networking/hysteria/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix
index 80b12b6d6d67..bcfd588245e4 100644
--- a/pkgs/tools/networking/hysteria/default.nix
+++ b/pkgs/tools/networking/hysteria/default.nix
@@ -1,19 +1,19 @@
 { lib
 , fetchFromGitHub
-, buildGo121Module
+, buildGoModule
 }:
-buildGo121Module rec {
+buildGoModule rec {
   pname = "hysteria";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = pname;
     rev = "app/v${version}";
-    hash = "sha256-CvhDOtXyGxnTy8m7qN5lmQxOxwkExfW+1ZT3LrLjsmo=";
+    hash = "sha256-v9W1/1AIcYKYxVnFFXZdwQC50FWJCMQ0OXCmlfmXWQk=";
   };
 
-  vendorHash = "sha256-Io7EN+Cza7drMLB9JF4nRDxq+eVxW5sYj45WWvXtDsY=";
+  vendorHash = "sha256-/lFDCOkwkBKq1GJA1F7Lyhw++X1G1pld6JXNEdKue/E=";
   proxyVendor = true;
 
   ldflags = [

From 8102ddf12dc7558dac294721b0b04855f189194a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 16:20:34 +0000
Subject: [PATCH 17/27] nitter: unstable-2023-08-08 -> unstable-2023-10-31

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

diff --git a/pkgs/servers/nitter/default.nix b/pkgs/servers/nitter/default.nix
index 07fc8b50e6ac..6610f26263c2 100644
--- a/pkgs/servers/nitter/default.nix
+++ b/pkgs/servers/nitter/default.nix
@@ -22,13 +22,13 @@
 
 buildNimPackage rec {
   pname = "nitter";
-  version = "unstable-2023-08-08";
+  version = "unstable-2023-10-31";
 
   src = fetchFromGitHub {
     owner = "zedeus";
     repo = "nitter";
-    rev = "d7ca353a55ea3440a2ec1f09155951210a374cc7";
-    hash = "sha256-nlpUzbMkDzDk1n4X+9Wk7+qQk+KOfs5ID6euIfHBoa8=";
+    rev = "b62d73dbd373f08af07c7a79efcd790d3bc1a49c";
+    hash = "sha256-yCD7FbqWZMY0fyFf9Q3Ka06nw5Ha7jYLpmPONAhEVIM=";
   };
 
   patches = [

From d1264cebe11c5644c00ecbede97ba7dffefad8d6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 2 Nov 2023 17:30:34 +0100
Subject: [PATCH 18/27] wyoming-faster-whisper: 1.0.1 -> 1.0.2

---
 .../wyoming/faster-whisper-entrypoint.patch   | 32 -------------------
 pkgs/tools/audio/wyoming/faster-whisper.nix   | 32 ++++++++++++-------
 2 files changed, 20 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch

diff --git a/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch b/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch
deleted file mode 100644
index 27a6bd082495..000000000000
--- a/pkgs/tools/audio/wyoming/faster-whisper-entrypoint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 04eedbc..ee0b495 100644
---- a/setup.py
-+++ b/setup.py
-@@ -35,4 +35,9 @@ setup(
-         "Programming Language :: Python :: 3.10",
-     ],
-     keywords="rhasspy wyoming whisper",
-+    entry_points={
-+        'console_scripts': [
-+            'wyoming-faster-whisper = wyoming_faster_whisper:__main__.run'
-+        ]
-+    }
- )
-diff --git a/wyoming_faster_whisper/__main__.py b/wyoming_faster_whisper/__main__.py
-index 8a5039f..bd1e7b6 100755
---- a/wyoming_faster_whisper/__main__.py
-+++ b/wyoming_faster_whisper/__main__.py
-@@ -131,8 +131,12 @@ async def main() -> None:
- 
- # -----------------------------------------------------------------------------
- 
-+def run():
-+    asyncio.run(main())
-+
-+
- if __name__ == "__main__":
-     try:
--        asyncio.run(main())
-+        run()
-     except KeyboardInterrupt:
-         pass
diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix
index 4bc098240622..e7eecd18350d 100644
--- a/pkgs/tools/audio/wyoming/faster-whisper.nix
+++ b/pkgs/tools/audio/wyoming/faster-whisper.nix
@@ -1,31 +1,39 @@
 { lib
 , python3
-, fetchPypi
+, fetchFromGitHub
 , fetchpatch
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wyoming-faster-whisper";
-  version = "1.0.1";
-  format = "setuptools";
+  version = "1.0.2";
+  pyproject = true;
 
-  src = fetchPypi {
-    pname = "wyoming_faster_whisper";
-    inherit version;
-    hash = "sha256-wo62m8gIP9hXihkd8j2haVvz3TlJv3m5WWthTPFwesk=";
+  src = fetchFromGitHub {
+    owner = "rhasspy";
+    repo = "wyoming-faster-whisper";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-mKnWab3i6lEnCBbO3ucNmWIxaaWwQagzfDhaD1U3qow=";
   };
 
   patches = [
-    ./faster-whisper-entrypoint.patch
+    # add wyoming-faster-whisper executable
+    (fetchpatch {
+      url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/a5715197abab34253d2864ed8cf406210834b4ec.patch";
+      hash = "sha256-a9gmXMngwXo9ZJDbxl/pPzm6WSy5XeGbz/Xncj7bOog=";
+    })
 
     # fix model retrieval on python3.11+
     (fetchpatch {
-      url = "https://github.com/rhasspy/rhasspy3/commit/ea55a309e55384e6fd8c9f19534622968f8ed95b.patch";
-      hash = "sha256-V9WXKE3+34KGubBS23vELTHjqU2RCTk3sX8GTjmH+AA=";
-      stripLen = 4;
+      url = "https://github.com/rhasspy/wyoming-faster-whisper/commit/d5229df2c3af536013bc931c1ed7cc239b618208.patch";
+      hash = "sha256-CMpOJ1qSPcdtX2h2ecGmQ/haus/gaSH8r/PCFsMChRY=";
     })
   ];
 
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools
+  ];
+
   propagatedBuildInputs = with python3.pkgs; [
     ctranslate2
     tokenizers
@@ -41,7 +49,7 @@ python3.pkgs.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Wyoming Server for Faster Whisper";
-    homepage = "https://pypi.org/project/wyoming-faster-whisper/";
+    homepage = "https://github.com/rhasspy/wyoming-faster-whisper";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };

From 15babfbc12bfd5649f149dffa37f7d4b71234ed8 Mon Sep 17 00:00:00 2001
From: "Janik H." <janik@aq0.de>
Date: Thu, 2 Nov 2023 18:14:46 +0100
Subject: [PATCH 19/27] nixos/woodpecker-server: fix environmentFile example

---
 .../services/continuous-integration/woodpecker/server.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/woodpecker/server.nix b/nixos/modules/services/continuous-integration/woodpecker/server.nix
index dc8f1567f1e3..38b42f7288c0 100644
--- a/nixos/modules/services/continuous-integration/woodpecker/server.nix
+++ b/nixos/modules/services/continuous-integration/woodpecker/server.nix
@@ -33,7 +33,7 @@ in
       environmentFile = lib.mkOption {
         type = with lib.types; coercedTo path (f: [ f ]) (listOf path);
         default = [ ];
-        example = "/root/woodpecker-server.env";
+        example = [ "/root/woodpecker-server.env" ];
         description = lib.mdDoc ''
           File to load environment variables
           from. This is helpful for specifying secrets.

From 4a683982572efedef202558b58aac400c062dffc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 17:27:32 +0000
Subject: [PATCH 20/27] nmap-formatter: 2.1.3 -> 2.1.4

---
 pkgs/tools/security/nmap-formatter/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/nmap-formatter/default.nix b/pkgs/tools/security/nmap-formatter/default.nix
index 02379ed53aea..9af9b3071041 100644
--- a/pkgs/tools/security/nmap-formatter/default.nix
+++ b/pkgs/tools/security/nmap-formatter/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "nmap-formatter";
-  version = "2.1.3";
+  version = "2.1.4";
 
   src = fetchFromGitHub {
     owner = "vdjagilev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tc946SAWBeKSNgLJZSkEoygxyXm3xbQm3cinIK1uOoY=";
+    hash = "sha256-M0IV7pgJyCxwfWRnJeMevFFsvaXTRfjXoGRsMngt7Pk=";
   };
 
-  vendorHash = "sha256-c2n8GlaD6q21gWUqr31UOioZRxO0s0tSpVRKl/YHXZU=";
+  vendorHash = "sha256-Wx07tSHr5LKPdO3BQ3tGMxzxYP9jBnH3JQ8/yrvwX1U=";
 
   meta = with lib; {
     description = "Tool that allows you to convert nmap output";

From 50c3db1d8e5e19dce3af31c0a8fcb468bc94652e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 2 Nov 2023 11:37:20 -0300
Subject: [PATCH 21/27] harePackages: remove myself from maintainers

I am not interested on keeping Hare for the foreseeable future.
---
 pkgs/development/compilers/hare/hare/default.nix  | 2 +-
 pkgs/development/compilers/hare/harec/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/hare/hare/default.nix b/pkgs/development/compilers/hare/hare/default.nix
index 40f17993a0d6..1845a9c062b8 100644
--- a/pkgs/development/compilers/hare/hare/default.nix
+++ b/pkgs/development/compilers/hare/hare/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
     description =
       "A systems programming language designed to be simple, stable, and robust";
     license = lib.licenses.gpl3Only;
-    maintainers = [ lib.maintainers.AndersonTorres ];
+    maintainers = [ ];
     inherit (harec.meta) platforms badPlatforms;
   };
 })
diff --git a/pkgs/development/compilers/hare/harec/default.nix b/pkgs/development/compilers/hare/harec/default.nix
index 15aff4a7d847..0def9fb193ac 100644
--- a/pkgs/development/compilers/hare/harec/default.nix
+++ b/pkgs/development/compilers/hare/harec/default.nix
@@ -34,9 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://harelang.org/";
     description = "Bootstrapping Hare compiler written in C for POSIX systems";
     license = lib.licenses.gpl3Only;
-    maintainers = [ lib.maintainers.AndersonTorres ];
+    maintainers = [ ];
     # The upstream developers do not like proprietary operating systems; see
     # https://harelang.org/platforms/
+    # UPDATE: https://github.com/hshq/harelang provides a MacOS port
     platforms = with lib.platforms;
       lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64);
     badPlatforms = lib.platforms.darwin;

From f0be1bd5bec1c26c9934e3c504c5423308649527 Mon Sep 17 00:00:00 2001
From: plusgut <github@webentwickler2-0.de>
Date: Thu, 2 Nov 2023 20:59:05 +0100
Subject: [PATCH 22/27] maintainers: add plusgut

---
 maintainers/maintainer-list.nix             | 7 +++++++
 pkgs/development/tools/marksman/default.nix | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a970f9363a60..a5f42896179f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14082,6 +14082,13 @@
     githubId = 13000278;
     name = "Maksim Bronsky";
   };
+  plusgut = {
+    name = "Carlo Jeske";
+    email = "carlo.jeske+nixpkgs@webentwickler2-0.de";
+    github = "plusgut";
+    githubId = 277935;
+    matrix = "@plusgut5:matrix.org";
+  };
   PlushBeaver = {
     name = "Dmitry Kozlyuk";
     email = "dmitry.kozliuk+nixpkgs@gmail.com";
diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix
index 6e15d4aa6b6a..be5419d6c8c8 100644
--- a/pkgs/development/tools/marksman/default.nix
+++ b/pkgs/development/tools/marksman/default.nix
@@ -52,7 +52,7 @@ buildDotnetModule rec {
     '';
     homepage = "https://github.com/artempyanykh/marksman";
     license = licenses.mit;
-    maintainers = with maintainers; [ stasjok ];
+    maintainers = with maintainers; [ stasjok plusgut ];
     platforms = dotnet-sdk.meta.platforms;
   };
 }

From cbbe57bc52d132ef78654b5e63e6d603b1a0c383 Mon Sep 17 00:00:00 2001
From: Alexandru Scvortov <code@scvalex.net>
Date: Sun, 29 Oct 2023 21:03:06 +0000
Subject: [PATCH 23/27] elixir: make 1.15 default and pin existing pkgs to 1.14

---
 .../manual/release-notes/rl-2311.section.md   |  3 +++
 nixos/modules/services/web-apps/akkoma.nix    |  6 ++---
 nixos/modules/services/web-apps/mobilizon.nix |  4 +--
 pkgs/development/beam-modules/default.nix     |  2 +-
 pkgs/servers/akkoma/default.nix               |  4 +++
 pkgs/servers/mobilizon/default.nix            |  2 ++
 pkgs/servers/web-apps/plausible/default.nix   |  1 +
 pkgs/top-level/all-packages.nix               | 27 +++++++++++++++----
 8 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md
index 11da28aac34f..deb6ba46ec2e 100644
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -390,6 +390,9 @@
 
 - `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0).
 
+- Elixir now defaults to version
+  [v1.15](https://elixir-lang.org/blog/2023/06/19/elixir-v1-15-0-released/).
+
 - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.
 
 - DocBook option documentation is no longer supported, all module documentation now uses markdown.
diff --git a/nixos/modules/services/web-apps/akkoma.nix b/nixos/modules/services/web-apps/akkoma.nix
index eaee70c712bb..5f9bbbd66374 100644
--- a/nixos/modules/services/web-apps/akkoma.nix
+++ b/nixos/modules/services/web-apps/akkoma.nix
@@ -86,7 +86,7 @@ let
   # Erlang/Elixir uses a somewhat special format for IP addresses
   erlAddr = addr: fileContents
     (pkgs.runCommand addr {
-      nativeBuildInputs = with pkgs; [ elixir ];
+      nativeBuildInputs = [ cfg.package.elixirPackage ];
       code = ''
         case :inet.parse_address('${addr}') do
           {:ok, addr} -> IO.inspect addr
@@ -96,7 +96,7 @@ let
       passAsFile = [ "code" ];
     } ''elixir "$codePath" >"$out"'');
 
-  format = pkgs.formats.elixirConf { };
+  format = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; };
   configFile = format.generate "config.exs"
     (replaceSec
       (attrsets.updateManyAttrsByPath [{
@@ -146,7 +146,7 @@ let
 
   initSecretsScript = writeShell {
     name = "akkoma-init-secrets";
-    runtimeInputs = with pkgs; [ coreutils elixir ];
+    runtimeInputs = with pkgs; [ coreutils cfg.package.elixirPackage ];
     text = let
       key-base = web.secret_key_base;
       jwt-signer = ex.":joken".":default_signer";
diff --git a/nixos/modules/services/web-apps/mobilizon.nix b/nixos/modules/services/web-apps/mobilizon.nix
index e9264a38f0e6..343c5cead2b1 100644
--- a/nixos/modules/services/web-apps/mobilizon.nix
+++ b/nixos/modules/services/web-apps/mobilizon.nix
@@ -8,7 +8,7 @@ let
   user = "mobilizon";
   group = "mobilizon";
 
-  settingsFormat = pkgs.formats.elixirConf { elixir = pkgs.elixir_1_14; };
+  settingsFormat = pkgs.formats.elixirConf { elixir = cfg.package.elixirPackage; };
 
   configFile = settingsFormat.generate "mobilizon-config.exs" cfg.settings;
 
@@ -309,7 +309,7 @@ in
           genCookie = "IO.puts(Base.encode32(:crypto.strong_rand_bytes(32)))";
 
           evalElixir = str: ''
-            ${pkgs.elixir_1_14}/bin/elixir --eval '${str}'
+            ${cfg.package.elixirPackage}/bin/elixir --eval '${str}'
           '';
         in
         ''
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 421d5f7ffbc0..b7b2cc9c7dcf 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -43,7 +43,7 @@ let
       elvis-erlang = callPackage ./elvis-erlang { };
 
       # BEAM-based languages.
-      elixir = elixir_1_14;
+      elixir = elixir_1_15;
 
       elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix {
         inherit erlang;
diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix
index 36fa26bd0181..fca88e6a3cdb 100644
--- a/pkgs/servers/akkoma/default.nix
+++ b/pkgs/servers/akkoma/default.nix
@@ -172,6 +172,10 @@ beamPackages.mixRelease rec {
   passthru = {
     tests = with nixosTests; { inherit akkoma akkoma-confined; };
     inherit mixNixDeps;
+
+    # Used to make sure the service uses the same version of elixir as
+    # the package
+    elixirPackage = beamPackages.elixir;
   };
 
   meta = with lib; {
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index 73ae391eadc2..a4dca53c0802 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -8,6 +8,7 @@
 , cmake
 , nixosTests
 , mobilizon-frontend
+, ...
 }:
 
 let
@@ -126,6 +127,7 @@ mixRelease rec {
       ${mix2nix}/bin/mix2nix $SRC/mix.lock > pkgs/servers/mobilizon/mix.nix
       cat $SRC/js/package.json > pkgs/servers/mobilizon/package.json
     '';
+    elixirPackage = beamPackages.elixir;
   };
 
   meta = with lib; {
diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix
index 9255a92f280b..e933877a53ab 100644
--- a/pkgs/servers/web-apps/plausible/default.nix
+++ b/pkgs/servers/web-apps/plausible/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , nodejs
 , nixosTests
+, ...
 }:
 
 let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 758ea117d4ae..5b1a53d77944 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -740,7 +740,9 @@ with pkgs;
     inherit (darwin) DarwinTools;
   };
 
-  mix2nix = callPackage ../development/tools/mix2nix { };
+  mix2nix = callPackage ../development/tools/mix2nix {
+    elixir = elixir_1_14;
+  };
 
   n98-magerun = callPackage ../development/tools/misc/n98-magerun { };
 
@@ -1546,7 +1548,10 @@ with pkgs;
 
   adminer = callPackage ../servers/adminer { };
 
-  akkoma = callPackage ../servers/akkoma { };
+  akkoma = callPackage ../servers/akkoma {
+    elixir = elixir_1_14;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
+  };
   akkoma-frontends = recurseIntoAttrs {
     akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { };
     admin-fe = callPackage ../servers/akkoma/admin-fe { };
@@ -3995,6 +4000,7 @@ with pkgs;
 
   livebook = callPackage ../servers/web-apps/livebook {
     elixir = elixir_1_15;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_15; });
   };
 
   lsix = callPackage ../tools/graphics/lsix { };
@@ -4099,7 +4105,10 @@ with pkgs;
 
   play-with-mpv = callPackage ../tools/video/play-with-mpv { };
 
-  plausible = callPackage ../servers/web-apps/plausible { };
+  plausible = callPackage ../servers/web-apps/plausible {
+    elixir = elixir_1_14;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
+  };
 
   pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
 
@@ -6021,6 +6030,8 @@ with pkgs;
   moar = callPackage ../tools/misc/moar { };
 
   mobilizon = callPackage ../servers/mobilizon {
+    elixir = elixir_1_14;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
     mobilizon-frontend = callPackage ../servers/mobilizon/frontend.nix { };
   };
 
@@ -12146,7 +12157,10 @@ with pkgs;
 
   tautulli = python3Packages.callPackage ../servers/tautulli { };
 
-  pleroma = callPackage ../servers/pleroma { };
+  pleroma = callPackage ../servers/pleroma {
+    elixir = elixir_1_14;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
+  };
 
   plfit = callPackage ../tools/misc/plfit {
     python = null;
@@ -35358,7 +35372,10 @@ with pkgs;
 
   wavebox = libsForQt5.callPackage ../applications/networking/instant-messengers/wavebox { };
 
-  sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi { };
+  sonic-pi = libsForQt5.callPackage ../applications/audio/sonic-pi {
+    elixir = elixir_1_14;
+    beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; });
+  };
 
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;

From ecd1f028d4dc36204f2c63a227c90e6af2381a70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Nov 2023 07:56:47 +0000
Subject: [PATCH 24/27] netbird: 0.24.0 -> 0.24.2

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

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 91d34f700121..b9a9aa78d6fc 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -30,16 +30,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.24.0";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-tRezJzHlcJOGqHIV19ZAV58F1RVLQTz2PoYiLwXGBpQ=";
+    hash = "sha256-/gSQiBlcOeQQud8rXPIjY88+jjC0/6S+OTmFqhQxQVM=";
   };
 
-  vendorHash = "sha256-Wocd15Uva74Fy3nCwWfoH+80lF5ugvX3itpm9bTIL7c=";
+  vendorHash = "sha256-mSK5qQqPd6pTDLIBUa2MK8nNdi1VzNRU+GEaW+lGLpY=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

From 8b4a045bb8934d9ae2893def79c09bb048c4343b Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 2 Nov 2023 23:18:25 +0100
Subject: [PATCH 25/27] erofs-utils: 1.7 -> 1.7.1 (#265080)

changelog: https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v1.7.1
---
 pkgs/tools/filesystems/erofs-utils/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix
index e25df7288094..dbf8de967d73 100644
--- a/pkgs/tools/filesystems/erofs-utils/default.nix
+++ b/pkgs/tools/filesystems/erofs-utils/default.nix
@@ -1,26 +1,18 @@
-{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib
+{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib
 , fuseSupport ? stdenv.isLinux
 }:
 
 stdenv.mkDerivation rec {
   pname = "erofs-utils";
-  version = "1.7";
+  version = "1.7.1";
   outputs = [ "out" "man" ];
 
   src = fetchurl {
     url =
       "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz";
-    hash = "sha256-tutSm7Qj6y3XecnanCYyhVSItLkeI1U6Mc4j8Rycziw=";
+    hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU=";
   };
 
-  patches = [
-    # Fixes #261394. Can be dropped with the next erofs version.
-    (fetchpatch {
-      url = "https://github.com/erofs/erofs-utils/commit/8cbc205185a18b9510f4c1fbd54957354f696321.patch";
-      hash = "sha256-CQ5hxav5+HGnBVJW66St9FaVgkuqhkv89rjC/4cmXLs=";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook pkg-config ];
   buildInputs = [ util-linux lz4 zlib ]
     ++ lib.optionals fuseSupport [ fuse ];
@@ -32,6 +24,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/";
     description = "Userspace utilities for linux-erofs file system";
+    changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}";
     license = with licenses; [ gpl2Plus ];
     maintainers = with maintainers; [ ehmry nikstur ];
     platforms = platforms.unix;

From 214da37b5c5e5593fb42fb8edb9e2509d72a05b9 Mon Sep 17 00:00:00 2001
From: 1sixth <1sixth@shinta.ro>
Date: Thu, 2 Nov 2023 17:30:37 -0600
Subject: [PATCH 26/27] mpv: unpin ffmpeg (#265069)

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 057b9874162a..8290e39979c3 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -9,7 +9,7 @@
 , ninja
 , pkg-config
 , python3
-, ffmpeg_5
+, ffmpeg
 , freefont_ttf
 , freetype
 , libass
@@ -159,7 +159,7 @@ in stdenv'.mkDerivation (finalAttrs: {
   ++ lib.optionals waylandSupport [ wayland-scanner ];
 
   buildInputs = [
-    ffmpeg_5
+    ffmpeg
     freetype
     libass
     libpthreadstubs

From 529fd47f28707310775d5ddcc5763740e2feed01 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 2 Nov 2023 18:33:12 -0500
Subject: [PATCH 27/27] redis: 7.2.2 -> 7.2.3 (#264857)

Changelog: https://github.com/redis/redis/raw/7.2.3/00-RELEASENOTES
---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index b1f3bb7adcc3..c3ac0ebbf969 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "7.2.2";
+  version = "7.2.3";
 
   src = fetchurl {
     url = "https://download.redis.io/releases/redis-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ypmb4IgA7cbSZTecTHqvrZLw7kAGkuTi1pgpq0tMPQg=";
+    hash = "sha256-PisZbW603bnnQwiL/CkVzLtC1A9aij7djLaccW7DS+c=";
   };
 
   patches = lib.optionals useSystemJemalloc [