diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 69e53c6e5260..365d207660c1 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -35,6 +35,8 @@ - `stalwart-mail` since `0.13.0` "introduces a significant redesign of the MTA’s delivery and queueing subsystem". See [the upgrading announcement for the `0.13.0` release](https://github.com/stalwartlabs/stalwart/blob/89b561b5ca1c5a11f2a768b4a2cfef0f473b7a01/UPGRADING.md#upgrading-from-v012x-and-v011x-to-v013x). +- Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases. + - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld. - `navidrome` 0.58.0 introduces [multi-library support](https://www.navidrome.org/docs/usage/multi-library/) diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index 8d0580187d0e..9c967ac71696 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -21,14 +21,14 @@ in options.services.greetd = { enable = lib.mkEnableOption "greetd, a minimal and flexible login manager daemon"; - package = lib.mkPackageOption pkgs [ "greetd" "greetd" ] { }; + package = lib.mkPackageOption pkgs "greetd" { }; settings = lib.mkOption { type = settingsFormat.type; example = lib.literalExpression '' { default_session = { - command = "''${pkgs.greetd.greetd}/bin/agreety --cmd sway"; + command = "''${pkgs.greetd}/bin/agreety --cmd sway"; }; } ''; diff --git a/nixos/tests/greetd-no-shadow.nix b/nixos/tests/greetd-no-shadow.nix index c4cb028ff6eb..947271716b0b 100644 --- a/nixos/tests/greetd-no-shadow.nix +++ b/nixos/tests/greetd-no-shadow.nix @@ -27,7 +27,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.greetd}/bin/agreety --cmd bash"; + command = "${pkgs.greetd}/bin/agreety --cmd bash"; }; }; }; diff --git a/pkgs/applications/display-managers/greetd/default.nix b/pkgs/by-name/gr/greetd/package.nix similarity index 51% rename from pkgs/applications/display-managers/greetd/default.nix rename to pkgs/by-name/gr/greetd/package.nix index b1e1dca24f6e..06642f98b4a1 100644 --- a/pkgs/applications/display-managers/greetd/default.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -5,17 +5,24 @@ pam, scdoc, installShellFiles, + nix-update-script, + # legacy passthrus + gtkgreet, + qtgreet, + regreet, + tuigreet, + wlgreet, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "greetd"; version = "0.10.3"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; - sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; + repo = "greetd"; + rev = finalAttrs.version; + hash = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg="; }; cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY="; @@ -37,7 +44,26 @@ rustPlatform.buildRustPackage rec { installManPage man/* ''; - meta = with lib; { + # 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 { + inherit + gtkgreet + qtgreet + regreet + tuigreet + wlgreet + ; + } + // { + greetd = warnPassthru "greetd" finalAttrs.finalPackage; + updateScript = nix-update-script { }; + }; + + meta = { description = "Minimal and flexible login manager daemon"; longDescription = '' greetd is a minimal and flexible login manager daemon @@ -46,8 +72,8 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://sr.ht/~kennylevinsen/greetd/"; mainProgram = "greetd"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/applications/display-managers/greetd/gtkgreet.nix b/pkgs/by-name/gt/gtkgreet/package.nix similarity index 73% rename from pkgs/applications/display-managers/greetd/gtkgreet.nix rename to pkgs/by-name/gt/gtkgreet/package.nix index 425e4c1790b3..bffb651c16d8 100644 --- a/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/pkgs/by-name/gt/gtkgreet/package.nix @@ -12,17 +12,18 @@ json_c, librsvg, scdoc, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtkgreet"; version = "0.8"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; - sha256 = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8="; + repo = "gtkgreet"; + rev = finalAttrs.version; + hash = "sha256-GKBYql0hzqB6uY87SsAqHwf3qLAr7xznMnAjRtP4HS8="; }; depsBuildBuild = [ pkg-config ]; @@ -54,12 +55,14 @@ stdenv.mkDerivation rec { # G_APPLICATION_FLAGS_NONE is deprecated in GLib 2.73.3+. env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; mainProgram = "gtkgreet"; }; -} +}) diff --git a/pkgs/applications/display-managers/greetd/qtgreet.nix b/pkgs/by-name/qt/qtgreet/package.nix similarity index 100% rename from pkgs/applications/display-managers/greetd/qtgreet.nix rename to pkgs/by-name/qt/qtgreet/package.nix diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/by-name/re/regreet/package.nix similarity index 70% rename from pkgs/applications/display-managers/greetd/regreet.nix rename to pkgs/by-name/re/regreet/package.nix index 0872941b8cb3..0f673686620f 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/by-name/re/regreet/package.nix @@ -8,16 +8,17 @@ gtk4, pango, librsvg, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "regreet"; version = "0.2.0"; src = fetchFromGitHub { owner = "rharish101"; repo = "ReGreet"; - rev = version; + rev = finalAttrs.version; hash = "sha256-f8Xvno5QqmWz4SUiFYDvs8lFU1ZaqQ8gpTaVzWxW4T8="; }; @@ -36,12 +37,14 @@ rustPlatform.buildRustPackage rec { librsvg ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Clean and customizable greeter for greetd"; homepage = "https://github.com/rharish101/ReGreet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ fufexan ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ fufexan ]; + platforms = lib.platforms.linux; mainProgram = "regreet"; }; -} +}) diff --git a/pkgs/applications/display-managers/greetd/tuigreet.nix b/pkgs/by-name/tu/tuigreet/package.nix similarity index 76% rename from pkgs/applications/display-managers/greetd/tuigreet.nix rename to pkgs/by-name/tu/tuigreet/package.nix index 19ca3c8b592d..0a42d42e91d9 100644 --- a/pkgs/applications/display-managers/greetd/tuigreet.nix +++ b/pkgs/by-name/tu/tuigreet/package.nix @@ -2,19 +2,19 @@ lib, rustPlatform, fetchFromGitHub, - installShellFiles, scdoc, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "tuigreet"; version = "0.9.1"; src = fetchFromGitHub { owner = "apognu"; repo = "tuigreet"; - rev = "refs/tags/${version}"; - sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; + tag = finalAttrs.version; + hash = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY="; }; cargoHash = "sha256-w6ZOqpwogKoN4oqqI1gFqY8xAnfvhEBVaL8/6JXpKXs="; @@ -29,13 +29,15 @@ rustPlatform.buildRustPackage rec { installManPage tuigreet.1 ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Graphical console greeter for greetd"; homepage = "https://github.com/apognu/tuigreet"; - changelog = "https://github.com/apognu/tuigreet/releases/tag/${version}"; + changelog = "https://github.com/apognu/tuigreet/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "tuigreet"; }; -} +}) diff --git a/pkgs/applications/display-managers/greetd/wlgreet.nix b/pkgs/by-name/wl/wlgreet/package.nix similarity index 70% rename from pkgs/applications/display-managers/greetd/wlgreet.nix rename to pkgs/by-name/wl/wlgreet/package.nix index 9f5820148b32..d73e1da53d75 100644 --- a/pkgs/applications/display-managers/greetd/wlgreet.nix +++ b/pkgs/by-name/wl/wlgreet/package.nix @@ -6,16 +6,17 @@ gcc-unwrapped, wayland, libxkbcommon, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wlgreet"; version = "0.5.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; - repo = pname; - rev = version; + repo = "wlgreet"; + rev = finalAttrs.version; hash = "sha256-TQTHFBOTxtSuzrAG4cjZ9oirl80xc0rPdYeLJ0t39DQ="; }; @@ -30,12 +31,14 @@ rustPlatform.buildRustPackage rec { libxkbcommon ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Raw wayland greeter for greetd, to be run under sway or similar"; mainProgram = "wlgreet"; homepage = "https://git.sr.ht/~kennylevinsen/wlgreet"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4e46ab997d2..b3b1511ac030 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11958,20 +11958,6 @@ with pkgs; }; gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs; - greetd = recurseIntoAttrs ( - { - greetd = callPackage ../applications/display-managers/greetd { }; - gtkgreet = callPackage ../applications/display-managers/greetd/gtkgreet.nix { }; - qtgreet = callPackage ../applications/display-managers/greetd/qtgreet.nix { }; - regreet = callPackage ../applications/display-managers/greetd/regreet.nix { }; - tuigreet = callPackage ../applications/display-managers/greetd/tuigreet.nix { }; - wlgreet = callPackage ../applications/display-managers/greetd/wlgreet.nix { }; - } - // lib.optionalAttrs config.allowAliases { - dlm = throw "greetd.dlm has been removed as it is broken and abandoned upstream"; # Added 2024-07-15 - } - ); - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { }; goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };