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

Merge pull request #196434 from bertof/ndn_update

Browse Source 
Update NDN stack to 0.8.0 and 22.12 releases
This commit is contained in:
Nick Cao 2023-02-15 08:57:42 +08:00 committed by GitHub
commit b6e28d2a32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/libraries/ndn-cxx/default.nix
View File

@ -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; # some tests fail in upstream, some fail because of the sandbox environment
checkPhase = ''
runHook preCheck
LD_PRELOAD=build/ndn-cxx.so build/unit-tests
LD_PRELOAD=build/libndn-cxx.so build/unit-tests
runHook postCheck
'';

12
pkgs/servers/nfd/default.nix
View File

@ -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 ];
};
}

14
pkgs/tools/networking/ndn-tools/default.nix
View File

@ -1,6 +1,6 @@
{ lib
, stdenv
, boost175
, boost
, fetchFromGitHub
, libpcap
, ndn-cxx
@ -12,25 +12,25 @@
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;
doCheck = false; # some tests fail because of the sandbox environment
checkPhase = ''
runHook preCheck
build/unit-tests