public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96180 from doronbehar/pkg/sequoia

Browse Source
This commit is contained in:
Doron Behar 2020-09-12 14:47:53 +03:00 committed by GitHub
commit bfebffbd9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/tools/security/sequoia/default.nix
View File

@ -1,32 +1,46 @@
{ stdenv, fetchFromGitLab, lib, darwin { stdenv
, git, nettle, llvmPackages, cargo, rustc , fetchFromGitLab
, rustPlatform, pkgconfig, glib , lib
, openssl, sqlite, capnproto , darwin
, ensureNewerSourcesForZipFilesHook, pythonSupport ? true, pythonPackages ? null , git
, nettle
# Use the same llvmPackages version as Rust
, llvmPackages_10
, cargo
, rustc
, rustPlatform
, pkg-config
, glib
, openssl
, sqlite
, capnproto
, ensureNewerSourcesForZipFilesHook
, pythonSupport ? true
, pythonPackages ? null
}: }:
assert pythonSupport -> pythonPackages != null; assert pythonSupport -> pythonPackages != null;
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sequoia"; pname = "sequoia";
version = "0.18.0"; version = "0.19.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "sequoia-pgp"; owner = "sequoia-pgp";
repo = pname; repo = "sequoia";
rev = "v${version}"; rev = "v${version}";
sha256 = "18acv0185y51yz6jwchi1vf701shz37z5qmnzpq6z419lpjdaskd"; sha256 = "1870wd03c3x0da9p3jmkvfx8am87ak0dcsvp2qkjvglbl396kd8y";
}; };
cargoSha256 = "1jazwpv5mrsd0hxfavk0lvq8n26iglzl8pggw311ysi0lwabjq0y"; cargoSha256 = "0bb51vdppdjhsxbfy3lyqvw5r5j58r3wi0qb68m2a45k3za7liss";
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkg-config
cargo cargo
rustc rustc
git git
llvmPackages.libclang llvmPackages_10.libclang
llvmPackages.clang llvmPackages_10.clang
ensureNewerSourcesForZipFilesHook ensureNewerSourcesForZipFilesHook
capnproto capnproto
] ++ ] ++
@ -54,27 +68,24 @@ rustPlatform.buildRustPackage rec {
"build-release" "build-release"
]; ];
LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; LIBCLANG_PATH = "${llvmPackages_10.libclang}/lib";
# Please check if this is still needed when updating. # Sometimes, tests fail on CI (ofborg) & hydra without this
# Exlude tests for sequoia-store, they often error with 'Too many open files' Hydra. CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";
CARGO_TEST_ARGS = " --all --exclude sequoia-store";
# Without this, the examples won't build
postPatch = '' postPatch = ''
# otherwise, the check fails because we delete the `.git` in the unpack phase
substituteInPlace openpgp-ffi/Makefile \
--replace 'git grep' 'grep -R'
# Without this, the check fails
substituteInPlace openpgp-ffi/examples/Makefile \ substituteInPlace openpgp-ffi/examples/Makefile \
--replace '-O0 -g -Wall -Werror' '-g' --replace '-O0 -g -Wall -Werror' '-g'
substituteInPlace ffi/examples/Makefile \ substituteInPlace ffi/examples/Makefile \
--replace '-O0 -g -Wall -Werror' '-g' --replace '-O0 -g -Wall -Werror' '-g'
''; '';
preInstall = lib.optionalString pythonSupport '' preInstall = lib.optionalString pythonSupport ''
export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}"
'' + lib.optionalString (!pythonSupport) '' '' + lib.optionalString (!pythonSupport) ''
export installFlags="PYTHON=disable" export makeFlags="PYTHON=disable"
''; '';
# Don't use buildRustPackage phases, only use it for rust deps setup # Don't use buildRustPackage phases, only use it for rust deps setup