From 9eaec29fad36328cb42eae6135e1bedcaf7359f6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 9 Aug 2024 15:39:02 +0200
Subject: [PATCH] onefetch: 2.20.0 -> 2.21.0

Required to build with Rust 1.80.

Link: https://github.com/rust-lang/rust/issues/127343
---
 pkgs/tools/misc/onefetch/default.nix           |  6 +++---
 pkgs/tools/misc/onefetch/zstd-pkg-config.patch | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix
index 0e7175e6365a..2436b68da434 100644
--- a/pkgs/tools/misc/onefetch/default.nix
+++ b/pkgs/tools/misc/onefetch/default.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "onefetch";
-  version = "2.20.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "o2sh";
     repo = pname;
     rev = version;
-    hash = "sha256-aQeKzOxRlSGuVewh3HEx1M12vmaxhy6ImnqMDc5b0DI=";
+    hash = "sha256-KQs7b+skXQhHbfHIJkgowNY2FB6oS2V8TQFdkmElC/k=";
   };
 
-  cargoHash = "sha256-g+fTmZGyPkQLgnJ9Bb4sLTfDMPPBRA+s6f3OxXTKwsM=";
+  cargoHash = "sha256-gKA1MMahoaDFia8LR33GG3jRttZzHwpUpFawlCQcy7g=";
 
   cargoPatches = [
     # enable pkg-config feature of zstd
diff --git a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
index 9bfc271dc912..5e85a34d718b 100644
--- a/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
+++ b/pkgs/tools/misc/onefetch/zstd-pkg-config.patch
@@ -1,22 +1,22 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index f6d5b6c..a631bbf 100644
+index dd0e3e1..5738ec1 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -2544,6 +2544,7 @@ dependencies = [
+@@ -2829,6 +2829,7 @@ dependencies = [
+  "tokei",
   "typetag",
   "winres",
-  "yaml-rust",
 + "zstd",
  ]
  
  [[package]]
 diff --git a/Cargo.toml b/Cargo.toml
-index b77f70d..861f1ac 100644
+index a0a2777..ad146cb 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -65,6 +65,7 @@ tokei = "12.1.2"
+@@ -65,6 +65,7 @@ time-humanize = { version = "0.1.3", features = ["time"] }
+ tokei = "12.1.2"
  typetag = "0.2"
- yaml-rust = "0.4.5"
  parking_lot = "0.12"
 +zstd = { version = "*", features = ["pkg-config"] }