diff options
author | Bobby Rong <rjl931189261@126.com> | 2024-03-19 23:12:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-19 23:12:06 +0800 |
commit | 2dcadb7087e38314cebb15af65f8f2a15d2940cc (patch) | |
tree | 9dd2697c6c4de1fe2bcf25c6fa83bf463c86020b | |
parent | 5171ed6431dcc22e6bd5c8b1edd11311d9e7a82c (diff) | |
parent | 455b915be0c611770b6d69beb0107029f151158a (diff) |
Merge pull request #297072 from FedericoSchonborn/add-federicoschonborn
maintainers: Add federicoschonborn back again
-rw-r--r-- | maintainers/maintainer-list.nix | 10 | ||||
-rw-r--r-- | maintainers/team-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/budgie.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/valent/default.nix | 8 | ||||
-rw-r--r-- | pkgs/by-name/wa/waycheck/package.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/gnome/extensions/valent/default.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/xfce/core/libxfce4windowing/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/yyjson/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/fastfetch/default.nix | 2 |
9 files changed, 30 insertions, 17 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ffc6768fea011..1444b852f2704 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6276,6 +6276,16 @@ githubId = 541748; name = "Felipe Espinoza"; }; + federicoschonborn = { + name = "Federico Damián Schonborn"; + email = "federicoschonborn@disroot.org"; + github = "FedericoSchonborn"; + githubId = 62166915; + matrix = "@FedericoDSchonborn:matrix.org"; + keys = [ + { fingerprint = "C43F 4052 D289 3B73 33F8 0259 E4F6 F544 DE9E 29E8"; } + ]; + }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 0138338379c2c..a3e94f0690a00 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -99,6 +99,7 @@ with lib.maintainers; { budgie = { members = [ bobby285271 + federicoschonborn ]; scope = "Maintain Budgie desktop environment"; shortName = "Budgie"; diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 7d8bb1963d788..dfc5450d1c819 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -44,6 +44,8 @@ let enableSshSocket = config.services.openssh.startWhenNeeded; }; in { + meta.maintainers = lib.teams.budgie.members; + options = { services.xserver.desktopManager.budgie = { enable = mkEnableOption (mdDoc "the Budgie desktop"); diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 1dad31d2539cf..4e07cf62821d2 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { "-Dvapi=false" ]; - meta = with lib; { + meta = { description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries"; mainProgram = "valent"; longDescription = '' @@ -82,8 +82,8 @@ stdenv.mkDerivation rec { ''; homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; - maintainers = with maintainers; [ aleksana ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; + maintainers = with lib.maintainers; [ aleksana federicoschonborn ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 1c4077c9ecb6e..ddbd67e882200 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -47,12 +47,12 @@ stdenv.mkDerivation (finalAttrs: { --replace "update-desktop-database -q" "update-desktop-database $out/share/applications" ''; - meta = with lib; { + meta = { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; - license = licenses.asl20; - maintainers = with maintainers; [ julienmalka ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ julienmalka federicoschonborn ]; mainProgram = "waycheck"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/desktops/gnome/extensions/valent/default.nix b/pkgs/desktops/gnome/extensions/valent/default.nix index 7148fc8d8bd0d..e9b5c14f14b27 100644 --- a/pkgs/desktops/gnome/extensions/valent/default.nix +++ b/pkgs/desktops/gnome/extensions/valent/default.nix @@ -26,12 +26,12 @@ stdenv.mkDerivation rec { extensionPortalSlug = "valent"; }; - meta = with lib; { + meta = { description = "GNOME Shell integration for Valent"; homepage = "https://valent.andyholmes.ca/"; changelog = "https://github.com/andyholmes/gnome-shell-extension-valent/blob/${src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ federicoschonborn ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix index 4ae9d9ca1b65d..621115616e5c0 100644 --- a/pkgs/desktops/xfce/core/libxfce4windowing/default.nix +++ b/pkgs/desktops/xfce/core/libxfce4windowing/default.nix @@ -13,6 +13,6 @@ mkXfceDerivation { meta = { description = "Windowing concept abstraction library for X11 and Wayland"; license = lib.licenses.lgpl21Plus; - maintainers = lib.teams.xfce.members; + maintainers = lib.teams.xfce.members ++ [ lib.maintainers.federicoschonborn ]; }; } diff --git a/pkgs/development/libraries/yyjson/default.nix b/pkgs/development/libraries/yyjson/default.nix index b0e17fffad2a0..86a286ef2e2d8 100644 --- a/pkgs/development/libraries/yyjson/default.nix +++ b/pkgs/development/libraries/yyjson/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; - meta = with lib; { + meta = { description = "The fastest JSON library in C"; homepage = "https://github.com/ibireme/yyjson"; changelog = "https://github.com/ibireme/yyjson/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ federicoschonborn ]; }; }) diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 54c1bb587fce0..bc3f4340b4768 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Like neofetch, but much faster because written in C"; homepage = "https://github.com/fastfetch-cli/fastfetch"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ gerg-l khaneliman ]; + maintainers = with lib.maintainers; [ gerg-l khaneliman federicoschonborn ]; platforms = lib.platforms.all; mainProgram = "fastfetch"; }; |