BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #187670 from linj-fork/pr/bump-kanata

Browse source
This commit is contained in:
Sandro 2022-08-21 18:21:05 +02:00 committed by GitHub
commit b957b84842
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/hardware/kanata.nix
View file

@ -180,8 +180,8 @@ in
package = mkOption {
type = types.package;
default = pkgs.kanata;
defaultText = lib.literalExpression "pkgs.kanata";
example = lib.literalExpression "pkgs.kanata-with-cmd";
defaultText = literalExpression "pkgs.kanata";
example = literalExpression "pkgs.kanata-with-cmd";
description = mdDoc ''
The kanata package to use.
@ -198,7 +198,7 @@ in
};
};
config = lib.mkIf cfg.enable {
config = mkIf cfg.enable {
hardware.uinput.enable = true;
systemd = {
@ -211,5 +211,5 @@ in
};
};
meta.maintainers = with lib.maintainers; [ linj ];
meta.maintainers = with maintainers; [ linj ];
}

23
pkgs/tools/system/kanata/default.nix
View file

@ -1,41 +1,26 @@
{ fetchFromGitHub
, fetchpatch
, lib
, libevdev
, pkg-config
, rustPlatform
, withCmd ? false
}:
rustPlatform.buildRustPackage rec {
pname = "kanata";
version = "1.0.6";
version = "1.0.7";
src = fetchFromGitHub {
owner = "jtroo";
repo = pname;
rev = "v${version}";
sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw=";
sha256 = "sha256-2gGFAz0zXea+27T4ayDj6KdoI0ThwXV7U0CspHduTiQ=";
};
cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc=";
cargoPatches = [
(fetchpatch {
name = "update-cargo.lock-for-1.0.6.patch";
url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch";
sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw=";
})
];
cargoHash = "sha256-0NvZATdPABIboL5xvmBmDbqPPWvO4mM6wVB3FrOVHIQ=";
buildFeatures = lib.optional withCmd "cmd";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libevdev ];
meta = with lib; {
description = "A cross-platform advanced keyboard customization tool";
description = "A tool to improve keyboard comfort and usability with advanced customization";
homepage = "https://github.com/jtroo/kanata";
license = licenses.lgpl3Only;
maintainers = with maintainers; [ linj ];