diff options
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 10 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2111.section.md | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/rofi/default.nix | 55 |
4 files changed, 62 insertions, 11 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c3645e81fe87..09c65a77fde0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1324,6 +1324,12 @@ githubId = 7346933; name = "betaboon"; }; + bew = { + email = "benoit.dechezelles@gmail.com"; + github = "bew"; + githubId = 9730330; + name = "Benoit de Chezelles"; + }; bfortz = { email = "bernard.fortz@gmail.com"; github = "bfortz"; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 57aa415666cf..1b0371a0179a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -1111,6 +1111,16 @@ Superuser created successfully. make the apps fit better visually. </para> </listitem> + <listitem> + <para> + <literal>rofi</literal> has been updated from + <quote>1.6.1</quote> to <quote>1.7.0</quote>, one important + thing is the removal of the old xresources based configuration + setup. Read more + <link xlink:href="https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1">in + rofi’s changelog</link>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1d0f8fba320d..3df77d21d827 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -318,3 +318,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax. - GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually. + +- `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1). diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index d47d1fe26a61..12daea00cad3 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,16 +1,35 @@ -{ stdenv, lib, fetchurl -, autoreconfHook, pkg-config, libxkbcommon, pango, which, git -, cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification -, bison, flex, librsvg, check +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, libxkbcommon +, pango +, which +, git +, cairo +, libxcb +, xcbutil +, xcbutilwm +, xcbutilxrm +, xcb-util-cursor +, libstartup_notification +, bison +, flex +, librsvg +, check }: stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.6.1"; + version = "1.7.0"; - src = fetchurl { - url = "https://github.com/davatorium/rofi/releases/download/${version}/rofi-${version}.tar.gz"; - sha256 = "04glljqbf9ckkc6x6fv4x1gqmy468n1agya0kd8rxdvz24wzf7cd"; + src = fetchFromGitHub { + owner = "davatorium"; + repo = "rofi"; + rev = version; + fetchSubmodules = true; + sha256 = "03wdy56b3g8p2czb0qydrddyyhj3x037pirnhyqr5qbfczb9a63v"; }; preConfigure = '' @@ -20,8 +39,22 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check - libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which + buildInputs = [ + libxkbcommon + pango + cairo + git + bison + flex + librsvg + check + libstartup_notification + libxcb + xcbutil + xcbutilwm + xcbutilxrm + xcb-util-cursor + which ]; doCheck = false; @@ -30,7 +63,7 @@ stdenv.mkDerivation rec { description = "Window switcher, run dialog and dmenu replacement"; homepage = "https://github.com/davatorium/rofi"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bew ]; platforms = with platforms; linux; }; } |