Bring my stdenv.lib.maintainers user name in line with my github nick.

lib/maintainers.nix

@@ -334,7 +334,7 @@
   sheganinans = "Aistis Raulinaitis <sheganinans@gmail.com>";
   shell = "Shell Turner <cam.turn@gmail.com>";
   shlevy = "Shea Levy <shea@shealevy.com>";
-  simons = "Peter Simons <simons@cryp.to>";
+  peti = "Peter Simons <simons@cryp.to>";
   simonvandel = "Simon Vandel Sillesen <simon.vandel@gmail.com>";
   sjagoe = "Simon Jagoe <simon@simonjagoe.com>";
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";

pkgs/applications/audio/audacious/default.nix

@@ -60,7 +60,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Audio player";
     homepage = http://audacious-media-player.org/;
-    maintainers = with stdenv.lib.maintainers; [ eelco simons ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/editors/emacs-24/default.nix

@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     description = "GNU Emacs 24, the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
+    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
 
     longDescription = ''

pkgs/applications/editors/emacs-25/default.nix

@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     description = "GNU Emacs 25 (pre), the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
+    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
     platforms   = platforms.all;
 
     longDescription = ''

pkgs/applications/editors/emacs-modes/haskell/default.nix

@@ -34,6 +34,6 @@ stdenv.mkDerivation {
     description = "Haskell mode for Emacs";
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/editors/emacs-modes/icicles/default.nix

@@ -36,7 +36,5 @@ stdenv.mkDerivation {
     homepage = "http://www.emacswiki.org/emacs/Icicles";
     description = "Enhance Emacs minibuffer input with cycling and powerful completion";
     license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ simons ];
   };
 }

pkgs/applications/editors/emacs-modes/let-alist/default.nix

@@ -22,6 +22,5 @@ stdenv.mkDerivation rec {
     homepage = "http://elpa.gnu.org/packages/let-alist.html";
     description = "Easily let-bind values of an assoc-list by their names";
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ simons ];
   };
 }

pkgs/applications/editors/emacs-modes/maude/default.nix

@@ -15,6 +15,6 @@ stdenv.mkDerivation {
     description = "Emacs mode for the programming language Maude";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/graphics/gocr/default.nix

@@ -16,8 +16,6 @@ stdenv.mkDerivation rec {
     homepage = "http://jocr.sourceforge.net/";
     description = "GPL Optical Character Recognition";
     license = stdenv.lib.licenses.gpl2;
-
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/graphics/sane/backends/generic.nix

@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     homepage = "http://www.sane-project.org/";
     license = licenses.gpl2Plus;
 
-    maintainers = with maintainers; [ nckx simons ];
+    maintainers = with maintainers; [ nckx peti ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/graphics/sane/frontends.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Scanner Access Now Easy";
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/graphics/sane/xsane.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.sane-project.org/;
     description = "Graphical scanning frontend for sane";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric simons];
+    maintainers = with stdenv.lib.maintainers; [viric peti];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/misc/fetchmail/default.nix

@@ -28,6 +28,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/misc/grip/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "http://nostatic.org/grip";
     license = stdenv.lib.licenses.gpl2;
 
-    maintainers = [ stdenv.lib.maintainers.marcweber stdenv.lib.maintainers.simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber peti ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/misc/ikiwiki/default.nix

@@ -86,6 +86,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/misc/jbidwatcher/default.nix

@@ -45,6 +45,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/misc/xpdf/default.nix

@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     description = "viewer for Portable Document Format (PDF) files";
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/networking/cluster/hadoop/default.nix

@@ -46,6 +46,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/networking/esniper/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Simple, lightweight tool for sniping eBay auctions";
     homepage    = http://esniper.sourceforge.net;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ lovek323 simons ];
+    maintainers = with maintainers; [ lovek323 peti ];
     platforms   = platforms.all;
   };
 }

pkgs/applications/networking/sniffers/wireshark/default.nix

@@ -69,6 +69,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ simons bjornfor fpletz ];
+    maintainers = with stdenv.lib.maintainers; [ bjornfor fpletz ];
   };
 }

pkgs/applications/networking/sync/rsync/default.nix

@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = base.meta // {
     description = "A fast incremental file transfer utility";
-    maintainers = with stdenv.lib.maintainers; [ simons ehmry kampfschlaefer ];
+    maintainers = with stdenv.lib.maintainers; [ peti ehmry kampfschlaefer ];
   };
 }

