diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 1ff48d023daa..fc69892b07a6 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -139,6 +139,8 @@ - `rofi` has been updated to `2.0.0`. `rofi-wayland` and `rofi-wayland-unwrapped` have been merged into `rofi` and `rofi-unwrapped` respectively. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/davatorium/rofi/releases/tag/2.0.0). +- `rofi-emoji-wayland` has been merged into `rofi-emoji` as `rofi` has been updated to `2.0.0` and supports both X11 & Wayland. + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index bb7a06377248..520781f67cfc 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -80,7 +80,7 @@ import ./versions.nix ( ++ lib.optionals x11Support [ xclip ]; meta = with lib; { - description = "Emoji selector plugin for Rofi (built against ${rofi-unwrapped.pname})"; + description = "Emoji selector plugin for Rofi"; homepage = "https://github.com/Mange/rofi-emoji"; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b7a58f30efd2..eca7e5835778 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2107,6 +2107,7 @@ mapAliases { rl_json = tclPackages.rl_json; # Added 2025-05-03 rockbox_utility = rockbox-utility; # Added 2022-03-17 rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18 + rofi-emoji-wayland = throw "'rofi-emoji-wayland' has been merged into `rofi-emoji as 'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06 rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06 rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06 root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 826c44d25500..6603e7a4ac59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12395,10 +12395,6 @@ with pkgs; pragha = libsForQt5.callPackage ../applications/audio/pragha { }; rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3; - rofi-emoji-wayland = - (callPackage ../applications/misc/rofi-emoji { - rofi-unwrapped = rofi-wayland-unwrapped; - }).v4; rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { waylandSupport = false;