kbd: split man & scripts outputs (#417804)

This commit is contained in:
Doron Behar
2025-07-22 10:22:38 +03:00
committed by GitHub
2 changed files with 10 additions and 6 deletions
+1 -3
View File
@@ -20,11 +20,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).
- `stdenv.mkDerivation` and other derivation builders that use it no longer allow the value of `env` to be anything but an attribute set, for the purpose of setting environment variables that are available to the [builder](https://nix.dev/manual/nix/latest/store/derivation/#builder) process. An environment variable called `env` can still be provided by means of `mkDerivation { env.env = ...; }`, though we recommend to use a more specific name than "env".
+9 -3
View File
@@ -8,6 +8,7 @@
flex,
check,
pam,
bash,
coreutils,
gzip,
bzip2,
@@ -31,6 +32,8 @@ stdenv.mkDerivation rec {
"out"
"vlock"
"dev"
"scripts"
"man"
];
configureFlags =
@@ -78,15 +81,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
postInstall = ''
for i in $out/bin/unicode_{start,stop}; do
substituteInPlace "$i" \
--replace /usr/bin/tty ${coreutils}/bin/tty
for s in unicode_{start,stop}; do
substituteInPlace ''${!outputBin}/bin/$s \
--replace-fail /usr/bin/tty ${coreutils}/bin/tty
moveToOutput "bin/$s" "$scripts"
done
'';
buildInputs = [
check
pam
bash
];
NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isStatic "-laudit";
nativeBuildInputs = [
@@ -94,6 +99,7 @@ stdenv.mkDerivation rec {
pkg-config
flex
];
strictDeps = true;
passthru.tests = {
inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;