From 97bfb5a0621f7978e73cd68033fc3813cfaf45da Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 26 Mar 2026 22:02:19 +0200 Subject: [PATCH 1/4] greetd: purge greeter aliases Follow-up to #427540 --- pkgs/by-name/gr/greetd/package.nix | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/pkgs/by-name/gr/greetd/package.nix b/pkgs/by-name/gr/greetd/package.nix index c6c65e452dec..0e13f6b07c9f 100644 --- a/pkgs/by-name/gr/greetd/package.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -1,18 +1,11 @@ { rustPlatform, lib, - config, fetchFromSourcehut, pam, scdoc, installShellFiles, nix-update-script, - # legacy passthrus - gtkgreet, - qtgreet, - regreet, - tuigreet, - wlgreet, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,26 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage man/* ''; - # Added 2025-07-23. To be deleted on 26.05 - passthru = - let - warnPassthru = name: lib.warnOnInstantiate "`greetd.${name}` was renamed to `${name}`"; - in - lib.mapAttrs warnPassthru ( - lib.optionalAttrs config.allowAliases { - inherit - gtkgreet - qtgreet - regreet - tuigreet - wlgreet - ; - greetd = finalAttrs.finalPackage; - } - ) - // { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Minimal and flexible login manager daemon"; From 29b576c757ba2a7f7591f6179b5c9c6ba0fa3f1c Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 26 Mar 2026 22:29:40 +0200 Subject: [PATCH 2/4] greetd: correct license https://git.sr.ht/~kennylevinsen/greetd/tree/1bf47d7b2029233361be3c772a66384bb54a458d/item/greetd/Cargo.toml#L6 --- pkgs/by-name/gr/greetd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/greetd/package.nix b/pkgs/by-name/gr/greetd/package.nix index 0e13f6b07c9f..c2dfaf7ac8de 100644 --- a/pkgs/by-name/gr/greetd/package.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://sr.ht/~kennylevinsen/greetd/"; mainProgram = "greetd"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; }; From 20c0861f8fe518ffed2d4e539d16ecbfba5d1054 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Thu, 26 Mar 2026 22:30:13 +0200 Subject: [PATCH 3/4] gtkgreet: correct license https://git.sr.ht/~kennylevinsen/gtkgreet/tree/ac3f9ec05ee2fdd116081869b808a429538816a5/item/meson.build#L5 --- pkgs/by-name/gt/gtkgreet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gt/gtkgreet/package.nix b/pkgs/by-name/gt/gtkgreet/package.nix index 6156e3ee8f41..dad670c71fe9 100644 --- a/pkgs/by-name/gt/gtkgreet/package.nix +++ b/pkgs/by-name/gt/gtkgreet/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "gtkgreet"; From 329f778bf64ddaaab17964c268bde5215812c1f3 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Wed, 22 Apr 2026 20:04:24 +0300 Subject: [PATCH 4/4] wlgreet: correct license --- pkgs/by-name/wl/wlgreet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wl/wlgreet/package.nix b/pkgs/by-name/wl/wlgreet/package.nix index d2cec5bca71b..71cca52b2877 100644 --- a/pkgs/by-name/wl/wlgreet/package.nix +++ b/pkgs/by-name/wl/wlgreet/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Raw wayland greeter for greetd, to be run under sway or similar"; mainProgram = "wlgreet"; homepage = "https://git.sr.ht/~kennylevinsen/wlgreet"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; };