From 656888e1ec079e98de5dd0e3b28a29d290ea101d Mon Sep 17 00:00:00 2001 From: OmnipotentEntity Date: Thu, 10 Dec 2020 12:33:29 -0500 Subject: [PATCH] geant4: 10.6.3 -> 10.7.0 (#105920) --- .../libraries/physics/geant4/datasets.nix | 24 +++++++++---------- .../libraries/physics/geant4/default.nix | 10 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 85ad11b79b16..42014949c0b6 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -42,22 +42,22 @@ in { name = "G4EMLOW"; - version = "7.9.1"; - sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342"; + version = "7.13"; + sha256 = "0scczd4ismvd4g3vfshbvwv92bzkdjz0ma7y21n6qxxy96v9cj1p"; envvar = "LE"; } { name = "G4PhotonEvaporation"; - version = "5.5"; - sha256 = "1mvnbs7yvkii41blks6bkqr8qhxgnj3xxvv1i3vdg2y14shxv5ar"; + version = "5.7"; + sha256 = "1rg7fygfxx06h98ywlci6b0b9ih74q8diygr76c3vppxdzjl47kn"; envvar = "LEVELGAMMA"; } { name = "G4RadioactiveDecay"; - version = "5.4"; - sha256 = "0qaark6mqzxr3lqawv6ai8z5211qihlp5x2hn86vzx8kgpd7j1r4"; + version = "5.6"; + sha256 = "1w8d9zzc4ss7sh1f8cxv5pmrx2b74p1y26377rw9hnlfkiy0g1iq"; envvar = "RADIOACTIVE"; } @@ -70,8 +70,8 @@ in { name = "G4PARTICLEXS"; - version = "2.1"; - sha256 = "0h8ba8jk197npbd9lzq2qlfiklbjgqwk45m1cc6piy5vf8ri0k89"; + version = "3.1"; + sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0"; envvar = "PARTICLEXS"; } @@ -98,15 +98,15 @@ in { name = "G4ENSDFSTATE"; - version = "2.2"; - sha256 = "19p0sq0rmyg48j9hddqy24dn99md7ddiyq09lyj381q7cbpjfznx"; + version = "2.3"; + sha256 = "00wjir59rrrlk0a12vi8rsnhyya71rdi1kmark9sp487hbhcai4l"; envvar = "ENSDFSTATE"; } { name = "G4RealSurface"; - version = "2.1.1"; - sha256 = "0l3gs0nlp10cjlwiln3f72zfch0av2g1r8m2ny9afgvwgbwiyj4h"; + version = "2.2"; + sha256 = "08382y1258ifs7nap6zaaazvabg72blr0dkqgwk32lrg07hdwm4r"; envvar = "REALSURFACE"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index dc809d589321..7caae2c52d33 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -48,20 +48,20 @@ let in stdenv.mkDerivation rec { - version = "10.6.3"; + version = "10.7.0"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p03.tar.gz"; - sha256 = "1wzv5xky1pfm7wdfdkvqcaaqlcnsrz35dc7zcrxh8l3j5rki6pqb"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz"; + sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; postPatch = '' # Fix for boost 1.67+ substituteInPlace environments/g4py/CMakeLists.txt \ - --replace "find_package(Boost REQUIRED python)" \ - "find_package(Boost REQUIRED COMPONENTS $boost_python_lib)" + --replace "REQUIRED python" \ + "REQUIRED COMPONENTS $boost_python_lib" substituteInPlace environments/g4py/G4PythonHelpers.cmake \ --replace "Boost::python" "Boost::$boost_python_lib" '';