diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-06 16:32:47 +0100 |
| commit | 07bf828bd96591b302bd0a05edee48d2f4834efb (patch) | |
| tree | 22f053f5aaa4243c47d887237fa1f1d59b10d6f5 /pkgs/applications/science | |
| parent | 99c8e8e71f734ebc48ac6d3e8a6ac3e760ca7529 (diff) | |
| parent | d442a0ffc0ad7e33fa0fddaf0365caf80193a224 (diff) | |
| download | nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.gz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.bz2 nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.lz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.xz nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.tar.zst nixlib-07bf828bd96591b302bd0a05edee48d2f4834efb.zip | |
Merge branch 'staging'; security /cc #21642
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/root/sw_vers.patch | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index d1106a758473..220b2e06360f 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.04.18"; + version = "6.08.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9"; + sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ] @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { ; patches = [ - (fetchpatch { - url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch"; - sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; - }) ./sw_vers.patch # this prevents thisroot.sh from setting $p, which interferes with stdenv setup diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 3de2b839bf4b..c4632d62b4fe 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -42,12 +42,12 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake @@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") - SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64") + SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") - else(${SYSCTL_OUTPUT} MATCHES 64) - MESSAGE(STATUS "Found a 32bit system") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") -- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32") +- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") - endif(${SYSCTL_OUTPUT} MATCHES 64) - endif() - |