From 68be0c72ee3545f9bc71142a3ebd31376e9de056 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@sb.org>
Date: Thu, 20 Jun 2019 17:02:46 -0700
Subject: [PATCH] ffsend: 0.2.46 -> 0.2.48

---
 pkgs/tools/misc/ffsend/Cargo.lock.patch | 13 -------------
 pkgs/tools/misc/ffsend/default.nix      |  9 +++------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/tools/misc/ffsend/Cargo.lock.patch

diff --git a/pkgs/tools/misc/ffsend/Cargo.lock.patch b/pkgs/tools/misc/ffsend/Cargo.lock.patch
deleted file mode 100644
index 4d95a43cfb0..00000000000
--- a/pkgs/tools/misc/ffsend/Cargo.lock.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 2344bfd..08413d8 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -614,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "ffsend"
--version = "0.2.45"
-+version = "0.2.46"
- dependencies = [
-  "chbs 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix
index 2eca6de7b61..81e96d2dbde 100644
--- a/pkgs/tools/misc/ffsend/default.nix
+++ b/pkgs/tools/misc/ffsend/default.nix
@@ -16,25 +16,22 @@ with rustPlatform;
 
 buildRustPackage rec {
   pname = "ffsend";
-  version = "0.2.46";
+  version = "0.2.48";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "ffsend";
     rev = "v${version}";
-    sha256 = "048kmhy8l2dy7v1b3vzlhcw5qhnz82y1wki6wpd2nz8siyd7dnpi";
+    sha256 = "0hs74z76yayv3hxcpcfb1bsyq6dclyri7q7siap98nxlv650896n";
   };
 
-  cargoSha256 = "09i44vpxbww972zyv393xxwk7wz26cnqzq4gi1mg4703h02jkpjk";
+  cargoSha256 = "1hkdpzz2q2lqnq15gr1npipmbvdda637ylgkzn443bl09jd3j1q6";
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ openssl ]
   ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ])
   ;
 
-  # Patch for v0.2.45 only
-  patches = [ ./Cargo.lock.patch ];
-
   preBuild = stdenv.lib.optionalString (x11Support && usesX11) (
     if preferXsel && xsel != null then ''
       export XSEL_PATH="${xsel}/bin/xsel"