diff options
| author | Doron Behar <doron.behar@gmail.com> | 2022-03-08 12:32:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-08 12:32:54 +0200 |
| commit | bd9ce225f89290d94f13d40bca3554c7bc700c4e (patch) | |
| tree | c54e1fcd0f2d7b44005fd7bcdfdd8577012a969e /pkgs/tools/security | |
| parent | ec116ada964a4922050c014571d8b97469de6102 (diff) | |
| parent | 6a5c5dc19a8c7e88618836051511d3a21068881d (diff) | |
| download | nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.tar nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.tar.gz nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.tar.bz2 nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.tar.lz nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.tar.xz nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.tar.zst nixpkgs-bd9ce225f89290d94f13d40bca3554c7bc700c4e.zip | |
Merge pull request #163162 from alyssais/sq-0.26.0
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/sequoia/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index 18db48dfb24..324af6aa4c9 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -25,16 +25,16 @@ 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.25.0"; + version = "0.26.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; rev = "sq/v${version}"; - sha256 = "13f582g10vba0cpbdmqkkfzgd5jgagb640jaz1w425wf5nbh6q50"; + sha256 = "1rcbv1s7wpxhrzw082q6vfrq1ja2ssfxn53c90h8fh5wrj7ns751"; }; - cargoSha256 = "sha256-qIGP48uj2iQ6MVgy5anKI9QrX9vnuKh46Fmmcczda4w="; + cargoSha256 = "0f3b8rh4pl03n8j9ihazaak214sv1rsksbgrb1nfcy8sq2yqfj4g"; nativeBuildInputs = [ pkg-config @@ -77,15 +77,6 @@ rustPlatform.buildRustPackage rec { # Sometimes, tests fail on CI (ofborg) & hydra without this CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; - # Without this, the examples won't build - postPatch = '' - substituteInPlace openpgp-ffi/examples/Makefile \ - --replace '-O0 -g -Wall -Werror' '-g' - substituteInPlace ffi/examples/Makefile \ - --replace '-O0 -g -Wall -Werror' '-g' - ''; - - preInstall = lib.optionalString pythonSupport '' export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" '' + lib.optionalString (!pythonSupport) '' |