diff --git a/pkgs/by-name/se/sequoia-sq/package.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 0eb2017dc08b..3dfbd7f562ec 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 { +rustPlatform.buildRustPackage (finalAttrs: { 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="; + tag = "v${finalAttrs.version}"; + 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/"; @@ -74,10 +72,10 @@ rustPlatform.buildRustPackage rec { 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${version}/NEWS"; - license = lib.licenses.gpl2Plus; + changelog = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v${finalAttrs.version}/NEWS"; + license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ minijackson doronbehar @@ -85,4 +83,4 @@ rustPlatform.buildRustPackage rec { ]; mainProgram = "sq"; }; -} +})