From 718abd311cf3eeb52603a63e12445306d791fd9a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 11 Apr 2023 22:55:18 +0000
Subject: [PATCH] sequoia: 0.27.0 -> 0.28.0

upstream changelog:
<https://gitlab.com/sequoia-pgp/sequoia/-/compare/sq%2Fv0.27.0...sq%2Fv0.28.0>

changes to the nix package:
- removes the cherry-picked 7916f90421 patch that made it into 0.28.0
- cherry-picks upstream commit 4dc6e624c2 which adds support for newer
  rust versions but didn't make the 0.28.0 release. see
  <https://github.com/NixOS/nixpkgs/pull/224806>
- adds an update script. future routine updates can be automated with
  `nix-shell maintainers/scripts/update.nix --argstr package sequoia`
---
 pkgs/tools/security/sequoia/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix
index f7f63f126bed..497c89448131 100644
--- a/pkgs/tools/security/sequoia/default.nix
+++ b/pkgs/tools/security/sequoia/default.nix
@@ -5,6 +5,7 @@
 , darwin
 , git
 , nettle
+, nix-update-script
 # Use the same llvmPackages version as Rust
 , llvmPackages_12
 , cargo
@@ -26,23 +27,22 @@ rustPlatform.buildRustPackage rec {
   pname = "sequoia";
   # Upstream has separate version numbering for the library and the CLI frontend.
   # This derivation provides the CLI frontend, and thus uses its version number.
-  version = "0.27.0";
+  version = "0.28.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia";
     rev = "sq/v${version}";
-    sha256 = "sha256-KhJAXpj47Tvds5SLYwnsNeIlPf9QEopoCzsvvHgCwaI=";
+    hash = "sha256-T7WOYMqyBeVHs+4w8El99t0NTUKqMW1QeAkNGKcaWr0=";
   };
 
-  cargoSha256 = "sha256-Y7iiZVIT9Vbe4YmTfGTU8p3H3odQKms2FBnnWgvF7mI=";
+  cargoHash = "sha256-zaAAEFBumfHU4hGzAOmLvBu3X4J7LAlmexqixHtVPr8=";
 
   patches = [
-    (fetchpatch
-      { url = "https://gitlab.com/sequoia-pgp/sequoia/-/commit/7916f90421ecb9a75e32f0284459bcc9a3fd02b0.patch";
-        sha256 = "sha256-KBBn6XaGzIT0iVzoCYsS0N+OkZzGuWmUmIF2hl49FEI=";
-      }
-    )
+    (fetchpatch {
+      url = "https://gitlab.com/sequoia-pgp/sequoia/-/commit/4dc6e624c2394936dc447f18aedb4a4810bb2ddb.patch";
+      hash = "sha256-T6hh7U1gvKvyn/OCuJBvLM7TG1VFnpvpAiWS72m3P6I=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -103,6 +103,8 @@ rustPlatform.buildRustPackage rec {
   checkPhase = null;
   installPhase = null;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "A cool new OpenPGP implementation";
     homepage = "https://sequoia-pgp.org/";