From 44d87679dc7e225614c19809fd4254c020df8dd7 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 24 Mar 2025 11:02:44 +0900
Subject: [PATCH 1/3] sequoia-sq: 1.1.0 -> 1.3.0

Diff: https://gitlab.com/sequoia-pgp/sequoia-sq/-/compare/v1.1.0...v1.3.0

Changelog: https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/f942696665bd845933066591291286a2b51f66ce/NEWS#L5-32

* Remove outdated skipping test
* Add missing SSL_CERT_FILE to pass tests since 1.2.0
---
 pkgs/by-name/se/sequoia-sq/package.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index 0eb2017dc08b..e59d0e84cfe3 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -10,22 +10,23 @@
   capnproto,
   installShellFiles,
   openssl,
+  cacert,
   sqlite,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "sequoia-sq";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
     rev = "v${version}";
-    hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU=";
+    hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-a+3oKORX88SfMw4/QA6+Ls12koZIw0iadTulCzGlr6U=";
+  cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s=";
 
   nativeBuildInputs = [
     pkg-config
@@ -48,14 +49,11 @@ rustPlatform.buildRustPackage rec {
       ]
     );
 
-  checkFlags = [
-    # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/297
-    "--skip=sq_autocrypt_import"
-  ];
-
   # Needed for tests to be able to create a ~/.local/share/sequoia directory
+  # Needed for avoiding "OpenSSL error" since 1.2.0
   preCheck = ''
     export HOME=$(mktemp -d)
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
   '';
 
   env.ASSET_OUT_DIR = "/tmp/";

From 097ad426efb6a3f6cd197fc9d5e03239cf6741b8 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 24 Mar 2025 11:07:11 +0900
Subject: [PATCH 2/3] sequoia-sq: migrate to tag in fetcher and finalAttrs

Co-authored-by: awwpotato <awwpotato@voidq.com>
Co-authored-by: Doron Behar <doron.behar@gmail.com>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index e59d0e84cfe3..ea861950a2e4 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -14,14 +14,14 @@
   sqlite,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sequoia-sq";
   version = "1.3.0";
 
   src = fetchFromGitLab {
     owner = "sequoia-pgp";
     repo = "sequoia-sq";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0=";
   };
 
@@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Cool new OpenPGP implementation";
     homepage = "https://sequoia-pgp.org/";
-    changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS";
+    changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${finalAttrs.version}/NEWS";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       minijackson
@@ -83,4 +83,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "sq";
   };
-}
+})

From a7c2773f502895d28ee111b246e5495734d42372 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Mon, 24 Mar 2025 10:52:58 +0900
Subject: [PATCH 3/3] sequoia-sq: update license and description

https://gitlab.com/sequoia-pgp/sequoia-sq/-/commit/dcea72208a095fd7b99faf365a3e55e2b68f72cf

Co-authored-by: Devan Carpenter <git@dvn.me>
Co-authored-by: Doron Behar <doron.behar@gmail.com>
---
 pkgs/by-name/se/sequoia-sq/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix
index ea861950a2e4..3dfbd7f562ec 100644
--- a/pkgs/by-name/se/sequoia-sq/package.nix
+++ b/pkgs/by-name/se/sequoia-sq/package.nix
@@ -72,10 +72,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Cool new OpenPGP implementation";
+    description = "Command line application exposing a useful set of OpenPGP functionality for common tasks";
     homepage = "https://sequoia-pgp.org/";
     changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${finalAttrs.version}/NEWS";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.lgpl2Plus;
     maintainers = with lib.maintainers; [
       minijackson
       doronbehar