geant4: 11.2.2 -> 11.3.0origin/pr/geant4_11_3_0

3 files changed, 46 insertions, 13 deletions

diff --git a/pkgs/by-name/ge/geant4/datasets.nix b/pkgs/by-name/ge/geant4/datasets.nix
index 9e0d21e83642..43f01a71b6ae 100644
--- a/pkgs/by-name/ge/geant4/datasets.nix
+++ b/pkgs/by-name/ge/geant4/datasets.nix
@@ -59,22 +59,22 @@ builtins.listToAttrs (
 
       {
         pname = "G4EMLOW";
-        version = "8.5";
-        sha256 = "sha256-ZrrKSaxdReKsEMEltPsmYiXlEYA+ZpgZCc6c0+m873M=";
+        version = "8.6.1";
+        sha256 = "sha256-SpNYjSYIDOHTNrlPdvravkkF+48cuiQVeVAj1s2PSoo=";
         envvar = "LE";
       }
 
       {
         pname = "G4PhotonEvaporation";
-        version = "5.7";
-        sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U=";
+        version = "6.1";
+        sha256 = "sha256-X/wfmagdUMkCAYbVmHSvc8U7okwYQrO4KzGIIjuyRvI=";
         envvar = "LEVELGAMMA";
       }
 
       {
         pname = "G4RadioactiveDecay";
-        version = "5.6";
-        sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE=";
+        version = "6.1.2";
+        sha256 = "sha256-pA1+Prxk01VVxKSdD/HglFzWBdhDVNBTEhKTkUyuoTo=";
         envvar = "RADIOACTIVE";
       }
 
@@ -87,8 +87,8 @@ builtins.listToAttrs (
 
       {
         pname = "G4PARTICLEXS";
-        version = "4.0";
-        sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU=";
+        version = "4.1";
+        sha256 = "sha256-B64eBI6ayOf5H2aWSX3VW9UMzIItl68aC56SMhKm19E=";
         envvar = "PARTICLEXS";
       }
 
@@ -115,8 +115,8 @@ builtins.listToAttrs (
 
       {
         pname = "G4ENSDFSTATE";
-        version = "2.3";
-        sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM=";
+        version = "3.0";
+        sha256 = "sha256-S9w71Asx1DSFv0+H8FVwXlQKZVfWTthcaJxZyaTrp9Y=";
         envvar = "ENSDFSTATE";
       }
 
@@ -133,5 +133,26 @@ builtins.listToAttrs (
         sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA=";
         envvar = "PARTICLEHP";
       }
+
+      {
+        pname = "G4CHANNELING";
+        version = "1.0";
+        sha256 = "sha256-ID48aZhMoJrNGBodMamw76+tS8EubGCPCwXmlRINZ/I=";
+        envvar = "CHANNELING";
+      }
+
+      {
+        pname = "G4NUDEXLIB";
+        version = "1.0";
+        sha256 = "sha256-ysfWXpxa+O26KyZn1YIuFqr5kGXJX4Bedt5MyGOV9BU=";
+        envvar = "NUDEXLIB";
+      }
+
+      {
+        pname = "G4URRPT";
+        version = "1.1";
+        sha256 = "sha256-ajQy24C8CIruGcUEucASSRMAXWNX6hSHBFFACrINnBE=";
+        envvar = "URRPT";
+      }
     ]
 )
diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
index f5a80b186deb..4c7218cc6788 100644
--- a/pkgs/by-name/ge/geant4/package.nix
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -11,6 +11,7 @@
   libGL,
   libGLU,
   libGLX,
+  libX11,
   libXext,
   libXmu,
   libXpm,
@@ -37,12 +38,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "11.2.2";
+  version = "11.3.0";
   pname = "geant4";
 
   src = fetchurl {
     url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
-    hash = "sha256-0k9lc1uKCgOcAPlDSZHpnvEZuGxRDQ8qshFV24KjSR0=";
+    hash = "sha256-HaQxiz+W+H9NR1WKMtqyabjz/JVnCAOMKOcqGAsO+6Y=";
   };
 
   # Fix broken paths in a .pc
@@ -108,7 +109,10 @@ stdenv.mkDerivation rec {
       xercesc
       zlib
     ]
-    ++ lib.optionals enableOpenGLX11 [ libGL ]
+    ++ lib.optionals enableOpenGLX11 [
+      libGL
+      libX11
+    ]
     ++ lib.optionals enableXM [ motif ]
     ++ lib.optionals enableQt [ qt5.qtbase ];
 
diff --git a/pkgs/by-name/ge/geant4/tests.nix b/pkgs/by-name/ge/geant4/tests.nix
index f3f359c8725e..7bdb38f1ba71 100644
--- a/pkgs/by-name/ge/geant4/tests.nix
+++ b/pkgs/by-name/ge/geant4/tests.nix
@@ -31,5 +31,13 @@
 
       runHook postCheck
     '';
+
+    installPhase = ''
+      runHook preInstall
+
+      touch "$out"
+
+      runHook postInstall
+    '';
   };
 }