summary refs log tree commit diff
diff options
context:
space:
mode:
authorRick van Schijndel <Mindavi@users.noreply.github.com>2022-04-24 22:18:43 +0200
committerGitHub <noreply@github.com>2022-04-24 22:18:43 +0200
commit87d34a6b8982e901b8e50096b8e79ebc0e66cda0 (patch)
treeb74f9acca48e55f8ec0d85eba0d8ace572af02c2
parent37c2ce7957f0025d5827abbfb31e5e2ebbc018fe (diff)
parent9e26e53a66fab70e94e0b3bb8b2353569dd13dca (diff)
downloadnixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar
nixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar.gz
nixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar.bz2
nixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar.lz
nixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar.xz
nixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.tar.zst
nixpkgs-87d34a6b8982e901b8e50096b8e79ebc0e66cda0.zip
Merge pull request #169856 from samuelgrf/remove-samuelgrf-from-maintainers
treewide: remove samuelgrf from maintainers
-rw-r--r--maintainers/maintainer-list.nix16
-rw-r--r--pkgs/applications/graphics/gimp/plugins/default.nix2
-rw-r--r--pkgs/applications/graphics/skanpage/default.nix2
-rw-r--r--pkgs/applications/misc/kjv/default.nix4
-rw-r--r--pkgs/data/fonts/times-newer-roman/default.nix2
-rw-r--r--pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix2
-rw-r--r--pkgs/tools/archivers/quickbms/default.nix2
-rw-r--r--pkgs/tools/wayland/wl-clipboard-x11/default.nix2
8 files changed, 8 insertions, 24 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b20b473dc67..715244aab68 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11074,22 +11074,6 @@
     githubId = 132835;
     name = "Samuel Dionne-Riel";
   };
-  samuelgrf = {
-    email = "s@muel.gr";
-    github = "samuelgrf";
-    githubId = 67663538;
-    name = "Samuel Gräfenstein";
-    keys = [
-      {
-        longkeyid = "rsa4096/0xDE75F92E318123F0";
-        fingerprint = "6F2E 2A90 423C 8111 BFF2  895E DE75 F92E 3181 23F0";
-      }
-      {
-        longkeyid = "rsa4096/0xEF76A063F15C63C8";
-        fingerprint = "FF24 5832 8FAF 4660 18C6  186E EF76 A063 F15C 63C8";
-      }
-    ];
-  };
   samuelrivas = {
     email = "samuelrivas@gmail.com";
     github = "samuelrivas";
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 6f4fdd68909..79760bb31a6 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -101,7 +101,7 @@ in
       description = "Batch Image Manipulation Plugin for GIMP";
       homepage = "https://github.com/alessandrofrancesconi/gimp-plugin-bimp";
       license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ samuelgrf ];
+      maintainers = with maintainers; [ ];
     };
   };
 
diff --git a/pkgs/applications/graphics/skanpage/default.nix b/pkgs/applications/graphics/skanpage/default.nix
index 17a22880897..bee04cbad52 100644
--- a/pkgs/applications/graphics/skanpage/default.nix
+++ b/pkgs/applications/graphics/skanpage/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     description = "KDE utility to scan images and multi-page documents";
     homepage = "https://apps.kde.org/skanpage";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samuelgrf ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix
index 08a1b5a71af..ee599fd3b6c 100644
--- a/pkgs/applications/misc/kjv/default.nix
+++ b/pkgs/applications/misc/kjv/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, readline }:
 
 let
-  patchPrefix = "https://github.com/samuelgrf/kjv/commit/";
+  patchPrefix = "https://web.archive.org/web/20220422205751/https://github.com/samuelgrf/kjv/commit/";
 
   add-apocrypha = fetchpatch {
     url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch";
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
     description = "The Bible, King James Version";
     homepage = "https://github.com/bontibon/kjv";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ jtobin samuelgrf ];
+    maintainers = with maintainers; [ jtobin ];
     mainProgram = "kjv";
   };
 }
diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/data/fonts/times-newer-roman/default.nix
index 6122883c615..4bfe358d13e 100644
--- a/pkgs/data/fonts/times-newer-roman/default.nix
+++ b/pkgs/data/fonts/times-newer-roman/default.nix
@@ -19,7 +19,7 @@ fetchzip {
     description = "A font that looks just like Times New Roman, except each character is 5-10% wider";
     homepage = "https://timesnewerroman.com/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samuelgrf ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
index cea788f2640..043f52c37ef 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
@@ -32,7 +32,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "KWin script that automatically adds/removes virtual desktops";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ samuelgrf ];
+    maintainers = with maintainers; [ ];
     inherit (src.meta) homepage;
     inherit (kwindowsystem.meta) platforms;
   };
diff --git a/pkgs/tools/archivers/quickbms/default.nix b/pkgs/tools/archivers/quickbms/default.nix
index 7846f18a174..d2f39ac2cf1 100644
--- a/pkgs/tools/archivers/quickbms/default.nix
+++ b/pkgs/tools/archivers/quickbms/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "Universal script based file extractor and reimporter";
     homepage = "https://aluigi.altervista.org/quickbms.htm";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ samuelgrf ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/wayland/wl-clipboard-x11/default.nix b/pkgs/tools/wayland/wl-clipboard-x11/default.nix
index 5e87342dff8..b5d15b4a978 100644
--- a/pkgs/tools/wayland/wl-clipboard-x11/default.nix
+++ b/pkgs/tools/wayland/wl-clipboard-x11/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "A wrapper to use wl-clipboard as a drop-in replacement for X11 clipboard tools";
     homepage = "https://github.com/brunelli/wl-clipboard-x11";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ samuelgrf ];
+    maintainers = with maintainers; [ artturin ];
     mainProgram = "xclip";
   };
 }