geant4: 10.4.1 -> 10.5.1 (#70535)

This commit is contained in:
OmnipotentEntity 2019-10-19 18:23:42 -04:00 committed by Dmitry Kalinkin
parent 430e5ce04c
commit e36dca0624
4 changed files with 37 additions and 25 deletions

View file

@ -1,5 +1,5 @@
@name@ () {
export G4@envvar@DATA="@out@/data"
export G4@envvar@DATA="@datadir@"
}
postHooks+=(@name@)

View file

@ -1,12 +1,13 @@
{ stdenv, fetchurl, }:
{ stdenv, fetchurl, geant_version }:
let
mkDataset = { name, version, sha256, envvar}:
mkDataset = { name, version, sha256, envvar }:
stdenv.mkDerivation {
inherit name version;
inherit geant_version;
src = fetchurl {
url = "https://geant4-data.web.cern.ch/geant4-data/datasets/${name}.${version}.tar.gz";
url = "https://cern.ch/geant4-data/datasets/${name}.${version}.tar.gz";
inherit sha256;
};
@ -14,9 +15,10 @@ let
dontBuild = true;
dontConfigure = true;
datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${name}${version}";
installPhase = ''
mkdir -p $out/data
mv ./* $out/data
mkdir -p $datadir
mv ./* $datadir
'';
inherit envvar;
@ -40,37 +42,37 @@ in
{
name = "G4EMLOW";
version = "7.3";
sha256 = "583aa7f34f67b09db7d566f904c54b21e95a9ac05b60e2bfb794efb569dba14e";
version = "7.7";
sha256 = "16dec6adda6477a97424d749688d73e9bd7d0b84d0137a67cf341f1960984663";
envvar = "LE";
}
{
name = "G4PhotonEvaporation";
version = "5.2";
sha256 = "83607f8d36827b2a7fca19c9c336caffbebf61a359d0ef7cee44a8bcf3fc2d1f";
version = "5.3";
sha256 = "d47ababc8cbe548065ef644e9bd88266869e75e2f9e577ebc36bc55bf7a92ec8";
envvar = "LEVELGAMMA";
}
{
name = "G4RadioactiveDecay";
version = "5.2";
sha256 = "99c038d89d70281316be15c3c98a66c5d0ca01ef575127b6a094063003e2af5d";
version = "5.3";
sha256 = "5c8992ac57ae56e66b064d3f5cdfe7c2fee76567520ad34a625bfb187119f8c1";
envvar = "RADIOACTIVE";
}
{
name = "G4SAIDDATA";
version = "1.1";
sha256 = "a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f";
version = "2.0";
sha256 = "1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91";
envvar = "SAIDXS";
}
{
name = "G4NEUTRONXS";
version = "1.4";
sha256 = "57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd";
envvar = "NEUTRONXS";
name = "G4PARTICLEXS";
version = "1.1";
sha256 = "100a11c9ed961152acfadcc9b583a9f649dda4e48ab314fcd4f333412ade9d62";
envvar = "PARTICLEXS";
}
{
@ -80,6 +82,13 @@ in
envvar = "ABLA";
}
{
name = "G4INCL";
version = "1.0";
sha256 = "716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d";
envvar = "INCL";
}
{
name = "G4PII";
version = "1.3";

View file

@ -35,13 +35,13 @@
, libXmu
}:
stdenv.mkDerivation {
version = "10.4.1";
stdenv.mkDerivation rec {
version = "10.5.1";
pname = "geant4";
src = fetchurl{
url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
url = "http://cern.ch/geant4-data/releases/geant4.10.05.p01.tar.gz";
sha256 = "f4a292220500fad17e0167ce3153e96e3410ecbe96284e572dc707f63523bdff";
};
cmakeFlags = [
@ -78,7 +78,10 @@ stdenv.mkDerivation {
setupHook = ./geant4-hook.sh;
passthru = {
data = import ./datasets.nix { inherit stdenv fetchurl; };
data = import ./datasets.nix {
inherit stdenv fetchurl;
geant_version = version;
};
};
# Set the myriad of envars required by Geant4 if we use a nix-shell.
@ -95,7 +98,7 @@ stdenv.mkDerivation {
'';
homepage = http://www.geant4.org;
license = licenses.g4sl;
maintainers = with maintainers; [ tmplt ];
maintainers = with maintainers; [ tmplt omnipotententity ];
platforms = platforms.linux;
};
}

View file

@ -18,7 +18,7 @@ stdenv.mkDerivation {
inherit (geant4_nomt) version src;
pname = "g4py";
sourceRoot = "geant4.10.04.p01/environments/g4py";
sourceRoot = "geant4.10.05.p01/environments/g4py";
nativeBuildInputs = [ cmake ];
buildInputs = [ geant4_nomt xercesc boost_python python ];