From efec599fe91d7073e52393f49511ec39a6e24d7b Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 14 Aug 2025 07:06:55 -0700
Subject: [PATCH 1/2] qrtool: 0.11.8 -> 0.12.1

Diff: https://github.com/sorairolake/qrtool/compare/v0.11.8...v0.12.1

Changelog: https://sorairolake.github.io/qrtool/book/changelog.html
---
 pkgs/by-name/qr/qrtool/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 9d653306d5f2..e37319207474 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "qrtool";
-  version = "0.11.8";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
     rev = "v${version}";
-    hash = "sha256-f/2AaNnojtZMhJod6ukLwEq+Bsu6O2oTD9OWGL8IS80=";
+    hash = "sha256-I/LyDHV3pbRj+utzJBLvkgstEOodLkvfQT6uMLnOEgM=";
   };
 
-  cargoHash = "sha256-wXs3Y0g+inUU3Qho5UhZOJhNDs65HS6FjPdZQBuwLM0=";
+  cargoHash = "sha256-c1sw0zyJZDvJe3Hcn1W4UPkqTKqRhywHpR6HLrqAN+A=";
 
   nativeBuildInputs = [
     asciidoctor
@@ -28,13 +28,12 @@ rustPlatform.buildRustPackage rec {
   postInstall = ''
     # Built by ./build.rs using `asciidoctor`
     installManPage ./target/*/release/build/qrtool*/out/*.?
-
   ''
   + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd qrtool \
-      --bash <($out/bin/qrtool --generate-completion bash) \
-      --fish <($out/bin/qrtool --generate-completion fish) \
-      --zsh <($out/bin/qrtool --generate-completion zsh)
+      --bash <($out/bin/qrtool completion bash) \
+      --fish <($out/bin/qrtool completion fish) \
+      --zsh <($out/bin/qrtool completion zsh)
   '';
 
   meta = with lib; {

From 751f92d3c8fb6685e1835b8b4aa83bf54cbd4e07 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 14 Aug 2025 07:14:10 -0700
Subject: [PATCH 2/2] qrtool: use finalAttrs, tag, and no with lib

---
 pkgs/by-name/qr/qrtool/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index e37319207474..c03d8286d37f 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -7,14 +7,14 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qrtool";
   version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-I/LyDHV3pbRj+utzJBLvkgstEOodLkvfQT6uMLnOEgM=";
   };
 
@@ -36,12 +36,12 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/qrtool completion zsh)
   '';
 
-  meta = with lib; {
-    maintainers = with maintainers; [ philiptaron ];
+  meta = {
     description = "Utility for encoding and decoding QR code images";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://sorairolake.github.io/qrtool/book/index.html";
     changelog = "https://sorairolake.github.io/qrtool/book/changelog.html";
     mainProgram = "qrtool";
+    maintainers = with lib.maintainers; [ philiptaron ];
   };
-}
+})