From 5c6453fd97d9eb7906fded455c4921347991a6d6 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 1 May 2024 14:34:38 +0200 Subject: root: 6.30.04 -> 6.30.06 --- 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 9548db1c7c479..50249c03c7bfd 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.30.04"; + version = "6.30.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw="; + hash = "sha256-MA237RtnjtL7ljXKZ1khoZRcfCED2oQAM7STCR9VcAw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; -- cgit 1.4.1 From 9792a8be2b7d63c3fd9161a0762d44ab49f3ca01 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 1 May 2024 14:40:44 +0200 Subject: root: remove deprecated build flags Remove several deprecated or removed build options. See https://github.com/root-project/root/blob/v6-30-00-patches/cmake/modules/RootBuildOptions.cmake --- pkgs/applications/science/misc/root/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 50249c03c7bfd..6489755740313 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -163,10 +163,6 @@ stdenv.mkDerivation rec { "-Dbuiltin_gtest=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=ON" - "-Dalien=OFF" - "-Dbonjour=OFF" - "-Dcastor=OFF" - "-Dchirp=OFF" "-Dclad=OFF" "-Ddavix=ON" "-Ddcache=OFF" @@ -176,21 +172,13 @@ stdenv.mkDerivation rec { "-Dfortran=OFF" "-Dgnuinstall=ON" "-Dimt=ON" - "-Dgfal=OFF" "-Dgviz=OFF" - "-Dhdfs=OFF" "-Dhttp=ON" - "-Dkrb5=OFF" - "-Dldap=OFF" - "-Dmonalisa=OFF" "-Dmysql=OFF" "-Dodbc=OFF" "-Dopengl=ON" - "-Doracle=OFF" "-Dpgsql=OFF" - "-Dpythia6=OFF" "-Dpythia8=OFF" - "-Drfio=OFF" "-Droot7=ON" "-Dsqlite=OFF" "-Dssl=ON" -- cgit 1.4.1 From 6665f67b4eef1f0e6ed467c80e86ed10c3553594 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 1 May 2024 14:43:36 +0200 Subject: root: remove some explicit disabling of compiler warnings on clang Remove some explicit disabling of compiler warnings on clang. There is no need for that: we saw the warnings on our own CI and made sure to either fix or disable them. --- pkgs/applications/science/misc/root/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 6489755740313..6419c1c23485e 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -199,9 +199,6 @@ stdenv.mkDerivation rec { "-Druntime_cxxmodules=OFF" ]; - # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ]; - postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ -- cgit 1.4.1 From e81a95f9802660ae4d47a19c96ba79bc3c73d0ff Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 1 May 2024 14:44:55 +0200 Subject: root: remove the hack that disables the splash screen by default Remove the hack that disables the splash screen by default, as this has already been done in ROOT itself some time ago: https://github.com/root-project/root/pull/4187 --- pkgs/applications/science/misc/root/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 6419c1c23485e..f51fdf85e59bf 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -53,7 +53,6 @@ , Cocoa , CoreSymbolication , OpenGL -, noSplash ? false }: stdenv.mkDerivation rec { @@ -143,8 +142,6 @@ stdenv.mkDerivation rec { -e '1iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' patchShebangs build/unix/ - '' + lib.optionalString noSplash '' - substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" '' + lib.optionalString stdenv.isDarwin '' # Eliminate impure reference to /System/Library/PrivateFrameworks substituteInPlace core/macosx/CMakeLists.txt \ -- cgit 1.4.1 From ebce8ace41c8ca0d1776de4c5be5c815fb2fb5f7 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 1 May 2024 14:56:40 +0200 Subject: maintainers: add guitargeek --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/science/misc/root/default.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6827bb944bc03..dd1993a555b61 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7702,6 +7702,12 @@ githubId = 10654650; name = "Guillaume Koenig"; }; + guitargeek = { + email = "jonas.rembser@cern.ch"; + github = "guitargeek"; + githubId = 6578603; + name = "Jonas Rembser"; + }; guserav = { github = "guserav"; githubId = 28863828; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index f51fdf85e59bf..8ba05dc244365 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -255,7 +255,7 @@ stdenv.mkDerivation rec { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; - maintainers = [ maintainers.veprbl ]; + maintainers = [ maintainers.guitargeek maintainers.veprbl ]; license = licenses.lgpl21; }; } -- cgit 1.4.1 From afde4332c323da699b4b2ea7aa60afcd30f19f24 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Wed, 1 May 2024 14:58:12 +0200 Subject: root: don't do anything specific for Python 2 Python 2 support is deprecated in ROOT 6.30 and will be removed from 6.32, due to release in May: https://github.com/root-project/root/pull/13948 --- 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 8ba05dc244365..59bb9415b37d9 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -189,7 +189,6 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${lib.getDev stdenv.cc.libc}/include" ++ lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" - "-DCMAKE_DISABLE_FIND_PACKAGE_Python2=TRUE" # fatal error: module map file '/nix/store/-Libsystem-osx-10.12.6/include/module.modulemap' not found # fatal error: could not build module '_Builtin_intrinsics' -- cgit 1.4.1