From 688a91d4b0b7f9e4f55fecd6228bd84913eaf51d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 14 May 2025 17:01:36 +0200 Subject: [PATCH 1/2] treewide: add and remove teams.sdl from meta.teams --- pkgs/by-name/gu/guile-sdl/package.nix | 2 +- pkgs/by-name/sd/SDL2_sound/package.nix | 1 + pkgs/by-name/sd/SDL_sixel/package.nix | 2 +- pkgs/by-name/sd/SDL_stretch/package.nix | 2 +- pkgs/by-name/sd/sdl2-compat/package.nix | 3 +-- pkgs/by-name/sd/sdl3-image/package.nix | 1 + pkgs/by-name/sd/sdl3-ttf/package.nix | 1 + pkgs/by-name/sd/sdl3/package.nix | 1 + 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gu/guile-sdl/package.nix b/pkgs/by-name/gu/guile-sdl/package.nix index 62b3f395d005..b3fb533bbdaf 100644 --- a/pkgs/by-name/gu/guile-sdl/package.nix +++ b/pkgs/by-name/gu/guile-sdl/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.gnu.org/software/guile-sdl/"; description = "Guile bindings for SDL"; license = lib.licenses.gpl3Plus; - teams = [ lib.teams.sdl ]; + maintainers = [ ]; inherit (guile.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/SDL2_sound/package.nix b/pkgs/by-name/sd/SDL2_sound/package.nix index 19fb33b41129..2da73abcc243 100644 --- a/pkgs/by-name/sd/SDL2_sound/package.nix +++ b/pkgs/by-name/sd/SDL2_sound/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { mainProgram = "playsound"; platforms = platforms.unix; license = licenses.zlib; + teams = [ lib.teams.sdl ]; homepage = "https://www.icculus.org/SDL_sound/"; }; } diff --git a/pkgs/by-name/sd/SDL_sixel/package.nix b/pkgs/by-name/sd/SDL_sixel/package.nix index ac8a7b3544ab..727643eb6c06 100644 --- a/pkgs/by-name/sd/SDL_sixel/package.nix +++ b/pkgs/by-name/sd/SDL_sixel/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "SDL 1.2 patched with libsixel support"; license = lib.licenses.lgpl21; mainProgram = "sdl-config"; - teams = [ lib.teams.sdl ]; + maintainers = [ ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/sd/SDL_stretch/package.nix b/pkgs/by-name/sd/SDL_stretch/package.nix index ed59946bebd2..ea742a479c11 100644 --- a/pkgs/by-name/sd/SDL_stretch/package.nix +++ b/pkgs/by-name/sd/SDL_stretch/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sdl-stretch.sourceforge.net/"; description = "Stretch Functions For SDL"; license = lib.licenses.lgpl2; - teams = [ lib.teams.sdl ]; + maintainers = [ ]; inherit (SDL.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix index 23da12cc8057..968a272917c5 100644 --- a/pkgs/by-name/sd/sdl2-compat/package.nix +++ b/pkgs/by-name/sd/sdl2-compat/package.nix @@ -104,9 +104,8 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.zlib; maintainers = with lib.maintainers; [ nadiaholmquist - grimmauld - marcin-serwin ]; + teams = [ lib.teams.sdl ]; platforms = lib.platforms.all; pkgConfigModules = [ "sdl2-compat" ]; }; diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index 70754f72b4d0..f9fd8ac47418 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; maintainers = [ lib.maintainers.evythedemon ]; + teams = [ lib.teams.sdl ]; inherit (sdl3.meta) platforms; }; }) diff --git a/pkgs/by-name/sd/sdl3-ttf/package.nix b/pkgs/by-name/sd/sdl3-ttf/package.nix index d38950ab2252..82f75ca5eec4 100644 --- a/pkgs/by-name/sd/sdl3-ttf/package.nix +++ b/pkgs/by-name/sd/sdl3-ttf/package.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { charain Emin017 ]; + teams = [ lib.teams.sdl ]; pkgConfigModules = [ "sdl3-ttf" ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix index 1093605f44c1..12176e20914a 100644 --- a/pkgs/by-name/sd/sdl3/package.nix +++ b/pkgs/by-name/sd/sdl3/package.nix @@ -228,6 +228,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/libsdl-org/SDL/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.zlib; maintainers = with lib.maintainers; [ getchoo ]; + teams = [ lib.teams.sdl ]; platforms = lib.platforms.unix ++ lib.platforms.windows; pkgConfigModules = [ "sdl3" ]; }; From ca86336a1dee9dd496bb018ce4fbab37a9a9427c Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 14 May 2025 16:27:07 +0200 Subject: [PATCH 2/2] teams/sdl: add members --- maintainers/team-list.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 85ffc27ca193..c46260d483e0 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -1119,9 +1119,17 @@ with lib.maintainers; }; sdl = { - members = [ ]; - scope = "Maintain SDL libraries."; + members = [ + evythedemon + grimmauld + jansol + marcin-serwin + pbsds + ]; + githubTeams = [ "SDL" ]; + scope = "Maintain core SDL libraries."; shortName = "SDL"; + enableFeatureFreezePing = true; }; sphinx = {