From b1c5515a1ce89226431804984143e917db479f51 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 21 Aug 2022 09:06:28 +0800
Subject: [PATCH 1/2] kanata: 1.0.6 -> 1.0.7
---
pkgs/tools/system/kanata/default.nix | 23 ++++-------------------
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/pkgs/tools/system/kanata/default.nix b/pkgs/tools/system/kanata/default.nix
index 08023b0e0326..e83542071e73 100644
--- a/pkgs/tools/system/kanata/default.nix
+++ b/pkgs/tools/system/kanata/default.nix
@@ -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 ];
From 9f4e8ea56dadd3431794af55a7dfa33dfd3228c3 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sun, 21 Aug 2022 09:07:14 +0800
Subject: [PATCH 2/2] nixos/kanata: remove redundant `lib`
---
nixos/modules/services/hardware/kanata.nix | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nixos/modules/services/hardware/kanata.nix b/nixos/modules/services/hardware/kanata.nix
index ccba87531e66..ca4bb7a7f1f1 100644
--- a/nixos/modules/services/hardware/kanata.nix
+++ b/nixos/modules/services/hardware/kanata.nix
@@ -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 ];
}