ndn-tools: 22.12 -> 24.07 (#330897) (51011df4) · Commits · mdf / nixpkgs

.git-blame-ignore-revs

+9 −0

Original line number	Diff line number	Diff line
		@@ -163,6 +163,15 @@ fbdcdde04a7caa007e825a8b822c75fab9adb2d6
		# step-cli: format package.nix with nixfmt (#331629)
		fc7a83f8b62e90de5679e993d4d49ca014ea013d

		# ndn-cxx: format with nixfmt-rfc-style
		160b2b769c3b8a6d1ae9947afa77520fa2887db7

		# ndn-tools: format with nixfmt-rfc-style
		4882ef721ce3d7bb3b5e48ff80125255db515013

		# nfd: format with nixfmt-rfc-style
		548c2377fa81e2abfc192fbf4f521e601251c468

		# darwin.stdenv: format with nixfmt-rfc-style (#333962)
		93c10ac9e561c6594d3baaeaff2341907390d9b8

pkgs/development/libraries/ndn-cxx/default.nix→pkgs/by-name/nd/ndn-cxx/package.nix

+31 −17

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchFromGitHub
		, doxygen
		, pkg-config
		, python3
		, python3Packages
		, wafHook
		, boost179
		, openssl
		, sqlite
		{
		lib,
		stdenv,
		fetchFromGitHub,
		doxygen,
		pkg-config,
		python3,
		python3Packages,
		wafHook,
		boost,
		openssl,
		sqlite,
		}:

		stdenv.mkDerivation rec {
		@@ -18,18 +19,28 @@ stdenv.mkDerivation rec {
		src = fetchFromGitHub {
		owner = "named-data";
		repo = "ndn-cxx";
		rev = "${pname}-${version}";
		rev = "ndn-cxx-${version}";
		sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM=";
		};

		nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ];
		nativeBuildInputs = [
		doxygen
		pkg-config
		python3
		python3Packages.sphinx
		wafHook
		];

		buildInputs = [ boost179 openssl sqlite ];
		buildInputs = [
		boost
		openssl
		sqlite
		];

		wafConfigureFlags = [
		"--with-openssl=${openssl.dev}"
		"--boost-includes=${boost179.dev}/include"
		"--boost-libs=${boost179.out}/lib"
		"--boost-includes=${boost.dev}/include"
		"--boost-libs=${boost.out}/lib"
		"--with-tests"
		];

		@@ -58,6 +69,9 @@ stdenv.mkDerivation rec {
		'';
		license = licenses.lgpl3;
		platforms = platforms.unix;
		maintainers = with maintainers; [ sjmackenzie bertof ];
		maintainers = with maintainers; [
		sjmackenzie
		bertof
		];
		};
		}

pkgs/tools/networking/ndn-tools/default.nix→pkgs/by-name/nd/ndn-tools/package.nix

+24 −26

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, boost
		, fetchFromGitHub
		, libpcap
		, ndn-cxx
		, openssl
		, pkg-config
		, sphinx
		, wafHook
		{
		lib,
		stdenv,
		boost ? ndn-cxx.boost,
		fetchFromGitHub,
		libpcap,
		ndn-cxx,
		openssl,
		pkg-config,
		sphinx,
		wafHook,
		}:

		stdenv.mkDerivation rec {
		pname = "ndn-tools";
		version = "22.12";
		version = "24.07";

		src = fetchFromGitHub {
		owner = "named-data";
		repo = pname;
		repo = "ndn-tools";
		rev = "ndn-tools-${version}";
		sha256 = "sha256-28sPgo2nq5AhIzZmvDz38echGPzKDzNm2J6iIao4yL8=";
		sha256 = "sha256-rzGd+8SkztrkXRXcEcQm6rOtAGnF7h/Jg8jaBb7FP9w=";
		};

		# Hacky workaround for new pcap-config.
		postPatch = ''
		patch -p1 <<EOF
		--- a/tools/dump/wscript
		+++ b/tools/dump/wscript
		@@ -5 +5 @@
		- conf.check_cfg(package='libpcap', uselib_store='PCAP',
		+ conf.check_cfg(package="", uselib_store='PCAP',
		EOF
		'';

		nativeBuildInputs = [ pkg-config sphinx wafHook ];
		buildInputs = [ libpcap ndn-cxx openssl ];
		nativeBuildInputs = [
		pkg-config
		sphinx
		wafHook
		];
		buildInputs = [
		libpcap
		ndn-cxx
		openssl
		];

		wafConfigureFlags = [
		"--boost-includes=${boost.dev}/include"

pkgs/servers/nfd/default.nix→pkgs/by-name/nf/nfd/package.nix

+55 −0

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, boost179 # probably needs to match the one from ndn-cxx
		, fetchFromGitHub
		, libpcap
		, ndn-cxx
		, openssl
		, pkg-config
		, sphinx
		, systemd
		, wafHook
		, websocketpp
		, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
		, withWebSocket ? true
		{
		lib,
		stdenv,
		boost,
		fetchFromGitHub,
		libpcap,
		ndn-cxx,
		openssl,
		pkg-config,
		sphinx,
		systemd,
		wafHook,
		websocketpp,
		withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
		withWebSocket ? true,
		}:

		stdenv.mkDerivation rec {
		@@ -20,35 +21,30 @@ stdenv.mkDerivation rec {

		src = fetchFromGitHub {
		owner = "named-data";
		repo = lib.toUpper pname;
		repo = "NFD";
		rev = "NFD-${version}";
		hash = "sha256-iEI8iS0eLLVe6PkOiCHL3onYNVYVZ1ttmk/aWrBkDhg=";
		fetchSubmodules = true;
		hash = "sha256-HbKPO3gwQWOZf4QZE+N7tAiqsNl1GrcwE4EUGjWmf5s=";
		};

		postPatch = ''
		# These tests fail because they try to check for user/group permissions.
		rm tests/daemon/mgmt/general-config-section.t.cpp
		prePatch = lib.optional withWebSocket ''
		ln -s ${websocketpp}/include/websocketpp websocketpp
		'';

		nativeBuildInputs = [ pkg-config sphinx wafHook ];
		buildInputs = [ boost179 libpcap ndn-cxx openssl websocketpp ] ++ lib.optional withSystemd systemd;

		nativeBuildInputs = [
		pkg-config
		sphinx
		wafHook
		];
		buildInputs = [
		libpcap
		ndn-cxx
		openssl
		] ++ lib.optional withWebSocket websocketpp ++ lib.optional withSystemd systemd;
		wafConfigureFlags = [
		"--boost-includes=${boost179.dev}/include"
		"--boost-libs=${boost179.out}/lib"
		"--with-tests"
		"--boost-includes=${boost.dev}/include"
		"--boost-libs=${boost.out}/lib"
		] ++ lib.optional (!withWebSocket) "--without-websocket";

		doCheck = true;
		checkPhase = ''
		runHook preCheck
		build/unit-tests-core
		build/unit-tests-daemon
		build/unit-tests-tools
		runHook postCheck
		'';

		meta = with lib; {
		homepage = "https://named-data.net/";
		description = "Named Data Networking (NDN) Forwarding Daemon";

pkgs/top-level/all-packages.nix

+0 −6

Original line number	Diff line number	Diff line
		@@ -19209,12 +19209,6 @@ with pkgs;
		cudaPackages = cudaPackages_11;
		};

		ndn-cxx = callPackage ../development/libraries/ndn-cxx { };

		ndn-tools = callPackage ../tools/networking/ndn-tools { };

		nfd = callPackage ../servers/nfd { };

		cddlib = callPackage ../development/libraries/cddlib { };

		cdk-go = callPackage ../tools/security/cdk-go { };

Admin message