diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index e7cc6e705b67..c7977ed89d99 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { "--with-tests" ]; - doCheck = false; + doCheck = false; # some tests fail in upstream, some fail because of the sandbox environment checkPhase = '' runHook preCheck - LD_PRELOAD=build/libndn-cxx.so build/unit-tests # some tests fail in upstream, some fail because of the sandbox environment + LD_PRELOAD=build/libndn-cxx.so build/unit-tests runHook postCheck ''; diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 58c4dd42936e..87ce4ce1889f 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nfd"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = lib.toUpper pname; rev = "NFD-${version}"; - sha256 = "sha256-8Zm8oxbpw9qD31NuofDdgPYnTWIz5E04NhkZhiRkK9E="; + sha256 = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk="; fetchSubmodules = true; }; @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" "--with-tests" ] ++ lib.optional (!withWebSocket) "--without-websocket"; @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { description = "Named Data Networking (NDN) Forwarding Daemon"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ lib.maintainers.bertof ]; + maintainers = with maintainers; [ bertof ]; }; } diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 9ab84724d078..425ddb440435 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -30,10 +30,10 @@ stdenv.mkDerivation rec { "--with-tests" ]; - doCheck = false; + doCheck = false; # some tests fail because of the sandbox environment checkPhase = '' runHook preCheck - build/unit-tests # some tests fail because of the sandbox environment + build/unit-tests runHook postCheck '';