diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2024-01-31 15:25:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 15:25:14 -0500 |
| commit | f125235a38e49a152d5f45c08254b4cb2f325fd6 (patch) | |
| tree | 39dca155285ea1055770e756e84f9fbf69845be2 /pkgs/applications/science/misc | |
| parent | 6c22593ad479d2af7374194a226d4239c86e1d62 (diff) | |
root: 6.30.02 -> 6.30.04 (#285339)
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index ee3610c5f6f68..c5534c18d7bbb 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -2,7 +2,6 @@ , lib , callPackage , fetchurl -, fetchpatch , makeWrapper , cmake , coreutils @@ -58,7 +57,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.30.02"; + version = "6.30.04"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -66,7 +65,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM="; + hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -110,13 +109,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - - # Fix for builtin_llvm=OFF - # https://github.com/root-project/root/pull/14238 - (fetchpatch { - url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff"; - hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw="; - }) ]; preConfigure = '' |