Commit 19a50c14 authored by Doron Behar's avatar Doron Behar
Browse files

sequoia-sq: 0.34.0 -> 0.37.0 

Diff: https://gitlab.com/sequoia-pgp/sequoia-sq/-/compare/v0.34.0...v0.37.0

Changelog: https://gitlab.com/sequoia-pgp/sequoia-sq/-/blob/v0.37.0/NEWS

Tests that we skipped before are now removed. A different test is now
failing.
parent 16aba956

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

+10 −15
Original line number Diff line number Diff line 
{ stdenv

, fetchFromGitLab

, fetchpatch

, lib

, darwin

, nettle
@@ -15,24 +14,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "sequoia-sq";

  version = "0.34.0";

  version = "0.37.0";



  src = fetchFromGitLab {

    owner = "sequoia-pgp";

    repo = "sequoia-sq";

    rev = "v${version}";

    hash = "sha256-voFektWZnkmIQzI7s5nKzVVWQtEhzk2GKtxX926RtxU=";

    hash = "sha256-D22ECJvbGbnyvusWXfU5F1aLF/ETuMyhAStT5HPWR2U=";

  };

  patches = [

    # Fixes test failing on Darwin, see:

    # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/211

    (fetchpatch {

      url = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/commit/21221a935e0d058ed269ae6c8f45c5fa7ea0d598.patch";

      hash = "sha256-ZjTl3EumeFwMJUl+qMpX+P2maYz4Ow/Tn9KwYbHDbes=";

    })

  ];



  cargoHash = "sha256-3ncBpRi0v6g6wwPkSASDwt0d8cOOAUv9BwZaYvnif1U=";

  cargoHash = "sha256-jFpqZKyRCMkMtOezsYJy3Fy1WXUPyn709wZxuwKlSYI=";



  nativeBuildInputs = [

    pkg-config
@@ -48,11 +39,15 @@ rustPlatform.buildRustPackage rec { 
  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);



  checkFlags = [

    # doctest for sequoia-ipc fail for some reason

    "--skip=macros::assert_send_and_sync"

    "--skip=macros::time_it"

    # 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

  preCheck = ''

    export HOME=$(mktemp -d)

  '';



  env.ASSET_OUT_DIR = "/tmp/";



  doCheck = true;