From b5bf60dfab7186974f327ce3061cc895f48a3027 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 21 Mar 2023 13:24:45 -0400
Subject: [PATCH] tuckr: 0.7.0 -> 0.7.1

Diff: https://github.com/RaphGL/Tuckr/compare/0.7.0...0.7.1

Changelog: https://github.com/RaphGL/Tuckr/releases/tag/0.7.1
---
 pkgs/applications/misc/tuckr/default.nix      | 12 +++--
 .../misc/tuckr/update-cargo-lock.diff         | 49 -------------------
 2 files changed, 8 insertions(+), 53 deletions(-)
 delete mode 100644 pkgs/applications/misc/tuckr/update-cargo-lock.diff

diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix
index e3daca956c4..4223d6d9b44 100644
--- a/pkgs/applications/misc/tuckr/default.nix
+++ b/pkgs/applications/misc/tuckr/default.nix
@@ -2,24 +2,28 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tuckr";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
     rev = version;
-    sha256 = "sha256-mpI0iAGMIzGGdObH5bfyA3iioNdquzLDZoSWxbAOsJ0=";
+    sha256 = "sha256-47qnBGCiPWJGF4QcqjzmDIZWlCO3xE3QyIF6nSPGWAc=";
   };
 
-  cargoPatches = [ ./update-cargo-lock.diff ];
+  cargoHash = "sha256-IX7ZX4fKBK0wS7nlSdf/bVGzXl2GU7qwwmtPMoOe/m8=";
 
-  cargoSha256 = "sha256-tm8fS8IWxWF4Vh+3QaCiruglZijdOic34vfAyxflDNM=";
+  # Cargo.lock is outdated
+  preConfigure = ''
+    cargo update --offline
+  '';
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 
   meta = with lib; {
     description = "A super powered replacement for GNU Stow";
     homepage = "https://github.com/RaphGL/Tuckr";
+    changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ mimame ];
   };
diff --git a/pkgs/applications/misc/tuckr/update-cargo-lock.diff b/pkgs/applications/misc/tuckr/update-cargo-lock.diff
deleted file mode 100644
index 45fe445042f..00000000000
--- a/pkgs/applications/misc/tuckr/update-cargo-lock.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git i/Cargo.lock w/Cargo.lock
-index 5f5dd43..d7c8370 100644
---- i/Cargo.lock
-+++ w/Cargo.lock
-@@ -107,9 +107,9 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "4.1.4"
-+version = "4.1.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
- dependencies = [
-  "bitflags",
-  "clap_derive",
-@@ -248,9 +248,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
- 
- [[package]]
- name = "hermit-abi"
--version = "0.3.0"
-+version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "856b5cb0902c2b6d65d5fd97dfa30f9b70c7538e770b98eab5ed52d8db923e01"
-+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
- 
- [[package]]
- name = "inout"
-@@ -319,9 +319,9 @@ dependencies = [
- 
- [[package]]
- name = "once_cell"
--version = "1.17.0"
-+version = "1.17.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
- 
- [[package]]
- name = "opaque-debug"
-@@ -597,7 +597,7 @@ dependencies = [
- 
- [[package]]
- name = "tuckr"
--version = "0.6.1"
-+version = "0.7.0"
- dependencies = [
-  "chacha20poly1305",
-  "clap",