Merge #24236: remove bbenoist from maintainers

vcunat · vcunat · commit ec281ca1bc04 · 2017-03-23T08:54:42.000+01:00
(cherry picked from commit e0bf35f)
diff --git a/.mention-bot b/.mention-bot
@@ -2,7 +2,8 @@
   "userBlacklist": [
     "civodul",
     "jhasse",
-    "shlevy"
+    "shlevy",
+    "bbenoist"
   ],
   "alwaysNotifyForPaths": [
     { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
@@ -59,7 +59,6 @@
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
-  bbenoist = "Baptist BENOIST <return_0@live.com>";
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
   bcdarwin = "Ben Darwin <bcdarwin@gmail.com>";
   bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>";
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://www.geany.org/";
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://sourceforge.net/projects/gmrun/";
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://sourceforge.net/projects/xfe/";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = "http://fox-toolkit.org";
     license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = "http://fox-toolkit.org";
     license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -280,7 +280,7 @@ stdenv.mkDerivation {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -294,7 +294,7 @@ stdenv.mkDerivation {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -239,7 +239,7 @@ stdenv.mkDerivation {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     description = "Open source libraries for 3D computer graphics, image processing and visualization";
     homepage = http://www.vtk.org/;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ viric bbenoist ];
+    maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
     license = "LGPL";
-    maintainers = [ maintainers.akaWolf maintainers.bbenoist ];
+    maintainers = [ maintainers.akaWolf ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://www.nongnu.org/numdiff/;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = with stdenv.lib.maintainers; [ ndowens ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {`
`49`	`49`	`'';`
`50`	`50`	`homepage = "http://www.geany.org/";`
`51`	`51`	`license = "GPL";`
`52`		`- maintainers = [ stdenv.lib.maintainers.bbenoist ];`
	`52`	`+ maintainers = [];`
`53`	`53`	`platforms = stdenv.lib.platforms.all;`
`54`	`54`	`};`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {`
`33`	`33`	`'';`
`34`	`34`	`homepage = "http://sourceforge.net/projects/gmrun/";`
`35`	`35`	`license = "GPL";`
`36`		`- maintainers = [ stdenv.lib.maintainers.bbenoist ];`
	`36`	`+ maintainers = [];`
`37`	`37`	`platforms = stdenv.lib.platforms.all;`
`38`	`38`	`};`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {`
`25`	`25`	`'';`
`26`	`26`	`homepage = "http://sourceforge.net/projects/xfe/";`
`27`	`27`	`license = stdenv.lib.licenses.gpl2;`
`28`		`- maintainers = [ stdenv.lib.maintainers.bbenoist ];`
	`28`	`+ maintainers = [];`
`29`	`29`	`platforms = stdenv.lib.platforms.linux;`
`30`	`30`	`};`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {`
`32`	`32`	`'';`
`33`	`33`	`homepage = "http://fox-toolkit.org";`
`34`	`34`	`license = stdenv.lib.licenses.lgpl3;`
`35`		`- maintainers = [ stdenv.lib.maintainers.bbenoist ];`
	`35`	`+ maintainers = [];`
`36`	`36`	`platforms = stdenv.lib.platforms.all;`
`37`	`37`	`};`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ stdenv.mkDerivation {`
`294`	`294`	`homepage = http://www.qt.io;`
`295`	`295`	`description = "A cross-platform application framework for C++";`
`296`	`296`	`license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];`
`297`		`- maintainers = with maintainers; [ bbenoist qknight ttuegel ];`
	`297`	`+ maintainers = with maintainers; [ qknight ttuegel ];`
`298`	`298`	`platforms = platforms.unix;`
`299`	`299`	`};`
`300`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {`
`57`	`57`	`description = "Open source libraries for 3D computer graphics, image processing and visualization";`
`58`	`58`	`homepage = http://www.vtk.org/;`
`59`	`59`	`license = stdenv.lib.licenses.bsd3;`
`60`		`- maintainers = with stdenv.lib.maintainers; [ viric bbenoist ];`
	`60`	`+ maintainers = with stdenv.lib.maintainers; [ viric ];`
`61`	`61`	`platforms = with stdenv.lib.platforms; unix;`
`62`	`62`	`};`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {`
`60`	`60`	`'';`
`61`	`61`	`homepage = "https://wiki.qt.io/Category:Tools::QtCreator";`
`62`	`62`	`license = "LGPL";`
`63`		`- maintainers = [ maintainers.akaWolf maintainers.bbenoist ];`
	`63`	`+ maintainers = [ maintainers.akaWolf ];`
`64`	`64`	`platforms = platforms.all;`
`65`	`65`	`};`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ stdenv.mkDerivation {`
`17`	`17`	`'';`
`18`	`18`	`homepage = http://www.nongnu.org/numdiff/;`
`19`	`19`	`license = stdenv.lib.licenses.gpl3Plus;`
`20`		`- maintainers = [ stdenv.lib.maintainers.bbenoist ];`
	`20`	`+ maintainers = with stdenv.lib.maintainers; [ ndowens ];`
`21`	`21`	`platforms = stdenv.lib.platforms.gnu;`
`22`	`22`	`};`
`23`	`23`	`}`