From bad529983ef2f1a21083b92bb07c7e02e2b49cb3 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:19:45 -0800 Subject: [PATCH 01/14] xdg-desktop-entries: fix reference to maintainer cwyc --- modules/misc/xdg-desktop-entries.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/misc/xdg-desktop-entries.nix b/modules/misc/xdg-desktop-entries.nix index 6e8393c2..ca61a998 100644 --- a/modules/misc/xdg-desktop-entries.nix +++ b/modules/misc/xdg-desktop-entries.nix @@ -147,7 +147,7 @@ let extraDesktopEntries = config.settings; }; in { - meta.maintainers = with maintainers; [ cwyc ]; + meta.maintainers = [ hm.maintainers.cwyc ]; options.xdg.desktopEntries = mkOption { description = '' From ec79a7d830a11c249ed96012410f1b253879f7e7 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:22:46 -0800 Subject: [PATCH 02/14] broot: fix aheaume entry in maintainers --- modules/lib/maintainers.nix | 6 ++++++ modules/programs/broot.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index d3bd599f..08b2da2d 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -145,4 +145,10 @@ github = "onny"; githubId = 757752; }; + aheaume = { + name = "aheaume"; + email = "aheaume@users.noreply.github.com"; + github = "aheaume"; + githubId = 13830042; + }; } diff --git a/modules/programs/broot.nix b/modules/programs/broot.nix index 79ffb388..f37470d7 100644 --- a/modules/programs/broot.nix +++ b/modules/programs/broot.nix @@ -15,7 +15,7 @@ let }; in { - meta.maintainers = [ maintainers.aheaume ]; + meta.maintainers = [ hm.maintainers.aheaume ]; options.programs.broot = { enable = mkEnableOption "Broot, a better way to navigate directories"; From 5705ba136696a254d309981d65b477fa9db8f34f Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:24:46 -0800 Subject: [PATCH 03/14] exa: fix kalhauge maintainers reference --- modules/programs/exa.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/exa.nix b/modules/programs/exa.nix index 771e4e65..ee497999 100644 --- a/modules/programs/exa.nix +++ b/modules/programs/exa.nix @@ -15,7 +15,7 @@ let }; in { - meta.maintainers = [ maintainers.kalhauge ]; + meta.maintainers = [ hm.maintainers.kalhauge ]; options.programs.exa = { enable = From b1b55c983fbcc476dcc376bb3fbdbde48bee8c96 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:25:22 -0800 Subject: [PATCH 04/14] lazygit: fix kalhuage maintainers reference --- modules/programs/lazygit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/lazygit.nix b/modules/programs/lazygit.nix index 87bcdecc..1752b151 100644 --- a/modules/programs/lazygit.nix +++ b/modules/programs/lazygit.nix @@ -11,7 +11,7 @@ let inherit (pkgs.stdenv.hostPlatform) isDarwin; in { - meta.maintainers = [ maintainers.kalhauge ]; + meta.maintainers = [ hm.maintainers.kalhauge ]; options.programs.lazygit = { enable = mkEnableOption "lazygit, a simple terminal UI for git commands"; From a95fd897f2b9b4705c47942a87ed12e0a826b37e Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:28:14 -0800 Subject: [PATCH 05/14] hexchat: remove superherointj as maintainer Mirroring https://github.com/NixOS/nixpkgs/pull/144319 --- .github/CODEOWNERS | 2 +- modules/programs/hexchat.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f134013d..01c8b4be 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -92,7 +92,7 @@ /modules/programs/go.nix @rvolosatovs -/modules/programs/hexchat.nix @superherointj @thiagokokada +/modules/programs/hexchat.nix @thiagokokada /tests/modules/programs/hexchat @thiagokokada /modules/programs/himalaya.nix @ambroisie diff --git a/modules/programs/hexchat.nix b/modules/programs/hexchat.nix index 7ac79228..a23ea622 100644 --- a/modules/programs/hexchat.nix +++ b/modules/programs/hexchat.nix @@ -229,7 +229,7 @@ let ]); in { - meta.maintainers = with maintainers; [ superherointj thiagokokada ]; + meta.maintainers = with maintainers; [ thiagokokada ]; options.programs.hexchat = with types; { enable = mkEnableOption "HexChat, a graphical IRC client"; From 87d0fed9bc7838e5acf74d8326cb2d52fc619584 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:32:05 -0800 Subject: [PATCH 06/14] htop: fix maintainers entry for bjpbakker --- modules/programs/htop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/htop.nix b/modules/programs/htop.nix index 1c8a5931..0d353026 100644 --- a/modules/programs/htop.nix +++ b/modules/programs/htop.nix @@ -89,7 +89,7 @@ let blank = text "Blank"; in { - meta.maintainers = [ maintainers.bjpbakker ]; + meta.maintainers = [ hm.maintainers.bjpbakker ]; options.programs.htop = { enable = mkEnableOption "htop"; From 6b1f56407b2a4ad194e8eccebc85eab5a40442e6 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:33:09 -0800 Subject: [PATCH 07/14] ncmpcpp: fix maintainers entry for olmokramer --- modules/programs/ncmpcpp.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/ncmpcpp.nix b/modules/programs/ncmpcpp.nix index 96013a9d..d1911818 100644 --- a/modules/programs/ncmpcpp.nix +++ b/modules/programs/ncmpcpp.nix @@ -44,7 +44,7 @@ let }); in { - meta.maintainers = with maintainers; [ olmokramer ]; + meta.maintainers = [ hm.maintainers.olmokramer ]; options.programs.ncmpcpp = { enable = From 7a0a7d6427bad466bfc2834647bcd1fcadf77b3a Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:34:31 -0800 Subject: [PATCH 08/14] xmobar: fix maintainers entry for t4ccer --- modules/lib/maintainers.nix | 6 ++++++ modules/programs/xmobar.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index 08b2da2d..84aad87d 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -151,4 +151,10 @@ github = "aheaume"; githubId = 13830042; }; + t4ccer = { + name = "t4ccer"; + email = "t4ccer@users.noreply.github.com"; + github = "t4ccer"; + githubId = 64430288; + }; } diff --git a/modules/programs/xmobar.nix b/modules/programs/xmobar.nix index 9d8593b7..a29bea84 100644 --- a/modules/programs/xmobar.nix +++ b/modules/programs/xmobar.nix @@ -55,5 +55,5 @@ in { xdg.configFile."xmobar/.xmobarrc".text = cfg.extraConfig; }; - meta.maintainers = with maintainers; [ t4ccer ]; + meta.maintainers = [ hm.maintainers.t4ccer ]; } From eb4a1ad68fb807de8c738b8ba6de6260387954da Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:37:21 -0800 Subject: [PATCH 09/14] kanshi: fix maintainers entry for nurelin --- modules/lib/maintainers.nix | 6 ++++++ modules/services/kanshi.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index 84aad87d..b2861815 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -157,4 +157,10 @@ github = "t4ccer"; githubId = 64430288; }; + nurelin = { + name = "nurelin"; + email = "nurelin@users.noreply.github.com"; + github = "nurelin"; + githubId = 5276274; + }; } diff --git a/modules/services/kanshi.nix b/modules/services/kanshi.nix index e482e9b8..3d4451e9 100644 --- a/modules/services/kanshi.nix +++ b/modules/services/kanshi.nix @@ -128,7 +128,7 @@ let ''; in { - meta.maintainers = [ maintainers.nurelin ]; + meta.maintainers = [ hm.maintainers.nurelin ]; options.services.kanshi = { enable = mkEnableOption From 907e63250a1e26a1789db754a91b75b26d7ce5e2 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:42:33 -0800 Subject: [PATCH 10/14] pasystray, status-notifier-watcher: fix maintainers entry for pltanton --- modules/lib/maintainers.nix | 6 ++++++ modules/services/pasystray.nix | 2 +- modules/services/status-notifier-watcher.nix | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix index b2861815..105edf07 100644 --- a/modules/lib/maintainers.nix +++ b/modules/lib/maintainers.nix @@ -163,4 +163,10 @@ github = "nurelin"; githubId = 5276274; }; + pltanton = { + name = "pltanton"; + email = "plotnikovanton@gmail.com"; + github = "pltanton"; + githubId = 4561823; + }; } diff --git a/modules/services/pasystray.nix b/modules/services/pasystray.nix index d41d6c93..15c951e1 100644 --- a/modules/services/pasystray.nix +++ b/modules/services/pasystray.nix @@ -3,7 +3,7 @@ with lib; { - meta.maintainers = [ maintainers.pltanton ]; + meta.maintainers = [ hm.maintainers.pltanton ]; options = { services.pasystray = { enable = mkEnableOption "PulseAudio system tray"; }; diff --git a/modules/services/status-notifier-watcher.nix b/modules/services/status-notifier-watcher.nix index 8de09d7d..c6fe08da 100644 --- a/modules/services/status-notifier-watcher.nix +++ b/modules/services/status-notifier-watcher.nix @@ -7,7 +7,7 @@ let cfg = config.services.status-notifier-watcher; in { - meta.maintainers = [ maintainers.pltanton ]; + meta.maintainers = [ hm.maintainers.pltanton ]; options = { services.status-notifier-watcher = { From c24c494e69adab46d8bf73fd3de136a0bd66b446 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:42:54 -0800 Subject: [PATCH 11/14] playerctld: fix maintainers entry for fendse --- modules/services/playerctld.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/playerctld.nix b/modules/services/playerctld.nix index dccc1ecc..5fed8f2b 100644 --- a/modules/services/playerctld.nix +++ b/modules/services/playerctld.nix @@ -7,7 +7,7 @@ let cfg = config.services.playerctld; in { - meta.maintainers = [ maintainers.fendse ]; + meta.maintainers = [ hm.maintainers.fendse ]; options.services.playerctld = { enable = mkEnableOption "playerctld daemon"; From 04342bd7a28c4cc6c7a4bc2ebff13ea3195c0aa7 Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:43:19 -0800 Subject: [PATCH 12/14] trayer: fix maintainers entry for mager --- modules/services/trayer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/trayer.nix b/modules/services/trayer.nix index 6abfbf7d..0621c55e 100644 --- a/modules/services/trayer.nix +++ b/modules/services/trayer.nix @@ -100,7 +100,7 @@ let cfg = config.services.trayer; in { - meta.maintainers = [ maintainers.mager ]; + meta.maintainers = [ hm.maintainers.mager ]; options = { services.trayer = { From eeafec5103a679076d1787795e28bf3df3e922cf Mon Sep 17 00:00:00 2001 From: Luna Nova Date: Sat, 25 Dec 2021 10:43:41 -0800 Subject: [PATCH 13/14] wlsunset: fix maintainers entry for matrss --- modules/services/wlsunset.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/services/wlsunset.nix b/modules/services/wlsunset.nix index 28e595af..373d77f2 100644 --- a/modules/services/wlsunset.nix +++ b/modules/services/wlsunset.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.wlsunset; in { - meta.maintainers = [ maintainers.matrss ]; + meta.maintainers = [ hm.maintainers.matrss ]; options.services.wlsunset = { enable = mkEnableOption "Whether to enable wlsunset."; From a3457d3f854fd9799769728ff5dfca5cd6de751c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 29 Dec 2021 10:15:39 +0100 Subject: [PATCH 14/14] ci: verify that `meta.maintainers` evaluate Fixes #2588 --- .github/workflows/test.yml | 1 + default.nix | 1 + docs/default.nix | 10 ++++++++++ 3 files changed, 12 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b1fdbf7..e04df065 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,7 @@ jobs: echo "Error: literalExample should be replaced by literalExpression" > /dev/stderr exit 1 fi + - run: nix-build -A docs.jsonModuleMaintainers - run: ./format -c - run: nix-shell . -A install - run: nix-shell --arg enableBig false --pure tests -A run.all diff --git a/default.nix b/default.nix index 4438d827..b665b7a6 100644 --- a/default.nix +++ b/default.nix @@ -5,6 +5,7 @@ rec { html = manual.html; manPages = manPages; json = options.json; + jsonModuleMaintainers = jsonModuleMaintainers; # Unstable, mainly for CI. }; home-manager = pkgs.callPackage ./home-manager { path = toString ./.; }; diff --git a/docs/default.nix b/docs/default.nix index fd038d1a..22feac5c 100644 --- a/docs/default.nix +++ b/docs/default.nix @@ -117,4 +117,14 @@ in { manPages = docs.manPages; manual = { inherit (docs) html htmlOpenTool; }; + + # Unstable, mainly for CI. + jsonModuleMaintainers = pkgs.writeText "hm-module-maintainers.json" (let + result = lib.evalModules { + modules = import ../modules/modules.nix { + inherit lib pkgs; + check = false; + } ++ [ scrubbedPkgsModule ]; + }; + in builtins.toJSON result.config.meta.maintainers); }