rofi-wayland: drop in favor of rofi

rofi-wayland has been merged into rofi
https://github.com/davatorium/rofi/releases/tag/2.0.0
This commit is contained in:
SchweGELBin
2025-09-06 16:16:16 +02:00
parent dd27811d3f
commit 188b91103b
4 changed files with 4 additions and 45 deletions

View File

@@ -137,6 +137,8 @@
- `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0).
- `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).
## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

View File

@@ -1,41 +0,0 @@
{
lib,
fetchFromGitHub,
rofi-unwrapped,
wayland-scanner,
pkg-config,
wayland-protocols,
wayland,
}:
rofi-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "rofi-wayland-unwrapped";
version = "1.7.9+wayland1";
src = fetchFromGitHub {
owner = "lbonn";
repo = "rofi";
rev = version;
fetchSubmodules = true;
hash = "sha256-tLSU0Q221Pg3JYCT+w9ZT4ZbbB5+s8FwsZa/ehfn00s=";
};
depsBuildBuild = oldAttrs.depsBuildBuild ++ [ pkg-config ];
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [
wayland-protocols
wayland-scanner
];
buildInputs = oldAttrs.buildInputs ++ [
wayland
wayland-protocols
];
meta = with lib; {
description = "Window switcher, run dialog and dmenu replacement for Wayland";
homepage = "https://github.com/lbonn/rofi";
license = licenses.mit;
mainProgram = "rofi";
maintainers = with maintainers; [ bew ];
platforms = with platforms; linux;
};
})

View File

@@ -2107,6 +2107,8 @@ 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-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
rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17

View File

@@ -12888,10 +12888,6 @@ with pkgs;
rofi-unwrapped = callPackage ../applications/misc/rofi { };
rofi = callPackage ../applications/misc/rofi/wrapper.nix { };
rofi-wayland-unwrapped = callPackage ../applications/misc/rofi/wayland.nix { };
rofi-wayland = callPackage ../applications/misc/rofi/wrapper.nix {
rofi-unwrapped = rofi-wayland-unwrapped;
};
rofi-pass = callPackage ../tools/security/pass/rofi-pass.nix { };
rofi-pass-wayland = callPackage ../tools/security/pass/rofi-pass.nix {