Merge pull request #92120 from veprbl/pr/hepmc2_2_06_11
hepmc2: 2.06.10 -> 2.06.11, mark as LGPL 2.1
This commit is contained in:
commit
17e92908ec
2 changed files with 7 additions and 35 deletions
|
@ -2,28 +2,25 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hepmc";
|
||||
version = "2.06.10";
|
||||
version = "2.06.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz";
|
||||
sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs";
|
||||
sha256 = "1pp89bs05nv60wjk1690ndwh4dsd5mk20bzsd4a2lklysdifvb6f";
|
||||
};
|
||||
|
||||
patches = [ ./in_source.patch ];
|
||||
buildInputs = [ cmake ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-Dmomentum:STRING=GEV"
|
||||
"-Dlength:STRING=MM"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
license = licenses.lgpl21;
|
||||
homepage = "http://hepmc.web.cern.ch/hepmc/";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with stdenv.lib.maintainers; [ veprbl ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -37,21 +37,6 @@ message(STATUS "default momentum and length are ${HEPMC_DEFAULT_MOM_UNIT} ${HEPM
|
||||
# find the HepMC cmake modules
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules ${CMAKE_MODULE_PATH})
|
||||
|
||||
-# make sure we are not building from within the source code directory
|
||||
-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source)
|
||||
-string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir
|
||||
-"${CMAKE_BINARY_DIR}")
|
||||
-if (in_source OR in_source_subdir)
|
||||
- message(FATAL_ERROR "
|
||||
-ERROR: In source builds of this project are not allowed.
|
||||
-A separate build directory is required.
|
||||
-Please create one and run cmake from the build directory.
|
||||
-Also note that cmake has just added files to your source code directory.
|
||||
-We suggest getting a new copy of the source code.
|
||||
-Otherwise, delete `CMakeCache.txt' and the directory `CMakeFiles'.
|
||||
- ")
|
||||
-endif ()
|
||||
-
|
||||
# build_docs is OFF (false) by default
|
||||
if ( build_docs )
|
||||
message(STATUS "documents WILL be built and installed" )
|
Loading…
Reference in a new issue