Skip to content

Commit

Permalink
Merge #225823: sequoia: 0.27.0 -> 0.28.0
Browse files Browse the repository at this point in the history
...into staging-next
In particular, this fixes build after rustc upgrade.
  • Loading branch information
vcunat committed Apr 12, 2023
2 parents 9bf18e0 + 718abd3 commit 4bcb462
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions pkgs/tools/security/sequoia/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
, darwin
, git
, nettle
, nix-update-script
# Use the same llvmPackages version as Rust
, llvmPackages_12
, cargo
Expand All @@ -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 = [
Expand Down Expand Up @@ -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/";
Expand Down

0 comments on commit 4bcb462

Please sign in to comment.