From bb9e9cc3f84abc4363d4b15b5860d82301d5b41e Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 14 May 2015 19:09:10 +0200 Subject: [PATCH] Turned some meta.maintainers into lists --- pkgs/applications/audio/pianobar/default.nix | 8 ++++---- .../misc/rxvt_unicode-plugins/urxvt-perls/default.nix | 2 +- .../misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix | 4 ++-- .../pidgin-plugins/pidgin-latex/default.nix | 2 +- pkgs/development/compilers/smlnj/default.nix | 6 +++--- pkgs/development/libraries/boost-process/default.nix | 2 +- pkgs/development/libraries/cppzmq/default.nix | 2 +- pkgs/development/libraries/double-conversion/default.nix | 2 +- pkgs/development/libraries/folly/default.nix | 2 +- pkgs/development/libraries/libiberty/default.nix | 2 +- .../libraries/libnetfilter_conntrack/default.nix | 8 ++++---- pkgs/development/libraries/libxls/default.nix | 2 +- pkgs/development/libraries/qpdf/default.nix | 2 +- pkgs/development/libraries/xlslib/default.nix | 2 +- pkgs/games/hedgewars/default.nix | 2 +- pkgs/games/onscripter-en/default.nix | 2 +- pkgs/misc/sails/default.nix | 2 +- pkgs/tools/X11/primus/default.nix | 2 +- pkgs/tools/archivers/rpmextract/default.nix | 2 +- pkgs/tools/compression/lbzip2/default.nix | 2 +- pkgs/tools/networking/openvpn/update-resolv-conf.nix | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 3e7bcb9d912e..b76e1183c0ee 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { configurePhase = "export CC=${CC}"; - meta = { + meta = with stdenv.lib; { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; # expat version - maintainers = stdenv.lib.maintainers.eduarrrd; + platforms = platforms.linux; + license = licenses.mit; # expat version + maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix index c0cc702c9862..3c5caeda789e 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix index a636c3bcfe56..db388cea5fbb 100644 --- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; homepage = "https://github.com/mina86/urxvt-tabbedex"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 586ce26e8c95..4a5522039c84 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index aa8ea9012c11..a2b8d4f63b98 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "Standard ML of New Jersey, a compiler"; homepage = http://smlnj.org; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; platforms = [ "i686-linux" ]; - maintainers = stdenv.lib.maintainers.thoughtpolice; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index 59d25a767329..974654216e01 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { description = "Library to manage system processes"; license = "boost-license"; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index fc2d04e649b9..510af3df8240 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/zeromq/cppzmq; license = licenses.bsd2; description = "C++ binding for 0MQ"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 07f11d9fa393..6eedf6fc23be 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/floitsch/double-conversion; license = licenses.bsd3; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 180de724d958..0110511c3356 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" ]; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 70d6b24cbfc5..eddc4eed55c0 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { homepage = http://gcc.gnu.org/; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index f6908cd514cc..a1a343de0e22 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libmnl ]; propagatedBuildInputs = [ libnfnetlink ]; - meta = { + meta = with stdenv.lib; { description = "Userspace library providing an API to the in-kernel connection tracking state table"; longDescription = '' libnetfilter_conntrack is a userspace library providing a programming interface (API) to the @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { by conntrack-tools among many other applications ''; homepage = http://netfilter.org/projects/libnetfilter_conntrack/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = stdenv.lib.maintainers.nckx; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index 87b4d82efc63..0d7115144449 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/libxls/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index e9d506f58fe9..939351750920 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://qpdf.sourceforge.net/; description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files"; license = licenses.artistic2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 82f1514cd3d3..2492063be270 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://sourceforge.net/projects/xlslib/files/; license = licenses.bsd2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 042d4f9fd4aa..bb776a7a10d0 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { contact with explosions, to zero (the damage dealt to the attacked hedgehog or hedgehogs after a player's or CPU turn is shown only when all movement on the battlefield has ceased).''; - maintainers = maintainers.kragniz; + maintainers = with maintainers; [ kragniz ]; platforms = ghc.meta.platforms; }; } diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 1d0bf636e2e9..8e9f5a988bf9 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://dev.haeleth.net/onscripter.shtml"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/misc/sails/default.nix b/pkgs/misc/sails/default.nix index ab68dc69015d..f6ccbf9ec76d 100644 --- a/pkgs/misc/sails/default.nix +++ b/pkgs/misc/sails/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { Sails is a simulator designed to test the AI of autonomous sailing robots. It emulates the basic physics of sailing a small single sail boat''; - maintainers = maintainers.kragniz; + maintainers = with maintainers; [ kragniz ]; platforms = platforms.all; }; } diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index c5c0e3ce7809..1aa7909a43d6 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/amonakov/primus; description = "Faster OpenGL offloading for Bumblebee"; - maintainers = maintainers.coconnor; + maintainers = with maintainers; [ coconnor ]; }; } diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix index c5f982c955cc..c9ce6ac4d10b 100644 --- a/pkgs/tools/archivers/rpmextract/default.nix +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Script to extract RPM archives"; platforms = platforms.all; license = licenses.gpl2; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix index e1adefd2167d..44f6a0bb7a45 100644 --- a/pkgs/tools/compression/lbzip2/default.nix +++ b/pkgs/tools/compression/lbzip2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = http://lbzip2.org/; description = "parallel bzip2 compression utility"; license = licenses.gpl3; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 3afa17b0a82c..d6f67d065d99 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; - maintainers = maintainers.abbradar; + maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; };