greetd: remove deprecated attrs, fix license (+ some greeters' licenses) (#503844)
This commit is contained in:
@@ -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";
|
||||
@@ -75,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;
|
||||
};
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user