From 4ec7e7cd4c6a1afe240fec2297fdabbb5eb8959b Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Mon, 13 Jul 2026 22:14:24 -0400 Subject: [PATCH 1/5] sequoia-sop: 0.37.3 -> 0.38.0 Signed-off-by: Anish Pallati --- pkgs/by-name/se/sequoia-sop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix index ec64a9a8a39d..7625477777f2 100644 --- a/pkgs/by-name/se/sequoia-sop/package.nix +++ b/pkgs/by-name/se/sequoia-sop/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sequoia-sop"; - version = "0.37.3"; + version = "0.38.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sop"; tag = "v${finalAttrs.version}"; - hash = "sha256-7fyItwtzNia97fbLJ1YkpkS7KmCo3I81uksh3lNvxwU="; + hash = "sha256-3PxUXMLRBqw9GO0+wRiwI7P6/RH9vuAkSN4OnSxV0SQ="; }; - cargoHash = "sha256-NrJYFf2bK/QwfFpIrPD8Zc9N/tKVbN2I48jA2B0rNWk="; + cargoHash = "sha256-iKC6vIT8fVFv/Yx3YJUSCHyTOZ7X860Ak0l/+7lrU9Y="; nativeBuildInputs = [ pkg-config From c0a8af02fba98cdc9dfb76ed38a2c4fe1da08730 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Mon, 13 Jul 2026 22:17:14 -0400 Subject: [PATCH 2/5] sequoia-sop: write build assets to target dir Signed-off-by: Anish Pallati --- pkgs/by-name/se/sequoia-sop/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix index 7625477777f2..e9c95640b17e 100644 --- a/pkgs/by-name/se/sequoia-sop/package.nix +++ b/pkgs/by-name/se/sequoia-sop/package.nix @@ -35,15 +35,15 @@ rustPlatform.buildRustPackage (finalAttrs: { buildFeatures = [ "cli" ]; - env.ASSET_OUT_DIR = "/tmp/"; + env.ASSET_OUT_DIR = "target"; # Install manual pages postInstall = '' - installManPage /tmp/man-pages/*.* + installManPage ${finalAttrs.env.ASSET_OUT_DIR}/man-pages/*.* installShellCompletion --cmd sqop \ - --bash /tmp/shell-completions/sqop.bash \ - --fish /tmp/shell-completions/sqop.fish \ - --zsh /tmp/shell-completions/_sqop + --bash ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sqop.bash \ + --fish ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/sqop.fish \ + --zsh ${finalAttrs.env.ASSET_OUT_DIR}/shell-completions/_sqop # Also elv and powershell are generated there ''; From c65c60a46ed444abd3a8a7f7622ef0b4ba303ea2 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Mon, 13 Jul 2026 22:19:11 -0400 Subject: [PATCH 3/5] sequoia-sop: enable strictDeps and structuredAttrs Signed-off-by: Anish Pallati --- pkgs/by-name/se/sequoia-sop/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix index e9c95640b17e..470a27bd179a 100644 --- a/pkgs/by-name/se/sequoia-sop/package.nix +++ b/pkgs/by-name/se/sequoia-sop/package.nix @@ -22,6 +22,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-iKC6vIT8fVFv/Yx3YJUSCHyTOZ7X860Ak0l/+7lrU9Y="; + strictDeps = true; + __structuredAttrs = true; + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook From 5e98ca786e3c0a8ab27f1ba7bfca5068acf69178 Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Mon, 13 Jul 2026 22:21:00 -0400 Subject: [PATCH 4/5] sequoia-sop: add versionCheckHook Signed-off-by: Anish Pallati --- pkgs/by-name/se/sequoia-sop/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix index 470a27bd179a..20efef5537c2 100644 --- a/pkgs/by-name/se/sequoia-sop/package.nix +++ b/pkgs/by-name/se/sequoia-sop/package.nix @@ -7,6 +7,7 @@ rustPlatform, sqlite, pkg-config, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -51,6 +52,9 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; doCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; passthru.updateScript = nix-update-script { }; From 4473aa96d041ddcead374a7bc77f1fd9bcd9d4de Mon Sep 17 00:00:00 2001 From: Anish Pallati Date: Mon, 13 Jul 2026 22:24:33 -0400 Subject: [PATCH 5/5] sequoia-sop: add anish as maintainer Signed-off-by: Anish Pallati --- pkgs/by-name/se/sequoia-sop/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/se/sequoia-sop/package.nix b/pkgs/by-name/se/sequoia-sop/package.nix index 20efef5537c2..b1763023acc5 100644 --- a/pkgs/by-name/se/sequoia-sop/package.nix +++ b/pkgs/by-name/se/sequoia-sop/package.nix @@ -63,7 +63,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://gitlab.com/sequoia-pgp/sequoia-sop"; changelog = "https://gitlab.com/sequoia-pgp/sequoia-sop/-/blob/${finalAttrs.src.tag}/NEWS"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ doronbehar ]; + maintainers = with lib.maintainers; [ + doronbehar + anish + ]; mainProgram = "sqop"; }; })