From 20b6c326e50e30c061f7b269bcbc3f8573e2e9b0 Mon Sep 17 00:00:00 2001 From: poz Date: Mon, 6 Jul 2026 12:16:34 +0200 Subject: [PATCH 1/2] kanata: 1.11.0 -> 1.12.0 --- pkgs/by-name/ka/kanata/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 2cc8f653c30a..ce66da16921d 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -16,16 +16,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "kanata"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "jtroo"; repo = "kanata"; rev = "v${finalAttrs.version}"; - hash = "sha256-7rGV0nfI/ntvByz3NQs/2Sa2q/Ml8O3XRD14Mbt5fIU="; + hash = "sha256-WjdmjgEMoo3QNqT4yWxaKOkfuRLdNg4Im+V1Hy5vWgY="; }; - cargoHash = "sha256-Qxa90fMZ3c1+jlyxbIkC94DtSQSKFNr2V8GiLII6PNc="; + cargoHash = "sha256-4UBN4I35ZPPPL68LxxPna9Fs9sATCiwoTbWgHYwqOjs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ (writeShellScriptBin "sw_vers" '' @@ -39,6 +39,11 @@ rustPlatform.buildRustPackage (finalAttrs: { install -Dm 444 assets/kanata-icon.svg $out/share/icons/hicolor/scalable/apps/kanata.svg ''; + checkFlags = [ + # these try to access /dev/uinput and won't work in the build sandbox + "--skip=kanata::tcp_layer_change_tests" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook From bf0349bdf8ab9255f25b7d3edb1914777d111dea Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 11 Jul 2026 08:27:21 +0800 Subject: [PATCH 2/2] kanata: download crate via CDN instead of API in updateScript API has rate limit and requires user-agent while CDN does not. https://crates.io/data-access#crate-content --- pkgs/by-name/ka/kanata/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ka/kanata/update.sh b/pkgs/by-name/ka/kanata/update.sh index b8aaab495676..d49363899ab9 100644 --- a/pkgs/by-name/ka/kanata/update.sh +++ b/pkgs/by-name/ka/kanata/update.sh @@ -3,7 +3,7 @@ nix-update importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)" NEW_VERSION=$(nix-instantiate --eval -E "with $importTree; kanata.version" | tr -d '"') karabinerDriverCrateVersion="$(curl -L "https://raw.githubusercontent.com/jtroo/kanata/refs/tags/v$NEW_VERSION/Cargo.lock" | tomlq | jq --raw-output '.package[] | select(.name | test("karabiner-driverkit")) |.version')" -newKarabinerDkVersion="$(curl -L "https://crates.io/api/v1/crates/karabiner-driverkit/$karabinerDriverCrateVersion/download" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)" +newKarabinerDkVersion="$(curl -L "https://static.crates.io/crates/karabiner-driverkit/karabiner-driverkit-$karabinerDriverCrateVersion.crate" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)" oldDarwinVersion=$(nix-instantiate --eval -E "with $importTree; kanata.passthru.darwinDriverVersion" | tr -d '"') nixFile=$(nix-instantiate --eval --strict -A "kanata.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') sed -i "$nixFile" -re "s|\"$oldDarwinVersion\"|\"$newKarabinerDkVersion\"|"