Make all meta.maintainers attributes lists

(cherry picked from commit f7e0bc2) Fixes #21610. (Two changes added by hand.)
NixOS · Jan 3, 2017 · b714f55 · b714f55
1 parent 9cdefa2
commit b714f55
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 32 deletions.
diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -24,12 +24,11 @@ stdenv.mkDerivation rec {
     install *.el* $out/share/emacs/site-lisp
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Precision colors for machines and people";
     homepage = http://ethanschoonover.com/solarized;
-    maintainers = "Samuel Rivas <samuelrivas@gmail.com>";
-    license = stdenv.lib.licenses.mit;
-
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.samuelrivas ];
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       '';
       homepage = https://launchpad.net/synapse-project;
       license = stdenv.lib.licenses.gpl3;
-      maintainers = with stdenv.lib.maintainers; mahe;
+      maintainers = with stdenv.lib.maintainers; [ mahe ];
       platforms = with stdenv.lib.platforms; all;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix
@@ -21,19 +21,19 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/lib/pidgin/
-    cp bin/*.so $out/lib/pidgin/
+    cp bin/*.so $out/lib/pidgin/ #*/
     cp tg-server.tglpub $out/lib/pidgin/server.tglpub
     mkdir -p $out/pixmaps/pidgin/protocols/{16,22,48}
     cp imgs/telegram16.png $out/pixmaps/pidgin/protocols/16
     cp imgs/telegram22.png $out/pixmaps/pidgin/protocols/22
     cp imgs/telegram48.png $out/pixmaps/pidgin/protocols/48
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/majn/telegram-purple;
     description = "Telegram for Pidgin / libpurple";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = stdenv.lib.maintainers.jagajaga;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.jagajaga ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Convert parts of a video while you are watching it in mpv";
     homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0";
-    maintainers = lib.maintainers.profpatsch;
+    maintainers = [ lib.maintainers.profpatsch ];
     longDescription = ''
       When this script is loaded into mpv, you can hit Alt+W to mark the beginning
       and Alt+W again to mark the end of the clip. Then a settings window opens.

diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
       additional features, such as additional effects, and a fork at a
       well-defined and proper place.
     '';
-    maintainers = maintainers.ertes;
+    maintainers = [ maintainers.ertes ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ netcdf hdf5 curl gfortran ];
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Fortran API to manipulate netcdf files";
-    homepage = "http://www.unidata.ucar.edu/software/netcdf/";
-    license = stdenv.lib.licenses.free;
-    maintainers = stdenv.lib.maintainers.bzizou;
-    platforms = stdenv.lib.platforms.unix;
+    homepage = http://www.unidata.ucar.edu/software/netcdf/;
+    license = licenses.free;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     description = "A set of utilities to handle ELF objects";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3;
-    maintainers = lib.maintainers.eelco;
+    maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
@@ -40,19 +40,19 @@ stdenv.mkDerivation {
 
     mkdir -pv $out/bin/jars $out/lib
     cp -v MultiMC $out/bin/
-    cp -v jars/*.jar $out/bin/jars/
+    cp -v jars/*.jar $out/bin/jars/ #*/
     cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
     wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://multimc.org/;
     description = "A free, open source launcher for Minecraft";
     longDescription = ''
       Allows you to have multiple, separate instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple interface.
     '';
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = stdenv.lib.maintainers.cleverca22;
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.cleverca22 ];
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -7,7 +7,7 @@ import ./generic.nix (args // rec {
 
   extraMeta = {
     branch = "4.1";
-    maintainers = stdenv.lib.maintainers.layus;
+    maintainers = [ stdenv.lib.maintainers.layus ];
   };
 
   src = fetchurl {

diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Command-line password safe";
     homepage    = https://github.com/janlelis/pws;
     license     = licenses.mit;
-    maintainers = maintainers.swistak35;
+    maintainers = [ maintainers.swistak35 ];
     platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/var";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://www.opendnssec.org/softhsm;
     description = "Cryptographic store accessible through a PKCS #11 interface";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = stdenv.lib.maintainers.leenaars;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.leenaars ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.vanheusden.com/iops/;
     license = licenses.gpl2;
-    maintainers = with maintainers; davidak;
+    maintainers = with maintainers; [ davidak ];
     platforms = platforms.linux; # build problems on Darwin
   };
 }

diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Flexibly import bank account CSV files into Ledger for command line accounting";
     license = licenses.mit;
-    maintainers = "mckean.kylej@gmail.com";
+    maintainers = [ "mckean.kylej@gmail.com" ];
     platforms = platforms.unix;
   };
 }