From 0281599ad26471b328fe98c3f8d202d97a3f9544 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sun, 18 Aug 2019 21:16:19 +0200 Subject: [PATCH] tree-wide: fix malformed meta.maintainers These packages stood out while processing packages.json.gz, where the maintainer field of some packages wasn't a list of sets, but a nested list, or a string. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/libraries/at-spi2-atk/default.nix | 2 +- pkgs/development/libraries/at-spi2-core/default.nix | 2 +- pkgs/development/python-modules/shamir-mnemonic/default.nix | 6 +++--- pkgs/development/python-modules/trezor/default.nix | 6 +++--- pkgs/misc/acpilight/default.nix | 2 +- pkgs/servers/sickbeard/sickrage.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ebc58aa8d73a..257123d10fd6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5907,6 +5907,12 @@ githubId = 231788; name = "Stephen Weinberg"; }; + sterfield = { + email = "sterfield@gmail.com"; + github = "sterfield"; + githubId = 5747061; + name = "Guillaume Loetscher"; + }; sternenseemann = { email = "post@lukasepple.de"; github = "sternenseemann"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 6c3f3aa9fa29..2268d4389026 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-atk; license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-atk/issues/2 - maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; + maintainers = gnome3.maintainers; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index e5d5313eeb10..47c8c090d08f 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; license = licenses.lgpl2Plus; # NOTE: 2018-06-06: Please check the license when upstream sorts-out licensing: https://gitlab.gnome.org/GNOME/at-spi2-core/issues/2 - maintainers = with maintainers; [ jtojnar gnome3.maintainers ]; + maintainers = gnome3.maintainers; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/shamir-mnemonic/default.nix b/pkgs/development/python-modules/shamir-mnemonic/default.nix index 907f87dcd474..13a946aeafd0 100644 --- a/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -13,10 +13,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ click colorama ]; - meta = { + meta = with lib; { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ "1000101" ]; + license = licenses.mit; + maintainers = [ maintainers."1000101" ]; }; } diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 12e881536963..47aa23ca1143 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -40,10 +40,10 @@ buildPythonPackage rec { runHook postCheck ''; - meta = { + meta = with lib; { description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ np prusnak mmahut "1000101" ]; + license = licenses.gpl3; + maintainers = with maintainers; [ np prusnak mmahut maintainers."1000101" ]; }; } diff --git a/pkgs/misc/acpilight/default.nix b/pkgs/misc/acpilight/default.nix index 4076a8c3a3af..1975e2d37907 100644 --- a/pkgs/misc/acpilight/default.nix +++ b/pkgs/misc/acpilight/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/wavexx/acpilight"; description = "ACPI backlight control"; license = licenses.gpl3; - maintainers = with maintainers; [ "smakarov" ]; + maintainers = with maintainers; [ smakarov ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index 6ee119520b41..f4a37f85c6cb 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -29,6 +29,6 @@ python2.pkgs.buildPythonApplication rec { longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic."; license = licenses.gpl3; homepage = https://sickrage.github.io; - maintainers = [ "sterfield@gmail.com" ]; + maintainers = with maintainers; [ sterfield ]; }; } diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index fcea0f398e4e..48cf589e55d1 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "TREZOR Communication Daemon aka TREZOR Bridge"; homepage = "https://trezor.io"; license = licenses.lgpl3; - maintainers = with maintainers; [ canndrew jb55 "1000101" prusnak mmahut ]; + maintainers = with maintainers; [ canndrew jb55 prusnak mmahut maintainers."1000101" ]; platforms = platforms.unix; }; }