From 3b307f77be6f84cc0189c4e478eab18d66f8a920 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 Dec 2024 17:30:25 -0500 Subject: [PATCH 1/2] root: propagate nlohmann_json --- pkgs/by-name/ro/root/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 110c780497ad4..039fe1b116355 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -81,6 +81,9 @@ stdenv.mkDerivation rec { pkg-config git ]; + propagatedBuildInputs = [ + nlohmann_json # link interface of target "ROOT::ROOTEve" + ]; buildInputs = [ davix @@ -98,7 +101,6 @@ stdenv.mkDerivation rec { libxml2 llvm_18 lz4 - nlohmann_json openblas openssl patchRcPathCsh From 2e4403bd4627fa7a489746d4a2bb152f9f4ed3d2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 Dec 2024 22:09:24 -0500 Subject: [PATCH 2/2] root: 6.34.00 -> 6.34.02 --- pkgs/by-name/ro/root/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 039fe1b116355..eeac613659951 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.34.00"; + version = "6.34.02"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-87APPblTgpyEkCnDnXZgqVZGivJH79lG6JByEBeWqwM="; + hash = "sha256-FmvsVi5CDhd6rzEz+j+wn4Ls3avoouGQY0W61EJRP5Q="; }; clad_src = fetchgit {