From 5a5123620f7d78b89f2a3b8066821596ac0738a5 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:06:49 +0200 Subject: [PATCH 01/10] ndn-cxx: 0.8.1 -> 0.9.0 --- pkgs/development/libraries/ndn-cxx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index b968a0ee48be..9074ecd90880 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -6,7 +6,7 @@ , python3 , python3Packages , wafHook -, boost179 +, boost , openssl , sqlite }: @@ -18,18 +18,18 @@ 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 ]; - 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" ]; From 160b2b769c3b8a6d1ae9947afa77520fa2887db7 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:07:14 +0200 Subject: [PATCH 02/10] ndn-cxx: format with nixfmt-rfc-style --- .../development/libraries/ndn-cxx/default.nix | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 9074ecd90880..144d79262c84 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchFromGitHub -, doxygen -, pkg-config -, python3 -, python3Packages -, wafHook -, boost -, openssl -, sqlite +{ + lib, + stdenv, + fetchFromGitHub, + doxygen, + pkg-config, + python3, + python3Packages, + wafHook, + boost, + openssl, + sqlite, }: stdenv.mkDerivation rec { @@ -22,9 +23,19 @@ stdenv.mkDerivation rec { sha256 = "sha256-u9+QxqdCET1f5B54HF+Jk/YuQvhcYWsPNIVHi5l0XTM="; }; - nativeBuildInputs = [ doxygen pkg-config python3 python3Packages.sphinx wafHook ]; + nativeBuildInputs = [ + doxygen + pkg-config + python3 + python3Packages.sphinx + wafHook + ]; - buildInputs = [ boost openssl sqlite ]; + buildInputs = [ + boost + openssl + sqlite + ]; wafConfigureFlags = [ "--with-openssl=${openssl.dev}" @@ -58,6 +69,9 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl3; platforms = platforms.unix; - maintainers = with maintainers; [ sjmackenzie bertof ]; + maintainers = with maintainers; [ + sjmackenzie + bertof + ]; }; } From 4597d7fe6e2a1c5871eac2488d5171db39e3db4d Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:18:41 +0200 Subject: [PATCH 03/10] ndn-cxx: move to by-name --- .../ndn-cxx/default.nix => by-name/nd/ndn-cxx/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/ndn-cxx/default.nix => by-name/nd/ndn-cxx/package.nix} (100%) diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/by-name/nd/ndn-cxx/package.nix similarity index 100% rename from pkgs/development/libraries/ndn-cxx/default.nix rename to pkgs/by-name/nd/ndn-cxx/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0548c23bb748..bb2bdbc212b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19207,8 +19207,6 @@ with pkgs; cudaPackages = cudaPackages_11; }; - ndn-cxx = callPackage ../development/libraries/ndn-cxx { }; - ndn-tools = callPackage ../tools/networking/ndn-tools { }; nfd = callPackage ../servers/nfd { }; From 4907bfd7eed10118ccd97c7edb37e5fb90743579 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:27:38 +0200 Subject: [PATCH 04/10] ndn-tools: 22.12 -> 24.07 --- pkgs/tools/networking/ndn-tools/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 1cbc6d403a9d..7343dbe072ba 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost +, boost ? ndn-cxx.boost , fetchFromGitHub , libpcap , ndn-cxx @@ -12,26 +12,15 @@ 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 < Date: Mon, 29 Jul 2024 18:39:39 +0200 Subject: [PATCH 05/10] ndn-tools: format with nixfmt-rfc-style --- pkgs/tools/networking/ndn-tools/default.nix | 33 +++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/tools/networking/ndn-tools/default.nix index 7343dbe072ba..52941aa57fce 100644 --- a/pkgs/tools/networking/ndn-tools/default.nix +++ b/pkgs/tools/networking/ndn-tools/default.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, boost ? ndn-cxx.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 { @@ -21,8 +22,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-rzGd+8SkztrkXRXcEcQm6rOtAGnF7h/Jg8jaBb7FP9w="; }; - 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" From 4f5ccc4fe7d555f1e6d2e222ab7185843add1377 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:29:51 +0200 Subject: [PATCH 06/10] ndn-tools: move to by-name --- .../ndn-tools/default.nix => by-name/nd/ndn-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/ndn-tools/default.nix => by-name/nd/ndn-tools/package.nix} (100%) diff --git a/pkgs/tools/networking/ndn-tools/default.nix b/pkgs/by-name/nd/ndn-tools/package.nix similarity index 100% rename from pkgs/tools/networking/ndn-tools/default.nix rename to pkgs/by-name/nd/ndn-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb2bdbc212b8..dab216d9cd91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19207,8 +19207,6 @@ with pkgs; cudaPackages = cudaPackages_11; }; - ndn-tools = callPackage ../tools/networking/ndn-tools { }; - nfd = callPackage ../servers/nfd { }; cddlib = callPackage ../development/libraries/cddlib { }; From a06956360632731df4ecc0aaa203478b7304f532 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:48:16 +0200 Subject: [PATCH 07/10] nfd: 22.12 -> 24.07 --- pkgs/servers/nfd/default.nix | 40 +++++++++++++++++------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index dd066fb5193b..3b82dbffabe6 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, boost179 # probably needs to match the one from ndn-cxx +, boost , fetchFromGitHub , libpcap , ndn-cxx @@ -20,35 +20,33 @@ 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"; From 548c2377fa81e2abfc192fbf4f521e601251c468 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 18:26:30 +0200 Subject: [PATCH 08/10] nfd: format with nixfmt-rfc-style --- pkgs/servers/nfd/default.nix | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 3b82dbffabe6..49730f44848d 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, boost -, 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 { @@ -38,10 +39,7 @@ stdenv.mkDerivation rec { libpcap ndn-cxx openssl - ] ++ lib.optional withWebSocket websocketpp - ++ lib.optional withSystemd systemd; - - + ] ++ lib.optional withWebSocket websocketpp ++ lib.optional withSystemd systemd; wafConfigureFlags = [ "--boost-includes=${boost.dev}/include" "--boost-libs=${boost.out}/lib" From 18258fbd151f64a170d3e85b0ae735da6102e368 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 16:49:57 +0200 Subject: [PATCH 09/10] nfd: move to by-name --- pkgs/{servers/nfd/default.nix => by-name/nf/nfd/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/nfd/default.nix => by-name/nf/nfd/package.nix} (100%) diff --git a/pkgs/servers/nfd/default.nix b/pkgs/by-name/nf/nfd/package.nix similarity index 100% rename from pkgs/servers/nfd/default.nix rename to pkgs/by-name/nf/nfd/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dab216d9cd91..69f09f096d13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19207,8 +19207,6 @@ with pkgs; cudaPackages = cudaPackages_11; }; - nfd = callPackage ../servers/nfd { }; - cddlib = callPackage ../development/libraries/cddlib { }; cdk-go = callPackage ../tools/security/cdk-go { }; From 7e5f9cc4ebead2345c8ba43e7d6e098c07cb9565 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 29 Jul 2024 18:42:56 +0200 Subject: [PATCH 10/10] ndn: Git blame ignore --- .git-blame-ignore-revs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8a25858cfd6a..34d3416a238d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -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