git.iko.soy/typeable/nixpkgs
on master help sign in
root: 6.12.06 -> 6.18.04

Also switch to python3.

commitb6d88738254bda84edb10dbdab2a2cdd9aac67a2 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateWed 11 Dec 2019, 20:04 (7 years ago) parent6498f46
3 files changed+61−42
pkgs/applications/science/misc/root/default.nix+14−6 pkgs/applications/science/misc/root/sw_vers.patch+46−35 pkgs/top-level/all-packages.nix+1−1
pkgs/applications/science/misc/root/default.nix+14−6
@@ -1,27 +1,32 @@
1−{ stdenv, fetchurl, cmake, pcre, pkgconfig, python2
2−, libX11, libXpm, libXft, libXext, libGLU, libGL, zlib, libxml2, lz4, lzma, gsl, xxHash
1+{ stdenv, fetchurl, cmake, gl2ps, gsl, libX11, libXpm, libXft, libXext
2+, libGLU, libGL, libxml2, lz4, lzma, pcre, pkgconfig, python, xxHash, zlib
33, Cocoa, OpenGL, noSplash ? false }:
44
55stdenv.mkDerivation rec {
66 pname = "root";
7− version = "6.12.06";
7+ version = "6.18.04";
88
99 src = fetchurl {
1010 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
11− sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f";
11+ sha256 = "196ghma6g5a7sqz52wyjkgvmh4hj4vqwppm0zwdypy33hgy8anii";
1212 };
1313
14− nativeBuildInputs = [ pkgconfig ];
15− buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
14+ nativeBuildInputs = [ cmake pkgconfig ];
15+ buildInputs = [ gl2ps pcre python zlib libxml2 lz4 lzma gsl xxHash ]
1616 ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ]
1717 ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
1818 ;
19+ propagatedBuildInputs = [ python.pkgs.numpy ];
1920
2021 patches = [
2122 ./sw_vers.patch
2223 ];
2324
2425 preConfigure = ''
26+ rm -rf builtins/*
27+ substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \
28+ --replace 'set(lcgpackages ' '#set(lcgpackages '
29+
2530 patchShebangs build/unix/
2631 '' + stdenv.lib.optionalString noSplash ''
2732 substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true"
@@ -35,8 +40,10 @@ stdenv.mkDerivation rec {
3540 "-Dbonjour=OFF"
3641 "-Dcastor=OFF"
3742 "-Dchirp=OFF"
43+ "-Dclad=OFF"
3844 "-Ddavix=OFF"
3945 "-Ddcache=OFF"
46+ "-Dfail-on-missing=ON"
4047 "-Dfftw3=OFF"
4148 "-Dfitsio=OFF"
4249 "-Dfortran=OFF"
@@ -57,6 +64,7 @@ stdenv.mkDerivation rec {
5764 "-Drfio=OFF"
5865 "-Dsqlite=OFF"
5966 "-Dssl=OFF"
67+ "-Dvdt=OFF"
6068 "-Dxml=ON"
6169 "-Dxrootd=OFF"
6270 ]
pkgs/applications/science/misc/root/sw_vers.patch+46−35
@@ -1,54 +1,46 @@
1−diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh
1+diff a/build/unix/compiledata.sh b/build/unix/compiledata.sh
22--- a/build/unix/compiledata.sh
33+++ b/build/unix/compiledata.sh
4−@@ -49,7 +49,7 @@ fi
4+@@ -47,7 +47,7 @@ fi
55
66 if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \
77 [ "$ARCH" = "macosxicc" ]; then
88- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
9−+ macosx_minor=7
9++ macosx_minor=12
1010 SOEXT="so"
1111 if [ $macosx_minor -ge 5 ]; then
1212 if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then
13−diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
13+diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
1414--- a/cmake/modules/SetUpMacOS.cmake
1515+++ b/cmake/modules/SetUpMacOS.cmake
16−@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6)
17− #---------------------------------------------------------------------------------------------------------
16+@@ -2,17 +2,8 @@ set(ROOT_ARCHITECTURE macosx)
17+ set(ROOT_PLATFORM macosx)
1818
1919 if (CMAKE_SYSTEM_NAME MATCHES Darwin)
2020- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
2121- COMMAND cut -d . -f 1-2
2222- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
23+-
2324- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}")
24−- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion"
25−- COMMAND cut -d . -f 2
26−- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE)
2725-
2826- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
2927 set(libcxx ON CACHE BOOL "Build using libc++" FORCE)
3028- endif()
3129
32−- if(${MACOSX_MINOR} GREATER 4)
30+- if(MACOSX_VERSION VERSION_GREATER 10.4)
3331 #TODO: check haveconfig and rpath -> set rpath true
3432 #TODO: check Thread, define link command
3533 #TODO: more stuff check configure script
36−- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT)
37−- if(${SYSCTL_OUTPUT} MATCHES 64)
38−- MESSAGE(STATUS "Found a 64bit system")
39− set(ROOT_ARCHITECTURE macosx64)
40− SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
41− SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64")
42−@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
34+@@ -25,23 +16,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
4335 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
4436 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
4537 SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64")
46−- else(${SYSCTL_OUTPUT} MATCHES 64)
38+- else()
4739- MESSAGE(STATUS "Found a 32bit system")
4840- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
4941- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
5042- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32")
51−- endif(${SYSCTL_OUTPUT} MATCHES 64)
43+- endif()
5244- endif()
5345-
5446- if(MACOSX_VERSION VERSION_GREATER 10.6)
@@ -59,32 +51,51 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake
5951- endif()
6052- if(MACOSX_VERSION VERSION_GREATER 10.8)
6153- set(MACOSX_GLU_DEPRECATED ON)
62−- set(MACOSX_KRB5_DEPRECATED ON)
63−- endif()
64−- if(MACOSX_VERSION VERSION_GREATER 10.9)
65−- set(MACOSX_LDAP_DEPRECATED ON)
6654- endif()
55++ endif()
6756
6857 if (CMAKE_COMPILER_IS_GNUCXX)
6958 message(STATUS "Found GNU compiler collection")
70−@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
59+@@ -104,7 +79,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin)
7160 endif()
7261
7362 #---Set Linker flags----------------------------------------------------------------------
74−- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib")
75−+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib")
76−
77−
63+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION}")
7864 else (CMAKE_SYSTEM_NAME MATCHES Darwin)
79−diff --git a/config/root-config.in b/config/root-config.in
65+ MESSAGE(FATAL_ERROR "There is no setup for this this Apple system up to now. Don't know waht to do. Stop cmake at this point.")
66+ endif (CMAKE_SYSTEM_NAME MATCHES Darwin)
67+diff a/config/root-config.in b/config/root-config.in
8068--- a/config/root-config.in
8169+++ b/config/root-config.in
82−@@ -304,7 +304,7 @@ macosxicc)
70+@@ -306,12 +306,6 @@ macosxicc)
71+ auxlibs="-lm -ldl"
8372 ;;
8473 macosx64)
85− # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
74+- # MacOS X with gcc (GNU cc v4.x) in 64 bit mode
8675- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2`
87−+ macosx_minor=7
88− # cannot find the one linked to libGraf if relocated after built
89− if [ $macosx_minor -le 4 ]; then
90− rootlibs="$rootlibs -lfreetype"
76+- # cannot find the one linked to libGraf if relocated after built
77+- if [ $macosx_minor -le 4 ]; then
78+- rootlibs="$rootlibs -lfreetype"
79+- fi
80+ auxcflags="${cxxversionflag} -m64"
81+ auxldflags="-m64"
82+ auxlibs="-lm -ldl"
83+@@ -375,18 +369,11 @@ freebsd* | openbsd* | linux*)
84+ macosx*)
85+ for f in $features ; do
86+ if test "x$f" = "xthread" ; then
87+- if [ $macosx_minor -ge 5 ]; then
88+ auxcflags="-pthread $auxcflags"
89+ auxlibs="-lpthread $auxlibs"
90+- else
91+- auxcflags="-D_REENTRANT $auxcflags"
92+- auxlibs="-lpthread $auxlibs"
93+- fi
94+ fi
95+ if test "x$f" = "xrpath" ; then
96+- if [ $macosx_minor -ge 5 ]; then
97+ auxlibs="-Wl,-rpath,$libdir $auxlibs"
98+- fi
99+ fi
100+ if test "x$f" = "xlibcxx" ; then
101+ auxcflags="-stdlib=libc++ $auxcflags"
pkgs/top-level/all-packages.nix+1−1
@@ -24228,8 +24228,8 @@ in
2422824228 ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
2422924229
2423024230 root = callPackage ../applications/science/misc/root {
24231+ python = python3;
2423124232 inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
24232− stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
2423324233 };
2423424234
2423524235 root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {