Merge pull request #197322 from atorres1985-contrib/cleanup-maintainers

Cleanup maintainers

maintainers/maintainer-list.nix

@@ -13730,12 +13730,6 @@
     githubId = 2164118;
     name = "Tobias Bora";
   };
-  tohl = {
-    email = "tom@logand.com";
-    github = "tohl";
-    githubId = 12159013;
-    name = "Tomas Hlavaty";
-  };
   tokudan = {
     email = "git@danielfrank.net";
     github = "tokudan";

pkgs/development/compilers/ccl/default.nix

@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Clozure Common Lisp";
     homepage    = "https://ccl.clozure.com/";
-    maintainers = with maintainers; [ raskin tohl ];
+    maintainers = with maintainers; [ raskin ];
     platforms   = attrNames options;
     # assembler failures during build, x86_64-darwin broken since 2020-10-14
     broken      = (stdenv.isDarwin && stdenv.isx86_64);

pkgs/development/compilers/cmucl/binary.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation {
     '';
     license = lib.licenses.free;		# public domain
     homepage = "http://www.cons.org/cmucl/";
-    maintainers = [lib.maintainers.tohl];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }

pkgs/development/compilers/mkcl/default.nix

@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     homepage = "https://common-lisp.net/project/mkcl/";
     license = licenses.lgpl2Plus;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ tohl ];
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/compilers/sbcl/bootstrap.nix

@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     description = "Lisp compiler";
     homepage = "http://www.sbcl.org";
     license = licenses.publicDomain; # and FreeBSD
-    maintainers = [maintainers.raskin maintainers.tohl];
+    maintainers = [ maintainers.raskin ];
     platforms = attrNames options;
   };
 }

pkgs/development/interpreters/clisp/default.nix

@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.cons.org";
-    maintainers = with lib.maintainers; [raskin tohl];
+    maintainers = with lib.maintainers; [ raskin ];
     platforms = lib.platforms.unix;
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
     broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;

pkgs/development/interpreters/clisp/hg.nix

@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = "http://clisp.cons.org";
-    maintainers = with lib.maintainers; [raskin tohl];
+    maintainers = with lib.maintainers; [ raskin ];
     # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062
     platforms = lib.platforms.linux;
   };

pkgs/development/interpreters/gtk-server/default.nix

@@ -1,4 +1,6 @@
-{ lib, stdenv, fetchurl
+{ lib
+, stdenv
+, fetchurl
 , glib
 , gtk3
 , libffcall
@@ -25,10 +27,10 @@ stdenv.mkDerivation rec {
   configureOptions = [ "--with-gtk3" ];
 
   meta = with lib; {
-    description = "gtk-server for interpreted GUI programming";
     homepage = "http://www.gtk-server.org/";
+    description = "gtk-server for interpreted GUI programming";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.tohl ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }

pkgs/development/interpreters/picolisp/default.nix

@@ -55,8 +55,8 @@ stdenv.mkDerivation rec {
     description = "A simple Lisp with an integrated database";
     homepage = "https://picolisp.com/";
     license = licenses.mit;
+    maintainers = with maintainers; [ raskin ];
     platforms = platforms.all;
-    maintainers = with maintainers; [ raskin tohl ];
   };
 
   passthru = {

pkgs/development/libraries/libpst/default.nix

@@ -2,29 +2,29 @@
 , stdenv
 , fetchurl
 , autoreconfHook
-, pkg-config
 , bzip2
 , doxygen
 , gettext
 , imagemagick
 , libgsf
+, pkg-config
 , xmlto
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libpst";
   version = "0.6.76";
 
   src = fetchurl {
-    url = "http://www.five-ten-sg.com/libpst/packages/${pname}-${version}.tar.gz";
-    sha256 = "0hhbbb8ddsgjhv9y1xd8s9ixlhdnjmhw12v06jwx4j6vpgp1na9x";
+    url = "http://www.five-ten-sg.com/libpst/packages/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-PSkb7rvbSNK5NGCLwGGVtkHaY9Ko9eDThvLp1tBaC0I=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
-    pkg-config
     doxygen
     gettext
+    pkg-config
     xmlto
   ];
 
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--enable-python=no"
     "--disable-static"
     "--enable-libpst-shared"
+    "--enable-python=no"
   ];
 
   doCheck = true;
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.five-ten-sg.com/libpst/";
     description = "A library to read PST (MS Outlook Personal Folders) files";
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.tohl ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
-}
+})

pkgs/development/libraries/mlt/default.nix

@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     description = "Open source multimedia framework, designed for television broadcasting";
     homepage = "https://www.mltframework.org";
     license = with licenses; [ gpl3Only gpl2Only lgpl21Only ];
-    maintainers = with maintainers; [ tohl peti ];
+    maintainers = with maintainers; [ peti ];
     platforms = platforms.linux;
   };
 }

pkgs/misc/cups/drivers/samsung/1.00.36/default.nix

@@ -112,6 +112,6 @@ in stdenv.mkDerivation rec {
     # Tested on linux-x86_64. Might work on linux-i386.
     # Probably won't work on anything else.
     platforms = platforms.linux;
-    maintainers = with maintainers; [ tohl ];
+    maintainers = with maintainers; [ ];
   };
 }