about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOmnipotentEntity <OmnipotentEntity@gmail.com>2020-02-17 11:31:21 -0500
committerGitHub <noreply@github.com>2020-02-17 11:31:21 -0500
commiteb401313106aec6bb29eff5e80e919fb3486e133 (patch)
tree92ddbc9108daaf53516ef319e9f039f124612433
parentbadcdb3af76899c3967d7781c3a8cca4183d6957 (diff)
downloadnixlib-eb401313106aec6bb29eff5e80e919fb3486e133.tar
nixlib-eb401313106aec6bb29eff5e80e919fb3486e133.tar.gz
nixlib-eb401313106aec6bb29eff5e80e919fb3486e133.tar.bz2
nixlib-eb401313106aec6bb29eff5e80e919fb3486e133.tar.lz
nixlib-eb401313106aec6bb29eff5e80e919fb3486e133.tar.xz
nixlib-eb401313106aec6bb29eff5e80e919fb3486e133.tar.zst
nixlib-eb401313106aec6bb29eff5e80e919fb3486e133.zip
geant4: 10.6.0 -> 10.6.1 (#80365)
-rw-r--r--pkgs/development/libraries/physics/geant4/datasets.nix4
-rw-r--r--pkgs/development/libraries/physics/geant4/default.nix15
2 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
index 5e783b0e9501..df44fa275f5d 100644
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -42,8 +42,8 @@ in
 
     {
       name = "G4EMLOW";
-      version = "7.9";
-      sha256 = "1zrsvk2ahlwss6mgjrma6d2ii49vlzcd5r3ccw94c7m9rnk9mgsa";
+      version = "7.9.1";
+      sha256 = "1jrw0izw732bywq1k1srs3x2z0m3y2h377kcvwbwcr0wa1p10342";
       envvar = "LE";
     }
 
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 97e8cf9c7c43..1897071b1259 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -36,23 +36,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "10.6.0";
+  version = "10.6.1";
   pname = "geant4";
 
   src = fetchurl{
-    url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.tar.gz";
-    sha256 = "169ikv2sssfbqml7bs146dj035xifxm9b12r4rzmgpvswfhca90l";
+    url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.06.p01.tar.gz";
+    sha256 = "0ssxg7dd7vxljb3fdyb0llg7gsxack21qjfsb3n23k107a19yibk";
   };
 
-  # This patch fixes crash when set -u is enabled
-  patches = [
-    (fetchpatch {
-      name = "bash-variable-fix.patch";
-      url = "https://bugzilla-geant4.kek.jp/attachment.cgi?id=606&action=diff&collapsed=&headers=1&format=raw";
-      sha256 = "1bg9wg174fbqbjsjm1gz9584a7rq9p1szxr2fq9yfvqaf78289k6";
-    })
-  ];
-
   cmakeFlags = [
     "-DGEANT4_INSTALL_DATA=OFF"
     "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"