Skip to content

Commit df4d9b6

Browse files
authored
sequoia-sq: 1.1.0 -> 1.3.0 (#392424)
2 parents 7b88249 + a7c2773 commit df4d9b6

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

pkgs/by-name/se/sequoia-sq/package.nix

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@
1010
capnproto,
1111
installShellFiles,
1212
openssl,
13+
cacert,
1314
sqlite,
1415
}:
1516

16-
rustPlatform.buildRustPackage rec {
17+
rustPlatform.buildRustPackage (finalAttrs: {
1718
pname = "sequoia-sq";
18-
version = "1.1.0";
19+
version = "1.3.0";
1920

2021
src = fetchFromGitLab {
2122
owner = "sequoia-pgp";
2223
repo = "sequoia-sq";
23-
rev = "v${version}";
24-
hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU=";
24+
tag = "v${finalAttrs.version}";
25+
hash = "sha256-1jssSlyjbrGgkxGC1gieZooVVI42Qvz0q+pIfcZRIj0=";
2526
};
2627

2728
useFetchCargoVendor = true;
28-
cargoHash = "sha256-a+3oKORX88SfMw4/QA6+Ls12koZIw0iadTulCzGlr6U=";
29+
cargoHash = "sha256-tATxGaoF/+cUDywvlnW1N2sKo/FbKhJM7yUb74mxB5s=";
2930

3031
nativeBuildInputs = [
3132
pkg-config
@@ -48,14 +49,11 @@ rustPlatform.buildRustPackage rec {
4849
]
4950
);
5051

51-
checkFlags = [
52-
# https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/297
53-
"--skip=sq_autocrypt_import"
54-
];
55-
5652
# Needed for tests to be able to create a ~/.local/share/sequoia directory
53+
# Needed for avoiding "OpenSSL error" since 1.2.0
5754
preCheck = ''
5855
export HOME=$(mktemp -d)
56+
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
5957
'';
6058

6159
env.ASSET_OUT_DIR = "/tmp/";
@@ -74,15 +72,15 @@ rustPlatform.buildRustPackage rec {
7472
passthru.updateScript = nix-update-script { };
7573

7674
meta = {
77-
description = "Cool new OpenPGP implementation";
75+
description = "Command line application exposing a useful set of OpenPGP functionality for common tasks";
7876
homepage = "https://sequoia-pgp.org/";
79-
changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${version}/NEWS";
80-
license = lib.licenses.gpl2Plus;
77+
changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${finalAttrs.version}/NEWS";
78+
license = lib.licenses.lgpl2Plus;
8179
maintainers = with lib.maintainers; [
8280
minijackson
8381
doronbehar
8482
dvn0
8583
];
8684
mainProgram = "sq";
8785
};
88-
}
86+
})

0 commit comments

Comments
 (0)