mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
kbd: 2.6.1 -> 2.6.2
While at it added trivial updater. Changes: https://github.com/legionus/kbd/releases/tag/v2.6.2
This commit is contained in:
parent
50a4d6349c
commit
e7f7c7ba79
2 changed files with 12 additions and 5 deletions
|
@ -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/";
|
||||
|
|
|
@ -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 "/",
|
||||
|
|
Loading…
Reference in a new issue