From a1f9f852f1f30568ad5c2cec8615bac5c81ab3e9 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 13 Jun 2025 10:10:32 +0200 Subject: [PATCH 1/2] rmenu: add update script --- pkgs/by-name/rm/rmenu/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix index cd3d3fb2a700..7f77fbe986be 100644 --- a/pkgs/by-name/rm/rmenu/package.nix +++ b/pkgs/by-name/rm/rmenu/package.nix @@ -9,6 +9,7 @@ rustPlatform, webkitgtk_4_1, wrapGAppsHook3, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "rmenu"; @@ -61,7 +62,7 @@ rustPlatform.buildRustPackage rec { # fix config and theme mkdir -p $out/share/rmenu cp -vf $src/rmenu/public/config.yaml $out/share/rmenu/config.yaml - substituteInPlace $out/share/rmenu/config.yaml --replace "~/.config/rmenu" "$out" + substituteInPlace $out/share/rmenu/config.yaml --replace-fail "~/.config/rmenu" "$out" ln -sf $out/themes/dark.css $out/share/rmenu/style.css ''; @@ -75,6 +76,8 @@ rustPlatform.buildRustPackage rec { ) ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/imgurbot12/rmenu/releases/tag/v${version}"; description = "Another customizable Application-Launcher written in Rust"; From f597d95bb01fd637a5f001df803ac27de92755b4 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Fri, 13 Jun 2025 10:15:38 +0200 Subject: [PATCH 2/2] rmenu: 1.2.2 -> 1.3.0 Changelog: https://github.com/imgurbot12/rmenu/releases/tag/v1.3.0 --- pkgs/by-name/rm/rmenu/package.nix | 33 +++++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix index 7f77fbe986be..559d14d77616 100644 --- a/pkgs/by-name/rm/rmenu/package.nix +++ b/pkgs/by-name/rm/rmenu/package.nix @@ -1,4 +1,5 @@ { + cmake, fetchFromGitHub, glib, gtk3, @@ -7,23 +8,26 @@ networkmanager, pkg-config, rustPlatform, + versionCheckHook, webkitgtk_4_1, wrapGAppsHook3, + xdotool, nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "rmenu"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { - rev = "v${version}"; + tag = "v${version}"; owner = "imgurbot12"; repo = "rmenu"; - hash = "sha256-khauloUGVuekR+Lran1DLnsxwY8sIf5PsEKY7sNy1K4="; + hash = "sha256-cmuB7JfHQuDFo8YaenTDwpe+TxKFaoJM5YwrT7eAfPM="; }; nativeBuildInputs = [ pkg-config + cmake wrapGAppsHook3 ]; @@ -33,19 +37,19 @@ rustPlatform.buildRustPackage rec { libsoup_3 networkmanager webkitgtk_4_1 + xdotool ]; strictDeps = true; useFetchCargoVendor = true; - cargoHash = "sha256-9sKcvVN14gfR30FvF8/esdJoIbSgHUl/aHRBWA8DRWg="; + cargoHash = "sha256-FIlFy3/Hih40My5fTykYjvaQEmnB3ZC5vX3lfKdW9Gk="; postInstall = '' # copy themes and plugins - mkdir $out/themes - mkdir $out/plugins - cp -vfr $src/themes/* $out/themes/. - cp -vfr $src/other-plugins/* $out/plugins/. + mkdir -p $out/themes $out/plugins/css + cp -vfr $src/themes/* $out/themes + cp -vfr $src/plugins/misc/* $out/plugins mv $out/bin/* $out/plugins # everything is a plugin by default # rmenu and rmenu-build are actual binaries @@ -53,15 +57,15 @@ rustPlatform.buildRustPackage rec { mv $out/plugins/rmenu-build $out/bin/rmenu-build # fix plugin names - # desktop network pactl-audio.sh powermenu.sh run window - mv $out/plugins/run $out/plugins/rmenu-run - mv $out/plugins/desktop $out/plugins/rmenu-desktop - mv $out/plugins/network $out/plugins/rmenu-network - mv $out/plugins/window $out/plugins/rmenu-window + # desktop network pactl-audio.sh powermenu.sh run window emoji search + for plugin in desktop emoji files network run search window ; do + mv $out/plugins/$plugin $out/plugins/rmenu-$plugin + done # fix config and theme mkdir -p $out/share/rmenu cp -vf $src/rmenu/public/config.yaml $out/share/rmenu/config.yaml + cp -vf $src/plugins/emoji/css/* $out/plugins/css substituteInPlace $out/share/rmenu/config.yaml --replace-fail "~/.config/rmenu" "$out" ln -sf $out/themes/dark.css $out/share/rmenu/style.css ''; @@ -76,6 +80,9 @@ rustPlatform.buildRustPackage rec { ) ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + passthru.updateScript = nix-update-script { }; meta = {