diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-08-19 12:17:44 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-08-19 12:20:24 +0100 |
| commit | e7f7c7ba79ef62450a8fe91b91d91746211223af (patch) | |
| tree | 56ce0acca8bee1df8da6354dd3545f44d5a9581f /pkgs/os-specific/linux/kbd | |
| parent | 50a4d6349c0e6a3610608f23bd66b2d0aaa47d2f (diff) | |
kbd: 2.6.1 -> 2.6.2
While at it added trivial updater. Changes: https://github.com/legionus/kbd/releases/tag/v2.6.2
Diffstat (limited to 'pkgs/os-specific/linux/kbd')
| -rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kbd/search-paths.patch | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index c19646ac529a7..1c38f4b7f4913 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -12,15 +12,16 @@ , bzip2 , xz , zstd +, gitUpdater }: stdenv.mkDerivation rec { pname = "kbd"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { 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 @@ -79,7 +80,14 @@ stdenv.mkDerivation rec { passthru.tests = { 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; { homepage = "https://kbd-project.org/"; diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch index 3b337ca7cc2b8..fad33be45bdcd 100644 --- a/pkgs/os-specific/linux/kbd/search-paths.patch +++ b/pkgs/os-specific/linux/kbd/search-paths.patch @@ -52,10 +52,9 @@ Without this patch, kbd will only look inside }; --- a/src/loadkeys.c +++ b/src/loadkeys.c -@@ -27,6 +27,7 @@ +@@ -27,5 +27,6 @@ static const char *const dirpath1[] = { - "", + "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", |