From 975b83ca560d17db51a66cb2b0dc0e44213eab27 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 27 Jul 2024 09:35:13 +0200
Subject: [PATCH] treewide: fix eval after Nixpkgs maintainer changes
---
modules/config/home-cursor.nix | 2 +-
modules/lib/maintainers.nix | 5 +++++
modules/misc/nix.nix | 2 +-
modules/programs/bottom.nix | 2 +-
modules/programs/watson.nix | 2 +-
modules/services/fnott.nix | 2 +-
modules/services/window-managers/i3-sway/swaynag.nix | 2 +-
7 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/modules/config/home-cursor.nix b/modules/config/home-cursor.nix
index c696908d..76996048 100644
--- a/modules/config/home-cursor.nix
+++ b/modules/config/home-cursor.nix
@@ -67,7 +67,7 @@ let
};
in {
- meta.maintainers = [ maintainers.polykernel maintainers.league ];
+ meta.maintainers = [ hm.maintainers.polykernel maintainers.league ];
imports = [
(mkAliasOptionModule [ "xsession" "pointerCursor" "package" ] [
diff --git a/modules/lib/maintainers.nix b/modules/lib/maintainers.nix
index f1a81815..6ad7bd18 100644
--- a/modules/lib/maintainers.nix
+++ b/modules/lib/maintainers.nix
@@ -445,6 +445,11 @@
github = "podocarp";
githubId = 10473184;
};
+ polykernel = {
+ github = "polykernel";
+ githubId = 81340136;
+ name = "polykernel";
+ };
mainrs = {
name = "mainrs";
email = "5113257+mainrs@users.noreply.github.com";
diff --git a/modules/misc/nix.nix b/modules/misc/nix.nix
index 2daa56b2..668d44a1 100644
--- a/modules/misc/nix.nix
+++ b/modules/misc/nix.nix
@@ -311,5 +311,5 @@ in {
})
]);
- meta.maintainers = [ maintainers.polykernel ];
+ meta.maintainers = [ lib.hm.maintainers.polykernel ];
}
diff --git a/modules/programs/bottom.nix b/modules/programs/bottom.nix
index 810307b1..91d172ad 100644
--- a/modules/programs/bottom.nix
+++ b/modules/programs/bottom.nix
@@ -56,5 +56,5 @@ in {
};
};
- meta.maintainers = [ maintainers.polykernel ];
+ meta.maintainers = [ hm.maintainers.polykernel ];
}
diff --git a/modules/programs/watson.nix b/modules/programs/watson.nix
index b30dec09..5d0f4b7b 100644
--- a/modules/programs/watson.nix
+++ b/modules/programs/watson.nix
@@ -14,7 +14,7 @@ let
config.xdg.configHome;
in {
- meta.maintainers = [ maintainers.polykernel ];
+ meta.maintainers = [ hm.maintainers.polykernel ];
options.programs.watson = {
enable = mkEnableOption "watson, a wonderful CLI to track your time";
diff --git a/modules/services/fnott.nix b/modules/services/fnott.nix
index 3d2d1dd8..a8d7a637 100644
--- a/modules/services/fnott.nix
+++ b/modules/services/fnott.nix
@@ -9,7 +9,7 @@ let
iniFormat = pkgs.formats.ini { };
in {
- meta.maintainers = with maintainers; [ polykernel ];
+ meta.maintainers = [ hm.maintainers.polykernel ];
options = {
services.fnott = {
diff --git a/modules/services/window-managers/i3-sway/swaynag.nix b/modules/services/window-managers/i3-sway/swaynag.nix
index fcdedd3d..c3f4d535 100644
--- a/modules/services/window-managers/i3-sway/swaynag.nix
+++ b/modules/services/window-managers/i3-sway/swaynag.nix
@@ -14,7 +14,7 @@ let
};
in attrsOf confAtom;
in {
- meta.maintainers = with maintainers; [ polykernel ];
+ meta.maintainers = [ hm.maintainers.polykernel ];
options = {
wayland.windowManager.sway.swaynag = {