diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index f5ca4d1efc5d..3355ec76dc1b 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -149,6 +149,10 @@ - `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). + +- `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/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index b7e9ea3e707a..87f74bd6075c 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,42 +1,47 @@ { - stdenv, lib, + stdenv, + bison, + buildPackages, + cairo, + check, fetchFromGitHub, + flex, + git, + glib, + librsvg, + libstartup_notification, + libxcb, + libxkbcommon, meson, ninja, - pkg-config, - libxkbcommon, + pandoc, pango, + pkg-config, + wayland, + wayland-protocols, + wayland-scanner, which, - git, - cairo, - libxcb, xcb-imdkit, + xcbutil, xcb-util-cursor, xcbutilkeysyms, - xcbutil, xcbutilwm, xcbutilxrm, - libstartup_notification, - bison, - flex, - librsvg, - check, - glib, - buildPackages, - pandoc, + waylandSupport ? true, + x11Support ? true, }: stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.7.9.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "davatorium"; repo = "rofi"; rev = version; fetchSubmodules = true; - hash = "sha256-HZMVGlK6ig7kWf/exivoiTe9J/SLgjm7VwRm+KgKN44="; + hash = "sha256-akKwIYH9OoCh4ZE/bxKPCppxXsUhplvfRjSGsdthFk4="; }; preConfigure = '' @@ -47,36 +52,46 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc - pkg-config glib + pkg-config ]; nativeBuildInputs = [ + bison + flex meson ninja - pkg-config - flex - bison pandoc + pkg-config ]; buildInputs = [ - libxkbcommon - pango cairo + check git librsvg - check libstartup_notification + libxkbcommon + pango + which + ] + ++ lib.optionals waylandSupport [ + wayland + wayland-protocols + wayland-scanner + ] + ++ lib.optionals x11Support [ libxcb xcb-imdkit + xcbutil xcb-util-cursor xcbutilkeysyms - xcbutil xcbutilwm xcbutilxrm - which ]; - mesonFlags = [ "-Dimdkit=true" ]; + mesonFlags = + lib.optionals x11Support [ "-Dimdkit=true" ] + ++ lib.optionals (!waylandSupport) [ "-Dwayland=disabled" ] + ++ lib.optionals (!x11Support) [ "-Dxcb=disabled" ]; doCheck = false; @@ -84,7 +99,10 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ bew ]; + maintainers = with maintainers; [ + bew + SchweGELBin + ]; platforms = with platforms; linux; mainProgram = "rofi"; }; diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix deleted file mode 100644 index 25d0a69b7897..000000000000 --- a/pkgs/applications/misc/rofi/wayland.nix +++ /dev/null @@ -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; - }; -}) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index d861d7fde1a9..4e5bdeb34a14 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -12,13 +12,12 @@ findutils, gawk, gnused, + rofi, # wayland-only deps - rofi-wayland, pass-wayland, wl-clipboard, wtype, # x11-only deps - rofi, pass, xclip, xdotool, @@ -63,16 +62,15 @@ stdenv.mkDerivation { gnused libnotify pwgen + rofi util-linux ] ++ lib.optionals (backend == "x11") [ - rofi (pass.withExtensions (ext: [ ext.pass-otp ])) xclip xdotool ] ++ lib.optionals (backend == "wayland") [ - rofi-wayland (pass-wayland.withExtensions (ext: [ ext.pass-otp ])) wl-clipboard wtype diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 847f9e18bef3..d9387656098c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2121,6 +2121,9 @@ 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 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28c0060f60a4..40d102b06fbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12351,10 +12351,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; @@ -12844,10 +12840,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 {