From c73ac9488224edaa7ace0de012a009ace3b42eaf Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Thu, 13 Jun 2024 18:43:01 +0800
Subject: [PATCH 1/2] canfigger: init at 0.3.0

---
 pkgs/by-name/ca/canfigger/package.nix | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/ca/canfigger/package.nix

diff --git a/pkgs/by-name/ca/canfigger/package.nix b/pkgs/by-name/ca/canfigger/package.nix
new file mode 100644
index 000000000000..dd563cffb6e2
--- /dev/null
+++ b/pkgs/by-name/ca/canfigger/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "canfigger";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "andy5995";
+    repo = "canfigger";
+    rev = "v${version}";
+    hash = "sha256-S2rEQT8wKSjJ7LFF6vcigqb9r5QR/nNUCzNdhuBNjTo=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  # canfigger has asan and ubsan enabled by default, disable it here
+  mesonFlags = [
+    "-Dcanfigger:b_sanitize=none"
+  ];
+
+  meta = {
+    description = "Lightweight library designed to parse configuration files";
+    homepage = "https://github.com/andy5995/canfigger";
+    changelog = "https://github.com/andy5995/canfigger/blob/${src.rev}/ChangeLog.txt";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ iynaix ];
+    mainProgram = "canfigger";
+    platforms = lib.platforms.all;
+  };
+}

From 277cfdb61b6c934f5b4f242bb37c80fb4bd5d368 Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Tue, 11 Nov 2025 16:44:23 +0800
Subject: [PATCH 2/2] rmw: 0.9.1 -> 0.9.4

Changelog: https://github.com/theimpossibleastronaut/rmw/releases/tag/v0.9.4
---
 pkgs/by-name/rm/rmw/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/rm/rmw/package.nix b/pkgs/by-name/rm/rmw/package.nix
index f502134f6728..4aae0d64e475 100644
--- a/pkgs/by-name/rm/rmw/package.nix
+++ b/pkgs/by-name/rm/rmw/package.nix
@@ -5,19 +5,20 @@
   meson,
   ninja,
   pkg-config,
+  canfigger,
   ncurses,
   gettext,
 }:
 
 stdenv.mkDerivation rec {
   pname = "rmw";
-  version = "0.9.1";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "theimpossibleastronaut";
     repo = "rmw";
     tag = "v${version}";
-    hash = "sha256-rfJdJHSkusZj/PN74KgV5i36YC0YRZmIfRdvkUNoKEM=";
+    hash = "sha256-/bE9fFjn3mPfUbtsB6bXfQAxUtbtuZiT4pevi5RCQA4=";
     fetchSubmodules = true;
   };
 
@@ -28,15 +29,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    canfigger
     ncurses
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin gettext;
 
-  # The subproject "canfigger" has asan and ubsan enabled by default, disable it here
-  mesonFlags = [
-    "-Dcanfigger:b_sanitize=none"
-  ];
-
   meta = {
     description = "Trashcan/ recycle bin utility for the command line";
     homepage = "https://github.com/theimpossibleastronaut/rmw";