pkgs/applications/office/antiword/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Convert MS Word documents to plain text or PostScript";
     license = stdenv.lib.licenses.gpl2;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/office/gnucash/2.6.nix

@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnucash.org/;
 
-    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/office/gnucash/default.nix

@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnucash.org/;
 
-    maintainers = [ stdenv.lib.maintainers.simons stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.iElectric ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/applications/office/ledger/2.6.3.nix

@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/office/ledger/default.nix

@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny jwiegley ];
+    maintainers = with stdenv.lib.maintainers; [ peti the-kenny jwiegley ];
   };
 }

pkgs/applications/science/astronomy/celestia/default.nix

@@ -72,6 +72,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/astronomy/gravit/default.nix

@@ -28,6 +28,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/science/astronomy/stellarium/default.nix

@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
 
     platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/electronics/tkgate/1.x.nix

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
     homepage = "http://www.tkgate.org/";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     hydraPlatforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/science/math/R/default.nix

@@ -102,6 +102,6 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
     hydraPlatforms = stdenv.lib.platforms.linux;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/math/eukleides/default.nix

@@ -32,6 +32,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/math/maxima/default.nix

@@ -49,6 +49,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/science/math/pssp/default.nix

@@ -35,6 +35,5 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/science/math/wxmaxima/default.nix

@@ -30,6 +30,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl2;
     homepage = http://wxmaxima.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/applications/version-management/cvs/default.nix

@@ -23,8 +23,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://cvs.nongnu.org";
     description = "Concurrent Versions System - a source control system";
-
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -165,6 +165,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny wmertens ];
+    maintainers = with stdenv.lib.maintainers; [ peti the-kenny wmertens ];
   };
 }

pkgs/applications/version-management/git-and-tools/stgit/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     description = "A patch manager implemented on top of Git";
     license = "GPL";
 
-    maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/applications/version-management/git-and-tools/topgit/default.nix

@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "TopGit manages large amount of interdependent topic branches";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ marcweber simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber ];
   };
 }

pkgs/applications/version-management/rcs/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       '';
 
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ eelco simons ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ];
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/compilers/aldor/default.nix

@@ -45,7 +45,6 @@ stdenv.mkDerivation {
       and powerful properties of functional, object-oriented and aspect-oriented styles.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/compilers/gcc/4.8/default.nix

@@ -515,7 +515,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).

pkgs/development/compilers/gcc/4.9/default.nix

@@ -522,7 +522,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).

pkgs/development/compilers/gcc/5/default.nix

@@ -515,7 +515,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).

pkgs/development/compilers/gcc/6/default.nix

@@ -515,7 +515,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ viric simons ];
+    maintainers = with stdenv.lib.maintainers; [ viric peti ];
 
     # gnatboot is not available out of linux platforms, so we disable the darwin build
     # for the gnat (ada compiler).

pkgs/development/compilers/ghc/6.12.3.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;
     broken = true; # broken by gcc 5.x: http://hydra.nixos.org/build/33627548

pkgs/development/compilers/ghc/7.0.4.nix

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.simons
+      stdenv.lib.maintainers.peti
     ];
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is not supported.
     inherit (ghc.meta) license;

pkgs/development/compilers/ghc/7.10.2.nix

@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 

pkgs/development/compilers/ghc/7.10.3.nix

@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 

pkgs/development/compilers/ghc/7.2.2.nix

@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.simons
+      stdenv.lib.maintainers.peti
     ];
     platforms = ["x86_64-linux" "i686-linux"];  # Darwin is unsupported.
     inherit (ghc.meta) license;

pkgs/development/compilers/ghc/7.4.2.nix

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.simons
+      stdenv.lib.maintainers.peti
     ];
     inherit (ghc.meta) license platforms;
   };

pkgs/development/compilers/ghc/7.6.3.nix

@@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.andres
-      stdenv.lib.maintainers.simons
+      stdenv.lib.maintainers.peti
     ];
     inherit (ghc.meta) license platforms;
   };

pkgs/development/compilers/ghc/7.8.3.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 

pkgs/development/compilers/ghc/7.8.4.nix

@@ -41,7 +41,7 @@ stdenv.mkDerivation (rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 

pkgs/development/compilers/ghc/8.0.1.nix

@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 

pkgs/development/compilers/ghc/head.nix

@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ];
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
 

pkgs/development/compilers/gprolog/default.nix

