From bc3ce9fb25676790513786704ee8d6b2474b8810 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Apr 2024 11:23:50 +0200 Subject: [PATCH 1/2] gvm-libs: format with nixfmt --- .../libraries/gvm-libs/default.nix | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/pkgs/development/libraries/gvm-libs/default.nix b/pkgs/development/libraries/gvm-libs/default.nix index 651dc26ca1ae..e8cae3fa727b 100644 --- a/pkgs/development/libraries/gvm-libs/default.nix +++ b/pkgs/development/libraries/gvm-libs/default.nix @@ -1,24 +1,26 @@ -{ lib -, stdenv -, cmake -, doxygen -, fetchFromGitHub -, glib -, glib-networking -, gnutls -, gpgme -, hiredis -, libgcrypt -, libnet -, libpcap -, libssh -, libuuid -, libxcrypt -, libxml2 -, paho-mqtt-c -, pkg-config -, zlib -, freeradius +{ + lib, + stdenv, + cmake, + doxygen, + fetchFromGitHub, + glib, + glib-networking, + gnutls, + gpgme, + hiredis, + libgcrypt, + libnet, + libpcap, + libssh, + libuuid, + libxcrypt, + libxml2, + openldap, + paho-mqtt-c, + pkg-config, + radcli, + zlib, }: stdenv.mkDerivation rec { @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "greenbone"; - repo = pname; + repo = "gvm-libs"; rev = "refs/tags/v${version}"; hash = "sha256-nFqYpt9OWEPgSbaNsHLhs9mg7ChQcmfcgHh7nFfQh18="; }; @@ -45,20 +47,19 @@ stdenv.mkDerivation rec { gpgme hiredis libgcrypt - freeradius libnet libpcap libssh libuuid libxcrypt libxml2 + openldap paho-mqtt-c + radcli zlib ]; - cmakeFlags = [ - "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" - ]; + cmakeFlags = [ "-DGVM_RUN_DIR=${placeholder "out"}/run/gvm" ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; From 53b9f7d70c742596132af88ae14e62c388025959 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Apr 2024 11:18:01 +0200 Subject: [PATCH 2/2] openvas-scanner: init at 23.0.1 Scanner component for Greenbone Community Edition https://github.com/greenbone/openvas-scanner --- pkgs/by-name/op/openvas-scanner/package.nix | 91 +++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 pkgs/by-name/op/openvas-scanner/package.nix diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix new file mode 100644 index 000000000000..85a60640d711 --- /dev/null +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -0,0 +1,91 @@ +{ + lib, + stdenv, + bison, + cmake, + curl, + doxygen, + fetchFromGitHub, + git, + glib, + gnutls, + gpgme, + gvm-libs, + json-glib, + libbsd, + libclang, + libgcrypt, + libksba, + libpcap, + libsepol, + libssh, + libtasn1, + net-snmp, + p11-kit, + paho-mqtt-c, + pandoc, + pcre2, + pkg-config, + util-linux, +}: + +stdenv.mkDerivation rec { + pname = "openvas-scanner"; + version = "23.0.1"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = "openvas-scanner"; + rev = "refs/tags/v${version}"; + hash = "sha256-pqbwi3btNEM+qiTqtjIxiDv2wMf1LerltFvLCybiW0Y="; + }; + + nativeBuildInputs = [ + cmake + git + doxygen + pandoc + pkg-config + ]; + + buildInputs = [ + bison + curl + glib + gnutls + gpgme + gvm-libs + json-glib + libbsd + libclang + libgcrypt + libksba + libpcap + libsepol + libssh + libtasn1 + net-snmp + p11-kit + paho-mqtt-c + pcre2 + util-linux + ]; + + cmakeFlags = [ + "-DGVM_RUN_DIR=$out/run/gvm" + "-DLOCALSTATEDIR=$out/var" + "-DSYSCONFDIR=$out/etc" + "-DOPENVAS_RUN_DIR=$out/run/ospd" + "-DOPENVAS_FEED_LOCK_PATH=$out/var/lib/openvas/feed-update.lock" + ]; + + meta = with lib; { + description = "Scanner component for Greenbone Community Edition"; + homepage = "https://github.com/greenbone/openvas-scanner"; + changelog = "https://github.com/greenbone/openvas-scanner/blob/${src.rev}/changelog.toml"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "openvas-scanner"; + platforms = platforms.all; + }; +}