b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

kbd: 2.6.1 -> 2.6.2

Browse source 
While at it added trivial updater.

Changes: https://github.com/legionus/kbd/releases/tag/v2.6.2
This commit is contained in:
Sergei Trofimovich 2023-08-19 12:17:44 +01:00
parent 50a4d6349c
commit e7f7c7ba79
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/os-specific/linux/kbd/default.nix
View file

@ -12,15 +12,16 @@
, bzip2 , bzip2
, xz , xz
, zstd , zstd
, gitUpdater
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "kbd"; pname = "kbd";
version = "2.6.1"; version = "2.6.2";
src = fetchurl { src = fetchurl {
url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
sha256 = "sha256-LrbGyXK+lYm6tzMnW/AgvrX2RNX5Q5c3kg5wGvbPNIU="; sha256 = "sha256-M+O7PD9VkzsQ8FOxS19pouJMKFQ+nsdpAkb+R2KN2U8=";
}; };
# vlock is moved into its own output, since it depends on pam. This # vlock is moved into its own output, since it depends on pam. This
@ -79,7 +80,14 @@ stdenv.mkDerivation rec {
passthru.tests = { passthru.tests = {
inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch; inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
}; };
passthru.gzip = gzip; passthru = {
gzip = gzip;
updateScript = gitUpdater {
# No nicer place to find latest release.
url = "https://github.com/legionus/kbd.git";
rev-prefix = "v";
};
};
meta = with lib; { meta = with lib; {
homepage = "https://kbd-project.org/"; homepage = "https://kbd-project.org/";

3
pkgs/os-specific/linux/kbd/search-paths.patch
View file

@ -52,10 +52,9 @@ Without this patch, kbd will only look inside
}; };
--- a/src/loadkeys.c --- a/src/loadkeys.c
+++ b/src/loadkeys.c +++ b/src/loadkeys.c
@@ -27,6 +27,7 @@ @@ -27,5 +27,6 @@
static const char *const dirpath1[] = { static const char *const dirpath1[] = {
"",
+ "/etc/kbd/" KEYMAPDIR "/**", + "/etc/kbd/" KEYMAPDIR "/**",
DATADIR "/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**",
KERNDIR "/", KERNDIR "/",