@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
       declarativity of logic programming.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.gnu;
   };
 }

pkgs/development/compilers/jhc/default.nix

@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers;
-      [ aforemny simons thoughtpolice ];
+      [ aforemny peti thoughtpolice ];
   };
 }

pkgs/development/compilers/swi-prolog/default.nix

@@ -27,6 +27,6 @@ stdenv.mkDerivation {
     license = "LGPL";
 
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/development/compilers/yap/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     description = "A ISO-compatible high-performance Prolog compiler";
     license = stdenv.lib.licenses.artistic2;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
     platforms = stdenv.lib.platforms.linux;
     broken = !stdenv.is64bit;   # the linux 32 bit build fails.
   };

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -59,7 +59,7 @@ extra-packages:
   - zlib < 0.6                          # newer versions break cabal-install
 
 package-maintainers:
-  simons:
+  peti:
     - cabal2nix
     - cabal-install
     - funcmp

pkgs/development/haskell-modules/hackage-packages.nix

@@ -47035,7 +47035,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_18_0_6" = callPackage
@@ -47071,7 +47071,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_18_0_7" = callPackage
@@ -47109,7 +47109,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_18_0_8" = callPackage
@@ -47147,7 +47147,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_18_1_0" = callPackage
@@ -47185,7 +47185,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_22_6_0" = callPackage
@@ -47221,7 +47221,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_22_7_0" = callPackage
@@ -47258,7 +47258,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_22_8_0" = callPackage
@@ -47293,7 +47293,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install" = callPackage
@@ -47327,7 +47327,7 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install_1_24_0_0" = callPackage
@@ -47367,7 +47367,7 @@ self: {
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal-install-bundle" = callPackage
@@ -48117,7 +48117,7 @@ self: {
        homepage = "http://github.com/NixOS/cabal2nix";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "cabal2spec" = callPackage
@@ -87198,7 +87198,7 @@ self: {
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "funcons-tools" = callPackage
@@ -91278,7 +91278,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
        platforms = [ "i686-linux" "x86_64-linux" ];
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -91345,7 +91345,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
        platforms = [ "i686-linux" "x86_64-linux" ];
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -91412,7 +91412,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
        platforms = [ "i686-linux" "x86_64-linux" ];
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -91479,7 +91479,7 @@ self: {
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
@@ -99181,7 +99181,7 @@ self: {
        homepage = "http://github.com/peti/hackage-db";
        description = "access Hackage's package database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hackage-diff" = callPackage
@@ -112629,7 +112629,7 @@ self: {
        homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hledger-irr" = callPackage
@@ -115725,7 +115725,7 @@ self: {
        homepage = "http://github.com/peti/hopenssl";
        description = "FFI bindings to OpenSSL's EVP digest interface";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) openssl;};
 
   "hopfield" = callPackage
@@ -118663,7 +118663,7 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
   "hsdns-cache" = callPackage
@@ -118758,7 +118758,7 @@ self: {
        homepage = "http://github.com/peti/hsemail";
        description = "Internet Message Parsers";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hsemail-ns" = callPackage
@@ -121830,7 +121830,7 @@ self: {
        homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "hszephyr" = callPackage
@@ -132421,7 +132421,7 @@ self: {
        homepage = "http://github.com/peti/jailbreak-cabal";
        description = "Strip version restrictions from build dependencies in Cabal files";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "jalaali" = callPackage
@@ -138598,7 +138598,7 @@ self: {
        homepage = "https://github.com/peti/language-nix#readme";
        description = "Data types and useful functions to represent and manipulate the Nix language";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "language-objc" = callPackage
@@ -203311,7 +203311,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_3_1" = callPackage
@@ -203380,7 +203380,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_4_1" = callPackage
@@ -203450,7 +203450,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_5_0" = callPackage
@@ -203520,7 +203520,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_6_0" = callPackage
@@ -203590,7 +203590,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_8_0" = callPackage
@@ -203660,7 +203660,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_10_0" = callPackage
@@ -203731,7 +203731,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_0_1_10_1" = callPackage
@@ -203802,7 +203802,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_1_0_0" = callPackage
@@ -203874,7 +203874,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack_1_0_2" = callPackage
@@ -203946,7 +203946,7 @@ self: {
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack" = callPackage
@@ -204013,7 +204013,7 @@ self: {
        homepage = "http://haskellstack.org";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "stack-hpc-coveralls" = callPackage
@@ -207109,7 +207109,7 @@ self: {
        homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
+       maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
   "streams_3_2" = callPackage

pkgs/development/interpreters/erlang/R16.nix

@@ -68,8 +68,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.unix;
-    # Note: Maintainer of prev. erlang version was simons. If he wants
-    # to continue maintaining erlang I'm totally ok with that.
     maintainers = [ maintainers.the-kenny ];
   };
 }

pkgs/development/interpreters/erlang/R17.nix

@@ -85,8 +85,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.unix;
-    # Note: Maintainer of prev. erlang version was simons. If he wants
-    # to continue maintaining erlang I'm totally ok with that.
     maintainers = [ maintainers.the-kenny maintainers.sjmackenzie ];
   };
 }

pkgs/development/interpreters/lua-5/5.1.nix

@@ -56,6 +56,5 @@ stdenv.mkDerivation rec {
     '';
     license = stdenv.lib.licenses.mit;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/interpreters/lua-5/5.2.nix

@@ -98,6 +98,5 @@ stdenv.mkDerivation rec {
     '';
     license = stdenv.lib.licenses.mit;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/interpreters/lua-5/5.3.nix

@@ -97,6 +97,5 @@ stdenv.mkDerivation rec {
     '';
     license = stdenv.lib.licenses.mit;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/interpreters/maude/default.nix

@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     '';
 
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/development/interpreters/python/2.6/default.nix

@@ -119,7 +119,7 @@ let
       '';
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+      maintainers = with stdenv.lib.maintainers; [ chaoflow iElectric ];
       # If you want to use Python 2.6, remove "broken = true;" at your own
       # risk.  Python 2.6 has known security vulnerabilities is not receiving
       # security updates as of October 2013.

pkgs/development/interpreters/python/2.7/default.nix

@@ -173,7 +173,7 @@ let
       '';
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ];
+      maintainers = with stdenv.lib.maintainers; [ chaoflow iElectric ];
     };
   };
 

pkgs/development/interpreters/python/3.3/default.nix

@@ -104,6 +104,6 @@ stdenv.mkDerivation {
     '';
     license = stdenv.lib.licenses.psfl;
     platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow cstrahan ];
+    maintainers = with stdenv.lib.maintainers; [ chaoflow cstrahan ];
   };
 }

pkgs/development/interpreters/python/3.4/default.nix

@@ -127,6 +127,6 @@ stdenv.mkDerivation {
     '';
     license = licenses.psfl;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ];
+    maintainers = with maintainers; [ chaoflow iElectric cstrahan ];
   };
 }

pkgs/development/interpreters/python/3.5/default.nix

@@ -127,6 +127,6 @@ stdenv.mkDerivation {
     '';
     license = licenses.psfl;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ];
+    maintainers = with maintainers; [ chaoflow iElectric cstrahan ];
   };
 }

pkgs/development/libraries/adns/default.nix

@@ -31,6 +31,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.lgpl2;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/development/libraries/boost/generic.nix

@@ -127,7 +127,7 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.boost;
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ simons wkennington ];
+    maintainers = with maintainers; [ peti wkennington ];
   };
 
   preConfigure = ''

