cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge #225823: sequoia: 0.27.0 -> 0.28.0

Browse source 
...into staging-next
In particular, this fixes build after rustc upgrade.
This commit is contained in:
Vladimír Čunát 2023-04-12 10:40:05 +02:00
commit 4bcb4621a2
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/tools/security/sequoia/default.nix
View file

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