diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-24 01:34:53 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-24 01:34:53 -0400 |
commit | 0f854cd2d1125456ca638c0145be946bbeb9e6a9 (patch) | |
tree | d3720644a906e575b353a6ce713551c4ad288b6b /pkgs/tools/security | |
parent | 5d116251dbb8d15d13a0e09a56968036f49bf21f (diff) | |
parent | 34087d0dec1d9d4bda83af10d165fbbd30d177f7 (diff) | |
download | nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.gz nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.bz2 nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.lz nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.xz nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.tar.zst nixlib-0f854cd2d1125456ca638c0145be946bbeb9e6a9.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/lynis/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/neopg/default.nix | 47 |
2 files changed, 49 insertions, 2 deletions
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index cbbb9b4dd3c2..e0a11f574181 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "2.6.2"; + version = "2.6.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "CISOfy"; repo = "${pname}"; rev = "${version}"; - sha256 = "0jymp44dmc22cdrsd5hfyv9wc8a5sq92yh9p9c0rg22g53733910"; + sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd"; }; nativeBuildInputs = [ makeWrapper perl ]; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix new file mode 100644 index 000000000000..10efe0e7f21d --- /dev/null +++ b/pkgs/tools/security/neopg/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchgit +, cmake +, sqlite +, botan2 +, boost164 +, curl +, gettext +, pkgconfig +, libusb +, gnutls }: + +stdenv.mkDerivation rec { + name = "neopg"; + version = "0.0.4"; + + # no fetchFromGitHub, as repo contains submodules + src = fetchgit { + url = "https://github.com/das-labor/neopg.git"; + rev = "refs/tags/v${version}"; + sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; + + doCheck = true; + checkTarget = "test"; + + postInstall = '' + mkdir -p $out/bin + cp src/neopg $out/bin/neopg + ''; + + meta = with stdenv.lib; { + homepage = https://neopg.io/; + description = "Modern replacement for GnuPG 2"; + license = licenses.gpl3; + longDescription = '' + NeoPG starts as an opiniated fork of GnuPG 2 to clean up the code and make it easier to develop. + It is written in C++11. + ''; + maintainers = with maintainers; [ erictapen ]; + platforms = platforms.linux; + }; +} |