From 86e33692cc9f308ab672cd05845a3c91e78540a4 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 5 Dec 2022 10:56:01 +0100 Subject: [PATCH 1/3] ndn-cxx: 0.7.1 -> 0.8.1 --- .../development/libraries/ndn-cxx/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index ee05d2606def..e7cc6e705b67 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,38 +6,37 @@ , python3 , python3Packages , wafHook -, boost175 +, boost , openssl , sqlite }: stdenv.mkDerivation rec { pname = "ndn-cxx"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "named-data"; repo = "ndn-cxx"; rev = "${pname}-${version}"; - sha256 = "sha256-oTSc/lh0fDdk7dQeDhYKX5+gFl2t2Xlu1KkNmw7DitE="; + sha256 = "sha256-nnnxlkYVTSRB6ZcuIUDFol999+amGtqegHXK+06ITK8="; }; nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; - buildInputs = [ boost175 openssl sqlite ]; + buildInputs = [ boost openssl sqlite ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; - - doCheck = false; # disabled since upstream tests fail (Net/TestFaceUri/ParseDev Bug #3896) + doCheck = false; checkPhase = '' runHook preCheck - LD_PRELOAD=build/ndn-cxx.so build/unit-tests + LD_PRELOAD=build/libndn-cxx.so build/unit-tests # some tests fail in upstream, some fail because of the sandbox environment runHook postCheck ''; From c1ab15495e72643b205887db388746f5994901aa Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 5 Dec 2022 10:56:31 +0100 Subject: [PATCH 2/3] ndn-tools: 0.7.0 -> 22.12 --- pkgs/tools/networking/ndn-tools/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 05804ab29c00..9ab84724d078 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost175 +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -12,28 +12,28 @@ stdenv.mkDerivation rec { pname = "ndn-tools"; - version = "0.7.1"; + version = "22.12"; src = fetchFromGitHub { owner = "named-data"; repo = pname; rev = "ndn-tools-${version}"; - sha256 = "sha256-3hE/esOcS/ln94wZIRVCLjWgouEYnJJf3EvirNEGTeA="; + sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8="; }; nativeBuildInputs = [ pkg-config sphinx wafHook ]; buildInputs = [ libpcap ndn-cxx openssl ]; wafConfigureFlags = [ - "--boost-includes=${boost175.dev}/include" - "--boost-libs=${boost175.out}/lib" - # "--with-tests" + "--boost-includes=${boost.dev}/include" + "--boost-libs=${boost.out}/lib" + "--with-tests" ]; doCheck = false; checkPhase = '' runHook preCheck - build/unit-tests + build/unit-tests # some tests fail because of the sandbox environment runHook postCheck ''; From b3c41de572f8601dcd3a89eccf2ee1eafe36ee36 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 5 Dec 2022 10:57:40 +0100 Subject: [PATCH 3/3] nfd: 0.7.1 -> 22.12 --- pkgs/development/libraries/ndn-cxx/default.nix | 4 ++-- pkgs/servers/nfd/default.nix | 12 ++++++------ pkgs/tools/networking/ndn-tools/default.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) 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 '';