From 9b92a0784303b8384b71855e7cee27bc8d72dae8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 20 Jan 2017 15:43:34 +0100 Subject: [PATCH] treewide: use lib.maintainers for meta.maintainers --- pkgs/applications/version-management/tortoisehg/default.nix | 2 +- pkgs/applications/window-managers/i3/blocks-gaps.nix | 2 +- pkgs/applications/window-managers/i3/blocks.nix | 1 - pkgs/misc/emulators/cdemu/base.nix | 1 - pkgs/tools/text/reckon/default.nix | 1 - pkgs/tools/text/uni2ascii/default.nix | 2 +- pkgs/top-level/python-packages.nix | 6 +++--- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index fd61e4904025..c4eed94017ca 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -26,6 +26,6 @@ python2Packages.buildPythonApplication rec { homepage = http://tortoisehg.bitbucket.org/; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [ "abcz2.uprola@gmail.com" ]; + maintainers = with lib.maintainers; [ danbst ]; }; } diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index a80dbd38ec8c..d32e82f100e2 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; homepage = https://github.com/Airblader/i3blocks-gaps; license = licenses.gpl3; - maintainers = [ "carlsverre" ]; + maintainers = with maintainers; [ carlsverre ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 00de6b874534..60f13ce440c3 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { description = "A flexible scheduler for your i3bar blocks"; homepage = https://github.com/vivien/i3blocks; license = licenses.gpl3; - maintainers = [ "MindTooth" ]; platforms = with platforms; freebsd ++ linux; }; } diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index cfd2ad37cadf..cc9d11f86434 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -32,6 +32,5 @@ in stdenv.mkDerivation ({ homepage = http://cdemu.sourceforge.net/; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ "Rok Mandeljc " ]; }; } // drvParams) diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix index de03963a4128..b97ffc7c58a8 100644 --- a/pkgs/tools/text/reckon/default.nix +++ b/pkgs/tools/text/reckon/default.nix @@ -22,7 +22,6 @@ 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" ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index 9e62b2b3d592..9eebb830db1c 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { It also provides ways of converting non-ASCII characters to similar ASCII characters, e.g. by stripping diacritics. ''; - maintainers = [ "cillian.deroiste@gmail.com" ]; + maintainers = with stdenv.lib.maintainers; [ goibhniu ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bcfcd239a3d5..3a56d612c823 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7851,7 +7851,7 @@ in { meta = with stdenv.lib; { description = "Accessing and Modifying INI files"; license = licenses.mit; - maintainers = [ "abcz2.uprola@gmail.com" ]; + maintainers = with maintainers; [ danbst ]; }; }; @@ -22237,7 +22237,7 @@ in { meta = with stdenv.lib; { description = "A Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; - maintainers = [ "abcz2.uprola@gmail.com" ]; + maintainers = with maintainers; [ danbst ]; platforms = platforms.linux; }; }; @@ -29105,7 +29105,7 @@ EOF meta = { homepage = https://developers.google.com/storage/docs/gsutil; description = "Google Cloud Storage Tool"; - maintainers = [ "Russell O'Connor " ]; + maintainers = with maintainers; [ roconnor ]; license = licenses.asl20; }; doCheck = false;