From bfbd17b6e1b5f8ef007b8c44fa824f450a657650 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 18 Jun 2025 12:44:38 +0200
Subject: [PATCH 1/3] kbd: set strictDeps, and put bash explicitly in
 buildInputs for wrapping

---
 pkgs/by-name/kb/kbd/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index c85e05fc552f..734931a4b972 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -8,6 +8,7 @@
   flex,
   check,
   pam,
+  bash,
   coreutils,
   gzip,
   bzip2,
@@ -85,6 +86,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     check
     pam
+    bash
   ];
   NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit";
   nativeBuildInputs = [
@@ -92,6 +94,7 @@ stdenv.mkDerivation rec {
     pkg-config
     flex
   ];
+  strictDeps = true;
 
   passthru.tests = {
     inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;

From 75c8f84d1f6aeddd25601e820cb8d6ce115d3409 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 20 Jun 2025 17:54:04 +0300
Subject: [PATCH 2/3] kbd: use --replace-fail in unicode_{start,stop} scripts

---
 pkgs/by-name/kb/kbd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 734931a4b972..194d713a0c1f 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for i in $out/bin/unicode_{start,stop}; do
       substituteInPlace "$i" \
-        --replace /usr/bin/tty ${coreutils}/bin/tty
+        --replace-fail /usr/bin/tty ${coreutils}/bin/tty
     done
   '';
 

From 298d39ede3dd9abfbc3b58c6e39758ce0f83e57a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 18 Jun 2025 12:37:17 +0200
Subject: [PATCH 3/3] kbd: split man & scripts outputs

---
 doc/release-notes/rl-2511.section.md | 4 +---
 pkgs/by-name/kb/kbd/package.nix      | 7 +++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index d635e04b5941..39175de9d652 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -19,11 +19,9 @@
 - `gentium` package now provides `Gentium-*.ttf` files, and not `GentiumPlus-*.ttf` files like before. The font identifiers `Gentium Plus*` are available in the `gentium-plus` package, and if you want to use the more recently updated package `gentium` [by sil](https://software.sil.org/gentium/), you should update your configuration files to use the `Gentium` font identifier.
 - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
 - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.
-
 - Derivations setting both `separateDebugInfo` and one of `allowedReferences`, `allowedRequistes`, `disallowedReferences` or `disallowedRequisites` must now set `__structuredAttrs` to `true`. The effect of reference whitelisting or blacklisting will be disabled on the `debug` output created by `separateDebugInfo`.
-
 - `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.
-
+- `kbd` package's `outputs` now include a `man` and `scripts` outputs. The `unicode_start` and `unicode_stop` Bash scripts are now part of the `scripts` output, allowing most usages of the `kbd` package to not pull in `bash`.
 - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
 
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 194d713a0c1f..1d9c0cf235ee 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
     "out"
     "vlock"
     "dev"
+    "scripts"
+    "man"
   ];
 
   configureFlags =
@@ -77,9 +79,10 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    for i in $out/bin/unicode_{start,stop}; do
-      substituteInPlace "$i" \
+    for s in unicode_{start,stop}; do
+      substituteInPlace ''${!outputBin}/bin/$s \
         --replace-fail /usr/bin/tty ${coreutils}/bin/tty
+      moveToOutput "bin/$s" "$scripts"
     done
   '';