public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

geant4: remove multi version infrastructure

Browse Source 
Nobody maintains this and this does not contribute anything towards
making reproducible research. Also this was missing recurseIntoAttrs, so
Hydra used to not see it.
This commit is contained in:
Dmitry Kalinkin 2018-05-16 17:09:07 -04:00
parent ecfa538e05
commit 537de20645
3 changed files with 96 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/libraries/physics/geant4/default.nix
View File

@ -50,14 +50,15 @@ assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWra
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
assert enableInventor -> libXpm != null; assert enableInventor -> libXpm != null;
let stdenv.mkDerivation rec {
buildGeant4 = version = "10.4.1";
{ version, src, multiThreadingCapable ? false }:
stdenv.mkDerivation rec {
inherit version src;
name = "geant4-${version}"; name = "geant4-${version}";
src = fetchurl{
url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
};
cmakeFlags = [ cmakeFlags = [
"-DGEANT4_INSTALL_DATA=OFF" "-DGEANT4_INSTALL_DATA=OFF"
"-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}" "-DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}"
@ -70,9 +71,8 @@ let
"-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}"
"-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}" "-DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}"
] ++ stdenv.lib.optional multiThreadingCapable
"-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
++ stdenv.lib.optionals enableInventor [ ] ++ stdenv.lib.optionals enableInventor [
"-DINVENTOR_INCLUDE_DIR=${coin3d}/include" "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
"-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
]; ];
@ -113,20 +113,4 @@ let
maintainers = with maintainers; [ tmplt ]; maintainers = with maintainers; [ tmplt ];
platforms = platforms.all; platforms = platforms.all;
}; };
};
fetchGeant4 = import ./fetch.nix {
inherit stdenv fetchurl;
};
in {
v10_0_2 = buildGeant4 {
inherit (fetchGeant4.v10_0_2) version src;
multiThreadingCapable = true;
};
v10_4_1 = buildGeant4 {
inherit (fetchGeant4.v10_4_1) version src;
multiThreadingCapable = true;
};
} }

29
pkgs/development/libraries/physics/geant4/fetch.nix
View File

@ -1,29 +0,0 @@
{ stdenv, fetchurl }:
let
fetch = { version, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null }:
{
inherit version src;
};
in {
v10_0_2 = fetch {
version = "10.0.2";
src = fetchurl{
url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
};
};
v10_4_1 = fetch {
version = "10.4.1";
src = fetchurl{
url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
};
};
}

19
pkgs/development/libraries/physics/geant4/g4py/default.nix
View File

@ -8,12 +8,8 @@
, boost , boost
}: }:
let stdenv.mkDerivation rec {
buildG4py = inherit (geant4) version src;
{ version, src, geant4}:
stdenv.mkDerivation rec {
inherit version src geant4;
name = "g4py-${version}"; name = "g4py-${version}";
# ./configure overwrites $PATH, which clobbers everything. # ./configure overwrites $PATH, which clobbers everything.
@ -60,15 +56,4 @@ let
maintainers = [ ]; maintainers = [ ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
}; };
};
fetchGeant4 = import ../fetch.nix {
inherit stdenv fetchurl;
};
in {
v10_0_2 = buildG4py {
inherit (fetchGeant4.v10_0_2) version src;
geant4 = geant4.v10_0_2;
};
} }