From b81838e36b0295a2c5f2ebe008c32bb238f2d5bc Mon Sep 17 00:00:00 2001
From: mimvoid <mimvoid@proton.me>
Date: Sun, 2 Jun 2024 18:21:21 -0400
Subject: [PATCH 01/16] maintainers: add mimvoid

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4a5e66b4fd23..9c624277cf79 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13538,6 +13538,12 @@
     githubId = 3269878;
     name = "Miguel Madrid Mencía";
   };
+  mimvoid = {
+    github = "mimvoid";
+    githubId = 153698678;
+    email = "mimvoid@proton.me";
+    name = "mimvoid";
+  };
   mindavi = {
     email = "rol3517@gmail.com";
     github = "Mindavi";

From 524cca3578e5b3d9fa3ef7ba80a57eb69e51c8d9 Mon Sep 17 00:00:00 2001
From: mimvoid <mimvoid@proton.me>
Date: Sun, 2 Jun 2024 17:57:41 -0400
Subject: [PATCH 02/16] catppuccin-grub: init at 1.0.0

maintainers: add mimvoid

catppuccin-grub: init at 1.0.0

	modified:   pkgs/by-name/ca/catppuccin-grub/package.nix
---
 pkgs/by-name/ca/catppuccin-grub/package.nix | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ca/catppuccin-grub/package.nix

diff --git a/pkgs/by-name/ca/catppuccin-grub/package.nix b/pkgs/by-name/ca/catppuccin-grub/package.nix
new file mode 100644
index 000000000000..7c3a16348e9b
--- /dev/null
+++ b/pkgs/by-name/ca/catppuccin-grub/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  flavor ? "mocha", # override with your chosen flavor
+}:
+let
+  version = "1.0.0";
+in
+stdenvNoCC.mkDerivation {
+  pname = "catppuccin-grub";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "catppuccin";
+    repo = "grub";
+    rev = "v${version}";
+    hash = "sha256-/bSolCta8GCZ4lP0u5NVqYQ9Y3ZooYCNdTwORNvR7M0=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/
+    cp -r src/catppuccin-${flavor}-grub-theme/* "$out/"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Soothing pastel theme for GRUB";
+    homepage = "https://github.com/catppuccin/grub";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [isabelroses mimvoid];
+    platforms = lib.platforms.linux;
+  };
+}

From ead69bba03d019c3f491918da9f341dafa632b08 Mon Sep 17 00:00:00 2001
From: CrackTC <chenrke369@gmail.com>
Date: Thu, 13 Jun 2024 18:18:44 +0800
Subject: [PATCH 03/16] obsidian: add commandLineArgs

---
 pkgs/applications/misc/obsidian/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix
index ff7c789a6eb5..000d94bbeec3 100644
--- a/pkgs/applications/misc/obsidian/default.nix
+++ b/pkgs/applications/misc/obsidian/default.nix
@@ -8,6 +8,7 @@
 , writeScript
 , undmg
 , unzip
+, commandLineArgs ? ""
 }:
 let
   inherit (stdenv.hostPlatform) system;
@@ -52,7 +53,8 @@ let
       mkdir -p $out/bin
       makeWrapper ${electron}/bin/electron $out/bin/obsidian \
         --add-flags $out/share/obsidian/app.asar \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" \
+        --add-flags ${lib.escapeShellArg commandLineArgs}
       install -m 444 -D resources/app.asar $out/share/obsidian/app.asar
       install -m 444 -D resources/obsidian.asar $out/share/obsidian/obsidian.asar
       install -m 444 -D "${desktopItem}/share/applications/"* \

From 0d214644f78e6749b825a5613a32d1fbf34854fb Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 14 Jun 2024 04:27:09 +0400
Subject: [PATCH 04/16] lib60870: enable tls support

---
 pkgs/by-name/li/lib60870/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix
index 9d8e959b9913..4669042b7be9 100644
--- a/pkgs/by-name/li/lib60870/package.nix
+++ b/pkgs/by-name/li/lib60870/package.nix
@@ -4,6 +4,7 @@
   stdenv,
   fetchFromGitHub,
   gitUpdater,
+  mbedtls_2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
+  buildInputs = [ mbedtls_2 ];
+
+  cmakeFlags = [ (lib.cmakeBool "WITH_MBEDTLS" true) ];
+
+  env.NIX_LDFLAGS = "-lmbedcrypto -lmbedx509 -lmbedtls";
+
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = with lib; {

From cae03b78b484b952422854834b7de02cb29c1e3f Mon Sep 17 00:00:00 2001
From: Alex James <git@alextjam.es>
Date: Sun, 16 Jun 2024 17:35:52 -0500
Subject: [PATCH 05/16] zig: fix build on Darwin with sandbox enabled

During stage 3 of compilation, Zig calls `std.zig.system.darwin.macos.detect`,
which parses /System/Library/CoreServices/.SystemVersionPlatform.plist and
/System/Library/CoreServices/SystemVersion.plist[^1] to determine the OS
version. These paths are inaccessible when the sandbox is enabled, which causes
the build to fail with `OSVersionDetectionFail`[^2]. Fix the build with the
relaxed sandbox option by adding these paths to `__impureHostDeps`.

[^1]: https://github.com/ziglang/zig/blob/cd62005f19ff966d2c42de4daeb9a1e4b644bf76/lib/std/zig/system/darwin/macos.zig
[^2]: https://github.com/NixOS/nixpkgs/issues/287861#issuecomment-2148703491
---
 pkgs/development/compilers/zig/0.12/default.nix | 10 ++++++++++
 pkgs/development/compilers/zig/0.13/default.nix | 10 ++++++++++
 pkgs/development/compilers/zig/generic.nix      | 10 ++++++++++
 3 files changed, 30 insertions(+)

diff --git a/pkgs/development/compilers/zig/0.12/default.nix b/pkgs/development/compilers/zig/0.12/default.nix
index 092b416c7903..88bb0169dd8a 100644
--- a/pkgs/development/compilers/zig/0.12/default.nix
+++ b/pkgs/development/compilers/zig/0.12/default.nix
@@ -38,6 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
       llvm
     ]);
 
+  # On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
+  # which parses /System/Library/CoreServices/SystemVersion.plist and
+  # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the
+  # OS version. This causes the build to fail during stage 3 with
+  # OSVersionDetectionFail when the sandbox is enabled.
+  __impureHostDeps = lib.optionals stdenv.isDarwin [
+    "/System/Library/CoreServices/.SystemVersionPlatform.plist"
+    "/System/Library/CoreServices/SystemVersion.plist"
+  ];
+
   outputs = [
     "out"
     "doc"
diff --git a/pkgs/development/compilers/zig/0.13/default.nix b/pkgs/development/compilers/zig/0.13/default.nix
index bdc01ba47f9f..0c72b459facf 100644
--- a/pkgs/development/compilers/zig/0.13/default.nix
+++ b/pkgs/development/compilers/zig/0.13/default.nix
@@ -38,6 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
       llvm
     ]);
 
+  # On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
+  # which parses /System/Library/CoreServices/SystemVersion.plist and
+  # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the
+  # OS version. This causes the build to fail during stage 3 with
+  # OSVersionDetectionFail when the sandbox is enabled.
+  __impureHostDeps = lib.optionals stdenv.isDarwin [
+    "/System/Library/CoreServices/.SystemVersionPlatform.plist"
+    "/System/Library/CoreServices/SystemVersion.plist"
+  ];
+
   outputs = [
     "out"
     "doc"
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index f3c725e1e5ce..3369f5d40c2c 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -36,6 +36,16 @@ stdenv.mkDerivation (finalAttrs: {
     llvm
   ]);
 
+  # On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
+  # which parses /System/Library/CoreServices/SystemVersion.plist and
+  # /System/Library/CoreServices/.SystemVersionPlatform.plist to determine the
+  # OS version. This causes the build to fail during stage 3 with
+  # OSVersionDetectionFail when the sandbox is enabled.
+  __impureHostDeps = lib.optionals stdenv.isDarwin [
+    "/System/Library/CoreServices/.SystemVersionPlatform.plist"
+    "/System/Library/CoreServices/SystemVersion.plist"
+  ];
+
   env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
 
   # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't

From 6ce1fa5216504775bff011fe5e0b8dbe2595e1e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Jun 2024 13:02:04 +0000
Subject: [PATCH 06/16] cbmc: 5.95.1 -> 6.0.0

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

diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix
index dcf5b5bb37fa..0a81b2a09ef1 100644
--- a/pkgs/applications/science/logic/cbmc/default.nix
+++ b/pkgs/applications/science/logic/cbmc/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cbmc";
-  version = "5.95.1";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "diffblue";
     repo = pname;
     rev = "${pname}-${version}";
-    sha256 = "sha256-fDLSo5EeHyPTliAqFp+5mfaB0iZXIMXeMyF21fjl5k4=";
+    sha256 = "sha256-mPRkkKN7Hz9Qi6a3fEwVFh7a9OaBFcksNw9qwNOarao=";
   };
 
   nativeBuildInputs = [

From 6f52adb1fe16f20a85166fe0b7217ceb5b2cb33e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 19 Jun 2024 20:27:23 +0200
Subject: [PATCH 07/16] catppuccin-fcitx5: merge with fcitx5-catppuccin

they are the same package
---
 pkgs/by-name/ca/catppuccin-fcitx5/package.nix |  8 +++-
 pkgs/by-name/fc/fcitx5-catppuccin/package.nix | 39 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 8 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/by-name/fc/fcitx5-catppuccin/package.nix

diff --git a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix
index 879b14960b2a..475171ad2cf9 100644
--- a/pkgs/by-name/ca/catppuccin-fcitx5/package.nix
+++ b/pkgs/by-name/ca/catppuccin-fcitx5/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
+  unstableGitUpdater,
 }:
 stdenvNoCC.mkDerivation {
   pname = "catppuccin-fcitx5";
@@ -14,6 +15,9 @@ stdenvNoCC.mkDerivation {
     hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps=";
   };
 
+  dontConfigure = true;
+  dontBuild = true;
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/share/fcitx5
@@ -21,11 +25,13 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     description = "Soothing pastel theme for Fcitx5";
     homepage = "https://github.com/catppuccin/fcitx5";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ pluiedev ];
+    maintainers = with lib.maintainers; [ pluiedev Guanran928 ];
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/fc/fcitx5-catppuccin/package.nix b/pkgs/by-name/fc/fcitx5-catppuccin/package.nix
deleted file mode 100644
index 954471d71662..000000000000
--- a/pkgs/by-name/fc/fcitx5-catppuccin/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  fetchFromGitHub,
-  unstableGitUpdater,
-}:
-stdenvNoCC.mkDerivation {
-  pname = "fcitx5-catppuccin";
-  version = "0-unstable-2022-10-05";
-
-  src = fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "fcitx5";
-    rev = "ce244cfdf43a648d984719fdfd1d60aab09f5c97";
-    hash = "sha256-uFaCbyrEjv4oiKUzLVFzw+UY54/h7wh2cntqeyYwGps=";
-  };
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/share/fcitx5/themes
-    cp -r src/catppuccin-* $out/share/fcitx5/themes
-
-    runHook postInstall
-  '';
-
-  passthru.updateScript = unstableGitUpdater { };
-
-  meta = with lib; {
-    description = "Soothing pastel theme for Fcitx5";
-    homepage = "https://github.com/catppuccin/fcitx5";
-    license = licenses.mit;
-    maintainers = with maintainers; [ Guanran928 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6609a49b3191..1e842da8fc01 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -376,6 +376,7 @@ mapAliases ({
   faustStk = faustPhysicalModeling; # Added 2023-05-16
   fastnlo = fastnlo-toolkit; # Added 2021-04-24
   fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
+  fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
   inherit (luaPackages) fennel; # Added 2022-09-24
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
   FIL-plugins = fil-plugins; # Added 2024-06-12

From 9e92e3ec0ca6a334df967a685c42b5a275c8f1f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Jun 2024 14:53:00 +0000
Subject: [PATCH 08/16] python311Packages.fastembed: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/fastembed/default.nix b/pkgs/development/python-modules/fastembed/default.nix
index 005e514ff3c2..f55f8a78ac24 100644
--- a/pkgs/development/python-modules/fastembed/default.nix
+++ b/pkgs/development/python-modules/fastembed/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "fastembed";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "qdrant";
     repo = "fastembed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Tfj0YdUW/Nnvn4+RoOWj9l0gDkWbpVgiADA09ht4xxM=";
+    hash = "sha256-bFIikLogTxrwLNR+NOnnRjKGneZ63N7CBuu81z85xZo=";
   };
 
   build-system = [ poetry-core ];

From 3b3932e6d74a9799c99e59ca63f78d9ef6a1ae5d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Jun 2024 17:34:39 +0000
Subject: [PATCH 09/16] uclibc: 1.0.48 -> 1.0.49

---
 pkgs/by-name/uc/uclibc-ng/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index aee6f6f015f1..b4464ef3ba65 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -59,11 +59,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uclibc-ng";
-  version = "1.0.48";
+  version = "1.0.49";
 
   src = fetchurl {
     url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-O/X8bMXLxFS2xHhCR1XG9x58FVeKLJZvAmBqpcVZbiE=";
+    hash = "sha256-NA+dXdEVnGnDOAZU455WfLswSvzT+d+i6YM/D6E/W74=";
   };
 
   # 'ftw' needed to build acl, a coreutils dependency

From 42c1193cc33962e97fd086fb7681985c41f00349 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Jun 2024 22:58:13 +0000
Subject: [PATCH 10/16] lxd-ui: 0.8.1 -> 0.9

---
 pkgs/by-name/lx/lxd-ui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix
index b200b1ea0d90..a436f32e7d50 100644
--- a/pkgs/by-name/lx/lxd-ui/package.nix
+++ b/pkgs/by-name/lx/lxd-ui/package.nix
@@ -12,18 +12,18 @@
 
 stdenv.mkDerivation rec {
   pname = "lxd-ui";
-  version = "0.8.1";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lxd-ui";
     rev = "refs/tags/${version}";
-    hash = "sha256-XLHLWD7iH4A5+MaFYiMILnjPGN565gBRpimFoOJMRtI=";
+    hash = "sha256-4TIi/LPm35W86p+l5eYU0VETjno8TKmp43m2SReKElM=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-hRZ0vbksxnUv4XMrbhP2PI94UYYzwrydJHSx+uf+MbI=";
+    hash = "sha256-wExAVEl745X4O9hYhKYX2BjmW494Vr13X8bDmVxKMT4=";
   };
 
   nativeBuildInputs = [

From 3ed0e6824c1a677493e86904a9f7472fcef5b46a Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Fri, 7 Jun 2024 21:08:18 +0200
Subject: [PATCH 11/16] glances: update to unstable 4.0.8

test 105 and 107 failed on aarch64. Upstream fixes those but
cherry-picking would require pulling in many different commits, so
updating to this unstable relase is cleaner.

See upstream issue on https://github.com/nicolargo/glances/issues/2819

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/applications/system/glances/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 69a94efbbd8a..4be42e97344a 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -26,14 +26,15 @@
 
 buildPythonApplication rec {
   pname = "glances";
-  version = "4.0.7";
+  # use unstable to fix a build error for aarch64.
+  version = "4.0.8-unstable-2024-06-09";
   disabled = isPyPy;
 
   src = fetchFromGitHub {
     owner = "nicolargo";
     repo = "glances";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Vfsco8Wno57aPM7PtwCc/gI+6FnAG3H/t5OAUngDU5o=";
+    rev = "051006e12f7c90281dda4af60871b535b0dcdcb9";
+    hash = "sha256-iCK5soTACQwtCVMmMsFaqXvZtTKX9WbTul0mUeSWC2M=";
   };
 
   # On Darwin this package segfaults due to mismatch of pure and impure

From bf166001a32957c4a83e0e9e1e2d13a9aca43679 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Jun 2024 02:26:47 +0000
Subject: [PATCH 12/16] roddhjav-apparmor-rules: 0-unstable-2024-06-12 ->
 0-unstable-2024-06-16

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 18aee65f0210..d1218c05c9c1 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-06-12";
+  version = "0-unstable-2024-06-16";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "327c1dec332aaf2f6a9ef59e2243fdf517a0956a";
-    hash = "sha256-AIMmwqa7Kh4/zbTAiHVfOi4LwXO9eInaGCjUx9MRa1o=";
+    rev = "747292e95402298553dec3b2dd923a6c62ad2077";
+    hash = "sha256-SWNo6qJNR4XGZc79JQXsab0vppDf1D5GXH/iMmdi5WQ=";
   };
 
   dontConfigure = true;

From 48d4001bfead087cb5abc647fffc8a63eaa4cfb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Jun 2024 02:48:58 +0000
Subject: [PATCH 13/16] home-assistant-custom-lovelace-modules.android-tv-card:
 3.8.0 -> 3.8.1

---
 .../custom-lovelace-modules/android-tv-card/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
index b3f93c0b50c4..9398e57486f9 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
@@ -5,18 +5,18 @@
 
 buildNpmPackage rec {
   pname = "android-tv-card";
-  version = "3.8.0";
+  version = "3.8.1";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-DYNfDGvCLJHhp2p9iPsxWAyPPUNI+sLwDYP6FRQA1vk=";
+    hash = "sha256-ARFJJ119zJzjW0d59JFARMcjVAJ2IFDkShIN43d1adI=";
   };
 
   patches = [ ./dont-call-git.patch ];
 
-  npmDepsHash = "sha256-9O5T3x3uLm5qpZwIbeo2DJ/CirRilJ17BZuT3+NDP8A=";
+  npmDepsHash = "sha256-t/kZTcXs3IpbrEfnmYQlJqhM8F3mO4prbQNnKtFqsDM=";
 
   installPhase = ''
     runHook preInstall

From d2a0c85422826b42a0acf4bf5cf1c94b4401beb6 Mon Sep 17 00:00:00 2001
From: Elliot Speck <11192354+Arcayr@users.noreply.github.com>
Date: Fri, 21 Jun 2024 13:55:09 +1000
Subject: [PATCH 14/16] burpsuite: remove arcayr from maintainers

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

diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix
index bc3ab38b7484..a234ad577d84 100644
--- a/pkgs/tools/networking/burpsuite/default.nix
+++ b/pkgs/tools/networking/burpsuite/default.nix
@@ -85,7 +85,7 @@ buildFHSEnv {
     license = licenses.unfree;
     platforms = jdk.meta.platforms;
     hydraPlatforms = [ ];
-    maintainers = with maintainers; [ arcayr bennofs ];
+    maintainers = with maintainers; [ bennofs ];
     mainProgram = "burpsuite";
   };
 }

From 2f0a45e42e5eafd5223c844ca404296c9050bea9 Mon Sep 17 00:00:00 2001
From: Elliot Speck <11192354+Arcayr@users.noreply.github.com>
Date: Fri, 21 Jun 2024 14:06:20 +1000
Subject: [PATCH 15/16] mitm6: remove arcayr from maintainers

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

diff --git a/pkgs/tools/security/mitm6/default.nix b/pkgs/tools/security/mitm6/default.nix
index f3626355fbb1..518b61fd8d4b 100644
--- a/pkgs/tools/security/mitm6/default.nix
+++ b/pkgs/tools/security/mitm6/default.nix
@@ -32,6 +32,6 @@ python3.pkgs.buildPythonApplication rec {
     mainProgram = "mitm6";
     homepage = "https://github.com/dirkjanm/mitm6";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ arcayr ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 298e3cbec9c13d4a76e4d2c0ce897a55a303a45c Mon Sep 17 00:00:00 2001
From: Elliot Speck <11192354+Arcayr@users.noreply.github.com>
Date: Fri, 21 Jun 2024 14:07:03 +1000
Subject: [PATCH 16/16] maintainers: remove arcayr

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 02e73e157ae6..8ed83aa6004e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1551,12 +1551,6 @@
     githubId = 56009;
     name = "Arcadio Rubio García";
   };
-  arcayr = {
-    email = "nix@arcayr.online";
-    github = "arcayr";
-    githubId = 11192354;
-    name = "Elliot Speck";
-  };
   archer-65 = {
     email = "mario.liguori.056@gmail.com";
     github = "archer-65";