From 0833ea2c18a5a9a2889b8a71436f3d7290213a33 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:42:26 -0400
Subject: [PATCH 01/21] applications/kde: Remove samueldr as maintainer of
 mobile gear

---
 pkgs/applications/kde/alligator.nix        | 2 +-
 pkgs/applications/kde/audiotube.nix        | 2 +-
 pkgs/applications/kde/calindori.nix        | 2 +-
 pkgs/applications/kde/kalk.nix             | 2 +-
 pkgs/applications/kde/kasts.nix            | 2 +-
 pkgs/applications/kde/kclock.nix           | 2 +-
 pkgs/applications/kde/keysmith.nix         | 2 +-
 pkgs/applications/kde/koko.nix             | 2 +-
 pkgs/applications/kde/kpublictransport.nix | 2 +-
 pkgs/applications/kde/krecorder.nix        | 2 +-
 pkgs/applications/kde/ktrip.nix            | 2 +-
 pkgs/applications/kde/kweather.nix         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/kde/alligator.nix b/pkgs/applications/kde/alligator.nix
index 425f9733b38aa..78263cb73be57 100644
--- a/pkgs/applications/kde/alligator.nix
+++ b/pkgs/applications/kde/alligator.nix
@@ -38,6 +38,6 @@ mkDerivation rec {
     # https://invent.kde.org/plasma-mobile/alligator/-/commit/db30f159c4700244532b17a260deb95551045b7a
     #  * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
     license = with licenses; [ gpl2Only gpl3Only ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/audiotube.nix b/pkgs/applications/kde/audiotube.nix
index c5a5da8550083..58d188d486fbb 100644
--- a/pkgs/applications/kde/audiotube.nix
+++ b/pkgs/applications/kde/audiotube.nix
@@ -66,6 +66,6 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/plasma-mobile/audiotube";
     # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES
     license = with licenses; [ bsd2 cc0 gpl2Only gpl3Only ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/calindori.nix b/pkgs/applications/kde/calindori.nix
index bb10fa7bb10c7..c1e9f4d59b18b 100644
--- a/pkgs/applications/kde/calindori.nix
+++ b/pkgs/applications/kde/calindori.nix
@@ -41,6 +41,6 @@ mkDerivation rec {
     description = "Calendar for Plasma Mobile";
     homepage = "https://invent.kde.org/plasma-mobile/calindori";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/kalk.nix b/pkgs/applications/kde/kalk.nix
index c151078e910e0..d88741d179bb7 100644
--- a/pkgs/applications/kde/kalk.nix
+++ b/pkgs/applications/kde/kalk.nix
@@ -46,6 +46,6 @@ mkDerivation rec {
     mainProgram = "kalk";
     homepage = "https://invent.kde.org/plasma-mobile/kalk";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/kasts.nix b/pkgs/applications/kde/kasts.nix
index 65e4d09409c7a..87136676df40b 100644
--- a/pkgs/applications/kde/kasts.nix
+++ b/pkgs/applications/kde/kasts.nix
@@ -63,6 +63,6 @@ mkDerivation rec {
     homepage = "https://apps.kde.org/kasts/";
     # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES
     license = with licenses; [ bsd2 cc-by-sa-40 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/kclock.nix b/pkgs/applications/kde/kclock.nix
index 6212fa8b0400b..d97ad54177448 100644
--- a/pkgs/applications/kde/kclock.nix
+++ b/pkgs/applications/kde/kclock.nix
@@ -41,6 +41,6 @@ mkDerivation rec {
     description = "Clock app for plasma mobile";
     homepage = "https://invent.kde.org/plasma-mobile/kclock";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/keysmith.nix b/pkgs/applications/kde/keysmith.nix
index cca4d2ece5635..6dd8e3505b537 100644
--- a/pkgs/applications/kde/keysmith.nix
+++ b/pkgs/applications/kde/keysmith.nix
@@ -34,7 +34,7 @@ mkDerivation rec {
     mainProgram = "keysmith";
     license = licenses.gpl3;
     homepage = "https://github.com/KDE/keysmith";
-    maintainers = with maintainers; [ samueldr shamilton ];
+    maintainers = with maintainers; [ shamilton ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/kde/koko.nix b/pkgs/applications/kde/koko.nix
index 826125f91d104..d47734b94e1f9 100644
--- a/pkgs/applications/kde/koko.nix
+++ b/pkgs/applications/kde/koko.nix
@@ -77,6 +77,6 @@ mkDerivation rec {
     homepage = "https://apps.kde.org/koko/";
     # LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
     license = [ licenses.lgpl3Only licenses.lgpl21Only ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix
index 0678aa10daff5..84d97a42ac3fe 100644
--- a/pkgs/applications/kde/kpublictransport.nix
+++ b/pkgs/applications/kde/kpublictransport.nix
@@ -10,7 +10,7 @@ mkDerivation {
   pname = "kpublictransport";
   meta = with lib; {
     license = [ licenses.cc0 ];
-    maintainers = [ maintainers.samueldr ];
+    maintainers = [ ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
 
diff --git a/pkgs/applications/kde/krecorder.nix b/pkgs/applications/kde/krecorder.nix
index afa5ddee2ed67..d6bdfcc4d38cb 100644
--- a/pkgs/applications/kde/krecorder.nix
+++ b/pkgs/applications/kde/krecorder.nix
@@ -38,6 +38,6 @@ mkDerivation rec {
     mainProgram = "krecorder";
     homepage = "https://invent.kde.org/plasma-mobile/krecorder";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/ktrip.nix b/pkgs/applications/kde/ktrip.nix
index ebcb85d67d4a1..8780a64d51a98 100644
--- a/pkgs/applications/kde/ktrip.nix
+++ b/pkgs/applications/kde/ktrip.nix
@@ -43,6 +43,6 @@ mkDerivation rec {
     homepage = "https://apps.kde.org/ktrip/";
     # GPL-2.0-or-later
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/kde/kweather.nix b/pkgs/applications/kde/kweather.nix
index b9a5fc04f6dfa..5c2f244fae60e 100644
--- a/pkgs/applications/kde/kweather.nix
+++ b/pkgs/applications/kde/kweather.nix
@@ -44,6 +44,6 @@ mkDerivation rec {
     mainProgram = "kweather";
     homepage = "https://invent.kde.org/plasma-mobile/kweather";
     license = with licenses; [ gpl2Plus cc-by-40 ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }

From b5b598e0a9c644c555af7b48ffccc3b64072b5e3 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:42:52 -0400
Subject: [PATCH 02/21] applications/plasma-mobile: Drop samueldr as maintainer

---
 pkgs/applications/plasma-mobile/plasma-dialer.nix    | 2 +-
 pkgs/applications/plasma-mobile/plasma-phonebook.nix | 2 +-
 pkgs/applications/plasma-mobile/plasma-settings.nix  | 2 +-
 pkgs/applications/plasma-mobile/spacebar.nix         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
index 5a5132cd90519..975d4571a16e9 100644
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@@ -82,6 +82,6 @@ mkDerivation rec {
     mainProgram = "plasmaphonedialer";
     homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
index bc186b67d3177..67164f548d1e0 100644
--- a/pkgs/applications/plasma-mobile/plasma-phonebook.nix
+++ b/pkgs/applications/plasma-mobile/plasma-phonebook.nix
@@ -37,6 +37,6 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/plasma-mobile/plasma-phonebook";
     # https://invent.kde.org/plasma-mobile/plasma-phonebook/-/commit/3ac27760417e51c051c5dd44155c3f42dd000e4f
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix
index 28047954304a1..c30cda1cd8393 100644
--- a/pkgs/applications/plasma-mobile/plasma-settings.nix
+++ b/pkgs/applications/plasma-mobile/plasma-settings.nix
@@ -53,6 +53,6 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/plasma-mobile/plasma-settings";
     # https://invent.kde.org/plasma-mobile/plasma-settings/-/commit/a59007f383308503e59498b3036e1483bca26e35
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
index 7ae6e7684acc8..8dce4192a08c1 100644
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -52,6 +52,6 @@ mkDerivation {
     mainProgram = "spacebar";
     homepage = "https://invent.kde.org/plasma-mobile/spacebar";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }

From 2fe23abdbc55d0297792b2dea03af56274e345dd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:43:11 -0400
Subject: [PATCH 03/21] maliit-*: Drop samueldr as maintainer

---
 pkgs/applications/misc/maliit-framework/default.nix | 2 +-
 pkgs/applications/misc/maliit-keyboard/default.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/maliit-framework/default.nix b/pkgs/applications/misc/maliit-framework/default.nix
index 2f30e805c5848..f730e9265d257 100644
--- a/pkgs/applications/misc/maliit-framework/default.nix
+++ b/pkgs/applications/misc/maliit-framework/default.nix
@@ -73,6 +73,6 @@ mkDerivation rec {
     mainProgram = "maliit-server";
     homepage = "http://maliit.github.io/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix
index 9613639b0f174..c315b5251cea0 100644
--- a/pkgs/applications/misc/maliit-keyboard/default.nix
+++ b/pkgs/applications/misc/maliit-keyboard/default.nix
@@ -69,6 +69,6 @@ mkDerivation rec {
     mainProgram = "maliit-keyboard";
     homepage = "http://maliit.github.io/";
     license = with licenses; [ lgpl3Only bsd3 cc-by-30 ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }

From e11fef0fd6bfa7c636d9ae6ccf49c4b66796ad7e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:44:26 -0400
Subject: [PATCH 04/21] fonts/vegur: Drop samueldr as maintainer

---
 pkgs/data/fonts/vegur/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix
index b161ad4e3e352..8c1f6c4bf980e 100644
--- a/pkgs/data/fonts/vegur/default.nix
+++ b/pkgs/data/fonts/vegur/default.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "http://dotcolon.net/font/vegur/";
     description = "Humanist sans serif font";
     platforms = platforms.all;
-    maintainers = with maintainers; [ minijackson samueldr ];
+    maintainers = with maintainers; [ minijackson ];
     license = licenses.cc0;
   };
 })

From 84dd915117ce2cb88eb2091666cf4d3727dd5cd6 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:44:40 -0400
Subject: [PATCH 05/21] kirigami-addons: Drop samueldr as maintainer

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

diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix
index 8cefa310b61ac..403267a4eb56e 100644
--- a/pkgs/development/libraries/kirigami-addons/default.nix
+++ b/pkgs/development/libraries/kirigami-addons/default.nix
@@ -38,7 +38,7 @@ mkDerivation rec {
     homepage = "https://invent.kde.org/libraries/kirigami-addons";
     # https://invent.kde.org/libraries/kirigami-addons/-/blob/b197d98fdd079b6fc651949bd198363872d1be23/src/treeview/treeviewplugin.cpp#L1-5
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ samueldr matthiasbeyer ];
+    maintainers = with maintainers; [ matthiasbeyer ];
   };
 }
 

From 4aa5e7ae897fc8cacefa5851f401c55acf3ce2b2 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:44:58 -0400
Subject: [PATCH 06/21] kweathercore: Drop samueldr as maintainer

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

diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix
index 943dee42c0e93..6c957b6fc9e5d 100644
--- a/pkgs/development/libraries/kweathercore/default.nix
+++ b/pkgs/development/libraries/kweathercore/default.nix
@@ -29,7 +29,7 @@ mkDerivation rec {
 
   meta = with lib; {
     license = [ licenses.cc0 ];
-    maintainers = [ maintainers.samueldr ];
+    maintainers = [ ];
     description = ''
       Library to facilitate retrieval of weather information including forecasts and alerts
     '';

From 08c444643e3a2703f7cd5002b6f246d672f9cab8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:45:07 -0400
Subject: [PATCH 07/21] libqofono: Drop samueldr as maintainer

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

diff --git a/pkgs/development/libraries/libqofono/default.nix b/pkgs/development/libraries/libqofono/default.nix
index 361421466e892..ff72711c8a75f 100644
--- a/pkgs/development/libraries/libqofono/default.nix
+++ b/pkgs/development/libraries/libqofono/default.nix
@@ -52,7 +52,7 @@ mkDerivation rec {
     description = "Library for accessing the ofono daemon, and declarative plugin for it";
     homepage = "https://git.sailfishos.org/mer-core/libqofono/";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }

From caf402f789c7e4c5677d297b67efc64f9636da2c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:45:18 -0400
Subject: [PATCH 08/21] uboot*: Drop samueldr as maintainer

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

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 837070e656147..95fadc40da5fd 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -133,7 +133,7 @@ let
       homepage = "https://www.denx.de/wiki/U-Boot/";
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
-      maintainers = with maintainers; [ bartsch dezgeg samueldr lopsided98 ];
+      maintainers = with maintainers; [ bartsch dezgeg lopsided98 ];
     } // extraMeta;
   } // removeAttrs args [ "extraMeta" "pythonScriptsToInstall" ]));
 in {

From c9d484b7b84d211e3d4222837c67cd5a3783c23f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:46:00 -0400
Subject: [PATCH 09/21] raspberrypi-armstubs: Drop samueldr as maintainer

---
 pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
index 72c6f6235548d..4ff7bf48b920c 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/raspberrypi/tools";
     license = licenses.bsd3;
     platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ samueldr ];
+    maintainers = with maintainers; [ ];
   };
 }

From 02c489f3801132b6d4b3cb025db15d6db6d642bd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:46:35 -0400
Subject: [PATCH 10/21] vboot_reference: Drop samueldr as maintainer

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

diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix
index 4718173e430d2..b5cd5cd19320a 100644
--- a/pkgs/tools/system/vboot_reference/default.nix
+++ b/pkgs/tools/system/vboot_reference/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     description = "Chrome OS partitioning and kernel signing tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ lheckemann samueldr ];
+    maintainers = with maintainers; [ lheckemann ];
   };
 }

From 59d3df35b84c05452248356f4616f1f76d97642e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:46:55 -0400
Subject: [PATCH 11/21] refind: Drop samueldr as maintainer

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

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 0a8af657ff440..9c4cda573e589 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
       Linux kernels that provide EFI stub support.
     '';
     homepage = "http://refind.sourceforge.net/";
-    maintainers = with maintainers; [ AndersonTorres samueldr chewblacka ];
+    maintainers = with maintainers; [ AndersonTorres chewblacka ];
     platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ];
     license = licenses.gpl3Plus;
   };

From dd669c422bc5a202d3d9731ef1ddaddb20e8b245 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:47:04 -0400
Subject: [PATCH 12/21] syslinux: Drop samueldr as maintainer

---
 pkgs/os-specific/linux/syslinux/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 6023c6e82ff8e..c1424d01f878d 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation {
     homepage = "https://www.syslinux.org/";
     description = "Lightweight bootloader";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.samueldr ];
+    maintainers = [ ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

From 14afd33f1caae829ffbc5183b36a3a88482dcc92 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:47:14 -0400
Subject: [PATCH 13/21] grub: Drop samueldr as maintainer

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

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index ce58f6ea0a18a..545ef57d4b081 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -201,6 +201,6 @@ stdenv.mkDerivation rec {
 
     platforms = if xenSupport then [ "x86_64-linux" "i686-linux" ] else platforms.gnu ++ platforms.linux;
 
-    maintainers = [ maintainers.samueldr ];
+    maintainers = [ ];
   };
 })

From c7882d9a4d34a594fd5c40cbb6f736e15f8564e3 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:50:36 -0400
Subject: [PATCH 14/21] hll2390dw-cups: Drop unmaintained package

---
 .../cups/drivers/hll2390dw-cups/default.nix   | 72 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 pkgs/misc/cups/drivers/hll2390dw-cups/default.nix

diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
deleted file mode 100644
index bd9974d5b6447..0000000000000
--- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ lib, stdenv, fetchurl, makeWrapper
-, cups
-, dpkg
-, a2ps, ghostscript, gnugrep, gnused, coreutils, file, perl, which
-}:
-
-stdenv.mkDerivation rec {
-  pname = "hll2390dw-cups";
-  version = "4.0.0-1";
-
-  src = fetchurl {
-    # The i386 part is a lie. There are x86, x86_64 and armv7l drivers.
-    # Though this builds only supports x86_64 for now.
-    url = "https://download.brother.com/welcome/dlf103579/hll2390dwpdrv-${version}.i386.deb";
-    sha256 = "0w8rxh1sa5amxr87qmzs4m2p06b1b36wn2q127mg427sbkh1rwni";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ cups ghostscript dpkg a2ps ];
-
-  dontUnpack = true;
-
-  installPhase = ''
-    dpkg-deb -x $src $out
-
-    substituteInPlace $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \
-      --replace /opt "$out/opt" \
-      --replace /usr/bin/perl ${perl}/bin/perl \
-      --replace "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out\"; #" \
-      --replace "PRINTER =~" "PRINTER = \"HLL2390DW\"; #"
-
-    # FIXME : Allow i686 and armv7l variations to be setup instead.
-    _PLAT=x86_64
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3
-    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3
-    ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/brprintconflsr3 $out/opt/brother/Printers/HLL2390DW/lpd/brprintconflsr3
-    ln -s $out/opt/brother/Printers/HLL2390DW/lpd/$_PLAT/rawtobr3 $out/opt/brother/Printers/HLL2390DW/lpd/rawtobr3
-
-    for f in \
-      $out/opt/brother/Printers/HLL2390DW/cupswrapper/lpdwrapper \
-      $out/opt/brother/Printers/HLL2390DW/cupswrapper/paperconfigml2 \
-    ; do
-      #substituteInPlace $f \
-      wrapProgram $f \
-        --prefix PATH : ${lib.makeBinPath [
-          coreutils ghostscript gnugrep gnused
-        ]}
-    done
-
-    mkdir -p $out/lib/cups/filter/
-    ln -s $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter $out/lib/cups/filter/brother_lpdwrapper_HLL2390DW
-
-    mkdir -p $out/share/cups/model
-    ln -s $out/opt/brother/Printers/HLL2390DW/cupswrapper/brother-HLL2390DW-cups-en.ppd $out/share/cups/model/
-
-    wrapProgram $out/opt/brother/Printers/HLL2390DW/lpd/lpdfilter \
-      --prefix PATH ":" ${ lib.makeBinPath [ ghostscript a2ps file gnused gnugrep coreutils which ] }
-    '';
-
-  meta = with lib; {
-    homepage = "http://www.brother.com/";
-    description = "Brother HL-L2390DW combined print driver";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-    downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128";
-    maintainers = [ maintainers.samueldr ];
-  };
-}
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 05fa4995abd1d..4361c58e44375 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -561,6 +561,7 @@ mapAliases ({
   hip-amd = throw "'hip-amd' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08
   hip-common = throw "'hip-common' has been replaced with 'rocmPackages.hip-common'"; # Added 2023-10-08
   hip-nvidia = throw "'hip-nvidia' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08
+  hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
   ht-rust = xh; # Added 2021-02-13
   hydra-unstable = hydra_unstable; # added 2022-05-10
   hyper-haskell = throw "'hyper-haskell' has been removed. reason: has been broken for a long time and depends on an insecure electron version"; # Added 2024-03-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 717b793fcc150..0902a31d97121 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39869,8 +39869,6 @@ with pkgs;
 
   canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { };
 
-  hll2390dw-cups = callPackage ../misc/cups/drivers/hll2390dw-cups { };
-
   mfc465cncupswrapper = callPackage ../misc/cups/drivers/brother/mfc465cncupswrapper { };
   mfc465cnlpr = callPackage ../misc/cups/drivers/brother/mfc465cnlpr { };
 

From b93fea815d2942822286cf28d21d2d05aac529df Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:52:38 -0400
Subject: [PATCH 15/21] input-utils: Drop unmaintained package

---
 .../os-specific/linux/input-utils/default.nix | 30 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 32 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/input-utils/default.nix

diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
deleted file mode 100644
index 36a203a47c76b..0000000000000
--- a/pkgs/os-specific/linux/input-utils/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, fetchurl, linuxHeaders }:
-
-stdenv.mkDerivation rec {
-  pname = "input-utils";
-  version = "1.3";
-
-  src = fetchurl {
-    url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz";
-    sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli";
-  };
-
-  prePatch = ''
-    # Use proper include path for kernel include files.
-    substituteInPlace ./name.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/"
-    substituteInPlace ./lirc.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/"
-  '';
-
-  makeFlags = [
-    "prefix=$(out)"
-    "STRIP="
-  ];
-
-  meta = with lib; {
-    description = "Input layer utilities, includes lsinput";
-    homepage    = "https://www.kraxel.org/blog/linux/input/";
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ samueldr ];
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4361c58e44375..4c9b67d31afc2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -580,6 +580,7 @@ mapAliases ({
   imlib = throw "imlib has been dropped due to the lack of maintenance from upstream since 2004"; # Added 2023-01-04
   indiepass-desktop = throw "indiepass-desktop has been dropped because it does not work with recent Electron versions"; # Added 2024-03-14
   indigenous-desktop = throw "'indigenous-desktop' has been renamed to/replaced by 'indiepass-desktop'"; # Added 2023-11-08
+  input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
   instead-launcher = throw "instead-launcher has been removed, because it depended on qt4"; # Added 2023-07-26
   insync-v3 = throw "insync-v3 has been merged into the insync package; use insync instead"; #Added 2023-05-13
   index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0902a31d97121..4f819c253c2a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9124,8 +9124,6 @@ with pkgs;
 
   input-remapper = python3Packages.callPackage ../tools/inputmethods/input-remapper { };
 
-  input-utils = callPackage ../os-specific/linux/input-utils { };
-
   inql = callPackage ../tools/security/inql { };
 
   intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };

From 1dacc56cb749b284b3d55b2400f965db2a628c4b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:52:05 -0400
Subject: [PATCH 16/21] mailman-rss: Drop unmaintained package

---
 pkgs/tools/misc/mailman-rss/default.nix | 26 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  2 --
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 pkgs/tools/misc/mailman-rss/default.nix

diff --git a/pkgs/tools/misc/mailman-rss/default.nix b/pkgs/tools/misc/mailman-rss/default.nix
deleted file mode 100644
index d71ee8795528c..0000000000000
--- a/pkgs/tools/misc/mailman-rss/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, python3Packages, fetchPypi, withTwitter ? false}:
-
-python3Packages.buildPythonApplication rec {
-  pname = "mailman-rss";
-  version = "0.2.4";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00";
-  };
-
-  propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ]
-    ++ lib.optional withTwitter python3Packages.twitter
-  ;
-
-  # No tests in Pypi Tarball
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Mailman archive -> rss converter";
-    homepage = "https://github.com/kyamagu/mailman-rss";
-    license = licenses.mit;
-    maintainers = with maintainers; [ samueldr ];
-    mainProgram = "mailman-rss";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4c9b67d31afc2..908fc5c467fc8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -820,6 +820,7 @@ mapAliases ({
   ### M ###
 
   MACS2 = macs2; # Added 2023-06-12
+  mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mariadb_104 = throw "mariadb_104 has been removed from nixpkgs, please switch to another version like mariadb_106"; # Added 2023-09-11
   mariadb_1010 = throw "mariadb_1010 has been removed from nixpkgs, please switch to another version like mariadb_1011"; # Added 2023-11-14
   mariadb-client = hiPrio mariadb.client; #added 2019.07.28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f819c253c2a0..4efa9bc53b0da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25790,8 +25790,6 @@ with pkgs;
   inherit (mailmanPackages) mailman mailman-hyperkitty;
   mailman-web = mailmanPackages.web;
 
-  mailman-rss = callPackage ../tools/misc/mailman-rss { };
-
   listadmin = callPackage ../applications/networking/listadmin { };
 
   maker-panel = callPackage ../tools/misc/maker-panel { };

From 7b201d94f40370de8df1e14d80fdd15d4bbf9b8b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:49:30 -0400
Subject: [PATCH 17/21] uefi-firmware-parser: Drop unmaintained package

---
 .../analysis/uefi-firmware-parser/default.nix | 31 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/development/tools/analysis/uefi-firmware-parser/default.nix

diff --git a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix b/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
deleted file mode 100644
index 9981ac8b0388f..0000000000000
--- a/pkgs/development/tools/analysis/uefi-firmware-parser/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, python3, fetchFromGitHub }:
-
-with python3.pkgs;
-
-buildPythonApplication rec {
-  pname = "uefi-firmware-parser";
-  version = "1.8";
-
-  # Version 1.8 is not published on pypi
-  src = fetchFromGitHub {
-    owner = "theopolis";
-    repo = "uefi-firmware-parser";
-    rev = "v${version}";
-    sha256 = "1yn9vi91j1yxkn0icdnjhgl0qrqqkzyhccj39af4f19q1gdw995l";
-  };
-
-  meta = with lib; {
-    homepage = "https://github.com/theopolis/uefi-firmware-parser/";
-    description = "Parse BIOS/Intel ME/UEFI firmware related structures: Volumes, FileSystems, Files, etc";
-    mainProgram = "uefi-firmware-parser";
-    # MIT + license headers in some files
-    license = with licenses; [
-      mit
-      zlib         # uefi_firmware/me.py
-      bsd2         # uefi_firmware/compression/Tiano/**/*
-      publicDomain # uefi_firmware/compression/LZMA/SDK/C/*
-    ];
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
-    maintainers = [ maintainers.samueldr ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 908fc5c467fc8..9beb1b24b4db8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1333,6 +1333,7 @@ mapAliases ({
   uberwriter = apostrophe; # Added 2020-04-23
   ubootBeagleboneBlack = ubootAmx335xEVM; # Added 2020-01-21
   ue4 = throw "ue4 has been removed, because the package was broken for years"; # Added 2023-11-22
+  uefi-firmware-parser = throw "The uefi-firmware-parser package was dropped since it was unmaintained."; # Added 2024-06-21
   uhd3_5 = throw "uhd3_5 has been removed, because it was no longer needed"; # Added 2023-10-07
   uhhyou.lv2 = throw "'uhhyou.lv2' has been removed, upstream gone"; # Added 2023-06-21
   unicorn-emu = unicorn; # Added 2020-10-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4efa9bc53b0da..75858ac505121 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19728,8 +19728,6 @@ with pkgs;
 
   udis86 = callPackage  ../development/tools/udis86 { };
 
-  uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { };
-
   uhd = callPackage ../applications/radio/uhd { };
   uhdMinimal = uhd.override {
     enableUtils = false;

From 329081dc4b72a2b177e034b67fd14484eddf150c Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 20:53:34 -0400
Subject: [PATCH 18/21] nix-top: Drop unmaintained package

---
 .../package-management/nix-top/default.nix    | 53 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix-top/default.nix

diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix
deleted file mode 100644
index d9dcc2d64ec68..0000000000000
--- a/pkgs/tools/package-management/nix-top/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, ruby
-, makeWrapper
-, getent               # /etc/passwd
-, ncurses              # tput
-, binutils-unwrapped   # strings
-, coreutils
-, findutils
-}:
-
-# No gems used, so mkDerivation is fine.
-let
-  additionalPath = lib.makeBinPath [ getent ncurses binutils-unwrapped coreutils findutils ];
-in
-stdenv.mkDerivation rec {
-  pname = "nix-top";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "samueldr";
-    repo = "nix-top";
-    rev = "v${version}";
-    sha256 = "sha256-w/TKzbZmMt4CX2KnLwPvR1ydp5NNlp9nNx78jJvhp54=";
-  };
-
-  nativeBuildInputs = [
-    makeWrapper
-  ];
-
-  buildInputs = [
-    ruby
-  ];
-
-  installPhase = ''
-    mkdir -p $out/libexec/nix-top
-    install -D -m755 ./nix-top $out/bin/nix-top
-    wrapProgram $out/bin/nix-top \
-      --prefix PATH : "$out/libexec/nix-top:${additionalPath}"
-  '' + lib.optionalString stdenv.isDarwin ''
-    ln -s /bin/stty $out/libexec/nix-top
-  '';
-
-  meta = with lib; {
-    description = "Tracks what nix is building";
-    homepage = "https://github.com/samueldr/nix-top";
-    license = licenses.mit;
-    maintainers = with maintainers; [ samueldr ];
-    platforms = platforms.linux ++ platforms.darwin ++ platforms.freebsd;
-    mainProgram = "nix-top";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9beb1b24b4db8..d7c46988e2b1e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -915,6 +915,7 @@ mapAliases ({
   );
   nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10
   nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20
+  nix-top = throw "The nix-top package was dropped since it was unmaintained."; # Added 2024-06-21
   nixFlakes = nixVersions.stable; # Added 2021-05-21
   nixStable = nixVersions.stable; # Added 2022-01-24
   nixUnstable = nixVersions.unstable; # Added 2022-01-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75858ac505121..13d4f72afeb66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39598,8 +39598,6 @@ with pkgs;
 
   nix-script = callPackage ../tools/nix/nix-script { };
 
-  nix-top = callPackage ../tools/package-management/nix-top { };
-
   nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree);
 
   nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { };

From 578d7e717848de3259baa52262a9267a9cdf6277 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 21:20:18 -0400
Subject: [PATCH 19/21] nix-universal-prefetch: Drop unmaintained package

---
 .../nix-universal-prefetch/default.nix        | 33 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix-universal-prefetch/default.nix

diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix
deleted file mode 100644
index be31ca34ad603..0000000000000
--- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, ruby
-}:
-
-# No gems used, so mkDerivation is fine.
-stdenv.mkDerivation rec {
-  pname = "nix-universal-prefetch";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "samueldr";
-    repo = "nix-universal-prefetch";
-    rev = "v${version}";
-    sha256 = "sha256-HGn4qHWqpUwlS3yQrD3j5oH0yOlphsoSPD2vkyyRv+0=";
-  };
-
-  installPhase = ''
-    mkdir -pv $out/bin
-    cp nix-universal-prefetch $out/bin/nix-universal-prefetch
-    substituteInPlace "$out/bin/nix-universal-prefetch" \
-      --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby"
-  '';
-
-  meta = with lib; {
-    description = "Uses nixpkgs fetchers to figure out hashes";
-    homepage = "https://github.com/samueldr/nix-universal-prefetch";
-    license = licenses.mit;
-    maintainers = with maintainers; [ samueldr ];
-    platforms = platforms.linux ++ platforms.darwin;
-    mainProgram = "nix-universal-prefetch";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d7c46988e2b1e..c96884e871cd6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -916,6 +916,7 @@ mapAliases ({
   nix-review = throw "'nix-review' has been renamed to/replaced by 'nixpkgs-review'"; # Converted to throw 2023-09-10
   nix-template-rpm = throw "'nix-template-rpm' has been removed as it is broken and unmaintained"; # Added 2023-11-20
   nix-top = throw "The nix-top package was dropped since it was unmaintained."; # Added 2024-06-21
+  nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21
   nixFlakes = nixVersions.stable; # Added 2021-05-21
   nixStable = nixVersions.stable; # Added 2022-01-24
   nixUnstable = nixVersions.unstable; # Added 2022-01-26
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13d4f72afeb66..07deca54bb5b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39600,8 +39600,6 @@ with pkgs;
 
   nix-tree = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-tree);
 
-  nix-universal-prefetch = callPackage ../tools/package-management/nix-universal-prefetch { };
-
   nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
 
   nix-serve = callPackage ../tools/package-management/nix-serve { };

From 52b2c5e07efb1a069b72266b8457e77c988bcd0a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 21:20:29 -0400
Subject: [PATCH 20/21] maintainers: Drop "mobile" team

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

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 26ed7fd6ef510..51b5f575487ac 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -677,12 +677,6 @@ with lib.maintainers;
     shortName = "Mercury Employees";
   };
 
-  mobile = {
-    members = [ samueldr ];
-    scope = "Maintain Mobile NixOS.";
-    shortName = "Mobile";
-  };
-
   nix = {
     members = [
       eelco

From 8477d0c463f7aa76b8421501a8cda4e76995b797 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 20 Jun 2024 21:20:42 -0400
Subject: [PATCH 21/21] maintainers: Drop samueldr
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I waited a long time, to wait and see how things would pan out.

It turns out obvious problems can't be dealt with, in an appropriate
timing and manner.

Thanks to one individual, backed by a possee of previously banned
individuals, and additional perma-banned individuals did it.

Thanks to all of you, I am quitting NixOS.

The continuous concern trolling, the continuous bigotted discussions,
the continued hostile tone, the actions made despite the numerous times
you were told to do better. The constant FUD. The constant waste of
time. It's not a single event. It is a pattern.

I do not think that this situation can be salvaged anymore.

Systemic issue in the lack of governance enabled this. While some will
put the fault entirely on the shoulders of the organization, I will say
that they share the blame, but the bullying and pressure from the
individuals ***who fully understand what they are doing*** is what did
it.

Couple that with the structural inability for action by the moderation
team being abused by those bad actors, and you have a recipe for
alienating and burning-out the leftover important contributors.

Let it be written here that I have discussed with organization members
and moderation team members about the continued behaviour of casting FUD
on the community by this individual. This was done this individual's ban.
It happened in what was (and still) tacitly agreed toe be a NixOS
community place, the subreddit. Probably elsewhere too.

Nothing was done, no mention of re-considering the duration of the ban,
and as far as I know, not even some discussion about how continuing the
behaviour that was the reason for being banned is unwelcome.

His name is jonringer (Jonathan Ringer).

What made me snap?

Not long after the ban being lifted, this individual continued with
weird persecution plots and conspiracy theories casting doubts on the
legitimacy of the moderation team's actions.
 - https://github.com/NixOS/rfcs/pull/175
And in the least self-aware way possible, continued this discourse of
persecution and conspiracies, again casting FUD and divisiveness when
asking for what, with a reasonable person, would have a formality.
See the original comment contents.
 - https://github.com/NixOS/nixpkgs/issues/50105#issuecomment-2179462978
This continued into the same behaviour that brought up the initial
warnings and ban, on the unmoderated community-adjacent subreddit.
 - https://old.reddit.com/r/NixOS/comments/1djuxpx/drama_will_jonringers_commit_bit_be_restored/ https://archive.is/sCJJw
This continued onto the discourse into the same behaviour that
brought up the initial warnings and ban.
 - https://discourse.nixos.org/t/should-jonringer-get-his-commit-bit-back/47267/46

The absolute insolence, consistently twisting the words I wrote to fit
in his imagined narrative, took me over the edge. Then the moderator
decision to *increase the time-out delay* to twelve hours, which at
one hour was already causing the bad behaviour of mass-dumping
information into single messages, meant there was no way for me to
correct the facts and act in this manner without relitigating
elsewhere gave me the time and energy to do it.

That's it.

The behaviour of this person. No political beliefs (I still don't know
what they are). No employer (while I know and hate it, it is what it is).
No plot form some shadow bagel trying to somehow do... Only jon knows
what it would do... No take-over plot... Only the unacceptable
behaviour, or character if you will, of that person.

Someone who from the start always had an equal opportunity to participate,
regardless of his attributes. This person should have been accountable for
his actions, but couldn't understand it.

This was not helped by their posse harrassing me personally, on top of
all that.

In other words, the organization and community is not tooled to protect
its valued members.

***So I am quitting with prejudice.***

Even though I helped build the NixOS project for over seven years,
helped the community be the best it could in the IRC times, helped
direct some of the community decisions.

I did not want to leave this community, because this is not only my
home, but I built it with collaborators who cared. It seems like
there is no one who cares left anymore. And I was pushed out against
my best efforts.

Mostly thankless to the end.

— samueldr

Signed-off-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
---
 maintainers/maintainer-list.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe7db05e098bc..df3dd0297f3af 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17658,13 +17658,6 @@
     githubId = 226872;
     name = "Samuel Ainsworth";
   };
-  samueldr = {
-    email = "samuel@dionne-riel.com";
-    matrix = "@samueldr:matrix.org";
-    github = "samueldr";
-    githubId = 132835;
-    name = "Samuel Dionne-Riel";
-  };
   samuelefacenda = {
     name = "Samuele Facenda";
     email = "samuele.facenda@gmail.com";