pkgs/development/libraries/buddy/default.nix

@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     license = "as-is";
 
     platforms = with stdenv.lib.platforms; allBut cygwin;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/development/libraries/cppunit/default.nix

@@ -12,6 +12,5 @@ stdenv.mkDerivation {
     homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";
     description = "C++ unit testing framework";
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/libraries/cyrus-sasl/default.nix

@@ -51,6 +51,5 @@ stdenv.mkDerivation rec {
     homepage = "http://cyrusimap.web.cmu.edu/";
     description = "library for adding authentication support to connection-based protocols";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ];
   };
 }

pkgs/development/libraries/gmp/5.1.x.nix

@@ -71,6 +71,6 @@ stdenv.mkDerivation rec {
       '';
 
     platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
+    maintainers = [ maintainers.peti ];
   };
 }

pkgs/development/libraries/gmp/6.x.nix

@@ -73,7 +73,7 @@ let self = stdenv.mkDerivation rec {
       '';
 
     platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
+    maintainers = [ maintainers.peti ];
   };
 };
   in self

pkgs/development/libraries/mesa/default.nix

@@ -169,6 +169,6 @@ stdenv.mkDerivation {
     homepage = http://www.mesa3d.org/;
     license = licenses.mit; # X11 variant, in most files
     platforms = platforms.mesaPlatforms;
-    maintainers = with maintainers; [ eduarrrd simons vcunat ];
+    maintainers = with maintainers; [ eduarrrd vcunat ];
   };
 }

