From bb60969483b83ace611219cfee068ba186abb517 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Tue, 25 Jun 2024 00:01:48 +0200 Subject: [PATCH 1/4] root: don't explicitly set tmva-pymva=OFF Building this component of ROOT doesn't require anything that is not already in the dependencies. --- pkgs/applications/science/misc/root/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ded47a661a21..3f20b0a3120d 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -166,7 +166,6 @@ stdenv.mkDerivation rec { "-Dmysql=OFF" "-Dpgsql=OFF" "-Dsqlite=OFF" - "-Dtmva-pymva=OFF" "-Dvdt=OFF" ] ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" From 5e2823d5fee58a5e991759009cbfe5211b5dddca Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Tue, 25 Jun 2024 00:09:02 +0200 Subject: [PATCH 2/4] root: 6.32.00 -> 6.32.02 --- pkgs/applications/science/misc/root/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 3f20b0a3120d..81f2f75be651 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.32.00"; + version = "6.32.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-EvIDaBpZBBxHTOlSN2Hm8OiGGzvueN9feZqNtVGJ5dI="; + hash = "sha256-PQ92vwWFfhgHzPssngFPUlvLYl+UojcLRV9LFklhYC0="; }; clad_src = fetchgit { From db99d98201d752d291484aad4f7637392f77b9cc Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 28 Jun 2024 12:13:39 -0400 Subject: [PATCH 3/4] root: add comment with link to clad cmake files --- pkgs/applications/science/misc/root/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 81f2f75be651..5200b3f36006 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -69,7 +69,9 @@ stdenv.mkDerivation rec { clad_src = fetchgit { url = "https://github.com/vgvassilev/clad"; - rev = "refs/tags/v1.5"; # Make sure that this is the same tag as in the ROOT build files! + # Make sure that this is the same tag as in the ROOT build files! + # https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76 + rev = "refs/tags/v1.5"; hash = "sha256-s0DbHfLthv51ZICnTd30O4qG/DyZPk5tADeu3bBRoOw="; }; From 848699d4c1f669af01918b7cfdb438329667ddc2 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 28 Jun 2024 12:13:50 -0400 Subject: [PATCH 4/4] root: fix darwin build --- pkgs/applications/science/misc/root/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 5200b3f36006..5d01a33e5dcc 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -223,6 +223,9 @@ stdenv.mkDerivation rec { ]}" ''; + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + CXXFLAGS = lib.optional (stdenv.hostPlatform.system == "x86_64-darwin") "-faligned-allocation"; + # To use the debug information on the fly (without installation) # add the outPath of root.debug into NIX_DEBUG_INFO_DIRS (in PATH-like format) # and make sure that gdb from Nixpkgs can be found in PATH.