From 7a0b34fa71dabd645beeba4c9f16047ec5a74b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <davidslt+git@pm.me>
Date: Sat, 27 Jul 2024 00:51:37 +0100
Subject: [PATCH 1/2] kontroll: init at 1.0.1

---
 pkgs/by-name/ko/kontroll/package.nix | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/ko/kontroll/package.nix

diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix
new file mode 100644
index 000000000000..cb3a28733cf8
--- /dev/null
+++ b/pkgs/by-name/ko/kontroll/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  protobuf,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "kontroll";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "zsa";
+    repo = "kontroll";
+    rev = version;
+    hash = "sha256-k7Twbjl8umk3PeIv3ivCLdhZFgTTV8WdfIAoGAD/pEk=";
+  };
+
+  cargoHash = "sha256-931PmSvcXTjxdIQUCSxLwFnaHgRrFzA/v6yYTvkjNoQ=";
+
+  nativeBuildInputs = [ protobuf ];
+
+  meta = with lib; {
+    description = "Kontroll demonstates how to control the Keymapp API, making it easy to control your ZSA keyboard from the command line and scripts";
+    homepage = "https://github.com/zsa/kontroll";
+    license = licenses.mit;
+    maintainers = with maintainers; [ davsanchez ];
+    mainProgram = "kontroll";
+  };
+}

From 5f59cd75a2da4b707589473de2ea3e8aa1047ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20S=C3=A1nchez?= <davidslt+git@pm.me>
Date: Wed, 31 Jul 2024 15:18:55 +0100
Subject: [PATCH 2/2] style: remove overuse of `with lib;`

Co-authored-by: Yohann Boniface <edhyjox@gmail.com>
---
 pkgs/by-name/ko/kontroll/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ko/kontroll/package.nix b/pkgs/by-name/ko/kontroll/package.nix
index cb3a28733cf8..ff169a1c86a0 100644
--- a/pkgs/by-name/ko/kontroll/package.nix
+++ b/pkgs/by-name/ko/kontroll/package.nix
@@ -20,11 +20,11 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ protobuf ];
 
-  meta = with lib; {
+  meta = {
     description = "Kontroll demonstates how to control the Keymapp API, making it easy to control your ZSA keyboard from the command line and scripts";
     homepage = "https://github.com/zsa/kontroll";
-    license = licenses.mit;
-    maintainers = with maintainers; [ davsanchez ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ davsanchez ];
     mainProgram = "kontroll";
   };
 }