pkgs/development/libraries/nlopt/default.nix

@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
     broken = true;              # cannot cope with Octave 4.x
   };
 

pkgs/development/libraries/openssl/default.nix

@@ -97,7 +97,7 @@ let
       homepage = http://www.openssl.org/;
       description = "A cryptographic library that implements the SSL and TLS protocols";
       platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.simons ];
+      maintainers = [ stdenv.lib.maintainers.peti ];
       priority = 10; # resolves collision with ‘man-pages’
     };
   };

pkgs/development/libraries/pcre/default.nix

@@ -62,6 +62,5 @@ in stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
   };
 }

pkgs/development/libraries/science/math/liblapack/3.5.0.nix

@@ -59,8 +59,6 @@ stdenv.mkDerivation rec {
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
     license = licenses.bsd3;
-
     platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
   };
 }

pkgs/development/libraries/science/math/liblapack/default.nix

@@ -59,8 +59,6 @@ stdenv.mkDerivation rec {
     description = "Linear Algebra PACKage";
     homepage = "http://www.netlib.org/lapack/";
     license = licenses.bsd3;
-
     platforms = platforms.all;
-    maintainers = [ maintainers.simons ];
   };
 }

pkgs/development/libraries/tbb/default.nix

@@ -37,6 +37,6 @@ stdenv.mkDerivation {
       details and threading mechanisms for scalability and performance.
     '';
     platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons thoughtpolice ];
+    maintainers = with stdenv.lib.maintainers; [ peti thoughtpolice ];
   };
 }

pkgs/development/libraries/tecla/default.nix

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = "as-is";
 
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }

pkgs/development/mobile/flashtool/default.nix

@@ -59,6 +59,5 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unfreeRedistributableFirmware;
     platforms = stdenv.lib.platforms.linux;
     hydraPlatforms = stdenv.lib.platforms.none;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/tools/analysis/cppcheck/default.nix

@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = http://cppcheck.sourceforge.net/;
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ simons joachifm ];
+    maintainers = with maintainers; [ joachifm ];
   };
 }

pkgs/development/tools/build-managers/gnumake/4.1/default.nix

@@ -40,7 +40,6 @@ stdenv.mkDerivation {
       to build and install the program.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ simons ];
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/tools/build-managers/scons/default.nix

@@ -38,6 +38,5 @@ stdenv.mkDerivation {
       software.
     '';
     platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/tools/documentation/doxygen/default.nix

@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
       manual (in LaTeX) from a set of documented source files.
     '';
 
-    maintainers = [stdenv.lib.maintainers.simons];
     platforms = if qt4 != null then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
   };
 }

pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix

@@ -33,5 +33,5 @@ mkDerivation rec {
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Convert Cabal files into Nix build instructions";
   license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
+  maintainers = with stdenv.lib.maintainers; [ peti ];
 }

pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix

@@ -29,5 +29,5 @@ mkDerivation rec {
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Data types and functions to manipulate the Nixpkgs distribution";
   license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
+  maintainers = with stdenv.lib.maintainers; [ peti ];
 }

pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix

@@ -32,5 +32,5 @@ mkDerivation rec {
   homepage = "https://github.com/nixos/cabal2nix#readme";
   description = "Convert Cabal files into Nix build instructions";
   license = stdenv.lib.licenses.bsd3;
-  maintainers = with stdenv.lib.maintainers; [ simons ];
+  maintainers = with stdenv.lib.maintainers; [ peti ];
 }

pkgs/development/tools/misc/astyle/default.nix

@@ -28,6 +28,5 @@ stdenv.mkDerivation {
     description = "Source code indenter, formatter, and beautifier for C, C++, C# and Java";
     license = stdenv.lib.licenses.lgpl3;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/development/tools/misc/automake/automake-1.13.x.nix

@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
-
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/tools/misc/automake/automake-1.14.x.nix

@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
-
     platforms = stdenv.lib.platforms.all;
   };
 }

pkgs/development/tools/misc/automake/automake-1.15.x.nix

@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
       Standards.  Automake requires the use of Autoconf.
     '';
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
-
     platforms = stdenv.lib.platforms.all;
   };
 }