lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

geant4: 10.4.1 -> 10.5.1 (#70535)

authored by

OmnipotentEntity and committed by
Dmitry Kalinkin
e36dca06 430e5ce0

+37 -25
+1 -1
pkgs/development/libraries/physics/geant4/datasets-hook.sh
··· 1 1 @name@ () { 2 - export G4@envvar@DATA="@out@/data" 2 + export G4@envvar@DATA="@datadir@" 3 3 } 4 4 5 5 postHooks+=(@name@)
+26 -17
pkgs/development/libraries/physics/geant4/datasets.nix
··· 1 - { stdenv, fetchurl, }: 1 + { stdenv, fetchurl, geant_version }: 2 2 3 3 let 4 - mkDataset = { name, version, sha256, envvar}: 4 + mkDataset = { name, version, sha256, envvar }: 5 5 stdenv.mkDerivation { 6 6 inherit name version; 7 + inherit geant_version; 7 8 8 9 src = fetchurl { 9 - url = "https://geant4-data.web.cern.ch/geant4-data/datasets/${name}.${version}.tar.gz"; 10 + url = "https://cern.ch/geant4-data/datasets/${name}.${version}.tar.gz"; 10 11 inherit sha256; 11 12 }; 12 13 ··· 14 15 dontBuild = true; 15 16 dontConfigure = true; 16 17 18 + datadir = "${placeholder "out"}/share/Geant4-${geant_version}/data/${name}${version}"; 17 19 installPhase = '' 18 - mkdir -p $out/data 19 - mv ./* $out/data 20 + mkdir -p $datadir 21 + mv ./* $datadir 20 22 ''; 21 23 22 24 inherit envvar; ··· 40 42 41 43 { 42 44 name = "G4EMLOW"; 43 - version = "7.3"; 44 - sha256 = "583aa7f34f67b09db7d566f904c54b21e95a9ac05b60e2bfb794efb569dba14e"; 45 + version = "7.7"; 46 + sha256 = "16dec6adda6477a97424d749688d73e9bd7d0b84d0137a67cf341f1960984663"; 45 47 envvar = "LE"; 46 48 } 47 49 48 50 { 49 51 name = "G4PhotonEvaporation"; 50 - version = "5.2"; 51 - sha256 = "83607f8d36827b2a7fca19c9c336caffbebf61a359d0ef7cee44a8bcf3fc2d1f"; 52 + version = "5.3"; 53 + sha256 = "d47ababc8cbe548065ef644e9bd88266869e75e2f9e577ebc36bc55bf7a92ec8"; 52 54 envvar = "LEVELGAMMA"; 53 55 } 54 56 55 57 { 56 58 name = "G4RadioactiveDecay"; 57 - version = "5.2"; 58 - sha256 = "99c038d89d70281316be15c3c98a66c5d0ca01ef575127b6a094063003e2af5d"; 59 + version = "5.3"; 60 + sha256 = "5c8992ac57ae56e66b064d3f5cdfe7c2fee76567520ad34a625bfb187119f8c1"; 59 61 envvar = "RADIOACTIVE"; 60 62 } 61 63 62 64 { 63 65 name = "G4SAIDDATA"; 64 - version = "1.1"; 65 - sha256 = "a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f"; 66 + version = "2.0"; 67 + sha256 = "1d26a8e79baa71e44d5759b9f55a67e8b7ede31751316a9e9037d80090c72e91"; 66 68 envvar = "SAIDXS"; 67 69 } 68 70 69 71 { 70 - name = "G4NEUTRONXS"; 71 - version = "1.4"; 72 - sha256 = "57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd"; 73 - envvar = "NEUTRONXS"; 72 + name = "G4PARTICLEXS"; 73 + version = "1.1"; 74 + sha256 = "100a11c9ed961152acfadcc9b583a9f649dda4e48ab314fcd4f333412ade9d62"; 75 + envvar = "PARTICLEXS"; 74 76 } 75 77 76 78 { ··· 78 80 version = "3.1"; 79 81 sha256 = "7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed"; 80 82 envvar = "ABLA"; 83 + } 84 + 85 + { 86 + name = "G4INCL"; 87 + version = "1.0"; 88 + sha256 = "716161821ae9f3d0565fbf3c2cf34f4e02e3e519eb419a82236eef22c2c4367d"; 89 + envvar = "INCL"; 81 90 } 82 91 83 92 {
+9 -6
pkgs/development/libraries/physics/geant4/default.nix
··· 35 35 , libXmu 36 36 }: 37 37 38 - stdenv.mkDerivation { 39 - version = "10.4.1"; 38 + stdenv.mkDerivation rec { 39 + version = "10.5.1"; 40 40 pname = "geant4"; 41 41 42 42 src = fetchurl{ 43 - url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz"; 44 - sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd"; 43 + url = "http://cern.ch/geant4-data/releases/geant4.10.05.p01.tar.gz"; 44 + sha256 = "f4a292220500fad17e0167ce3153e96e3410ecbe96284e572dc707f63523bdff"; 45 45 }; 46 46 47 47 cmakeFlags = [ ··· 78 78 setupHook = ./geant4-hook.sh; 79 79 80 80 passthru = { 81 - data = import ./datasets.nix { inherit stdenv fetchurl; }; 81 + data = import ./datasets.nix { 82 + inherit stdenv fetchurl; 83 + geant_version = version; 84 + }; 82 85 }; 83 86 84 87 # Set the myriad of envars required by Geant4 if we use a nix-shell. ··· 95 98 ''; 96 99 homepage = http://www.geant4.org; 97 100 license = licenses.g4sl; 98 - maintainers = with maintainers; [ tmplt ]; 101 + maintainers = with maintainers; [ tmplt omnipotententity ]; 99 102 platforms = platforms.linux; 100 103 }; 101 104 }
+1 -1
pkgs/development/libraries/physics/geant4/g4py/default.nix
··· 18 18 inherit (geant4_nomt) version src; 19 19 pname = "g4py"; 20 20 21 - sourceRoot = "geant4.10.04.p01/environments/g4py"; 21 + sourceRoot = "geant4.10.05.p01/environments/g4py"; 22 22 23 23 nativeBuildInputs = [ cmake ]; 24 24 buildInputs = [ geant4_nomt xercesc boost_python python ];