tjh.dev
apfel: 3.0.6 -> 3.1.0 (#273073)
authored by Dmitry Kalinkin and committed by GitHub b576bc26 d6a0fea3
+14
pkgs/development/libraries/physics/apfel/cmake.patch
+14
pkgs/development/libraries/physics/apfel/cmake.patch
···
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+
--- a/CMakeLists.txt
3
+
+++ b/CMakeLists.txt
4
+
@@ -46,8 +46,8 @@ message(STATUS "APFEL: APFEL_DOWNLOAD_PDFS=${APFEL_DOWNLOAD_PDFS}")
5
+
# CONFIG SCRIPT ========================================================
6
+
set(prefix ${CMAKE_INSTALL_PREFIX})
7
+
set(exec_prefix "${prefix}")
8
+
-set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
9
+
-set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}")
10
+
+set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
11
+
+set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}")
12
+
set(PACKAGE_VERSION "${apfel_VERSION}")
13
+
configure_file("${PROJECT_SOURCE_DIR}/bin/apfel-config.in" "${PROJECT_BINARY_DIR}/bin/apfel-config")
14
+
configure_file("${PROJECT_SOURCE_DIR}/bin/apfel.in" "${PROJECT_BINARY_DIR}/bin/apfel")
+41
-10
pkgs/development/libraries/physics/apfel/default.nix
+41
-10
pkgs/development/libraries/physics/apfel/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gfortran, lhapdf, python3, zlib }:
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, cmake
5
+
, gfortran
6
+
, lhapdf
7
+
, python3
8
+
, swig
9
+
, zlib
10
+
}:
2
11
3
12
stdenv.mkDerivation rec {
4
13
pname = "apfel";
5
-
version = "3.0.6";
14
+
version = "3.1.0";
6
15
7
16
src = fetchFromGitHub {
8
17
owner = "scarrazza";
9
18
repo = "apfel";
10
19
rev = version;
11
-
sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o=";
20
+
hash = "sha256-RXzHcLgitIk+6pINqcvpQv7QpDpAuFrOHKqjwZ0K5zI=";
12
21
};
13
22
14
-
# needed for aarch64-darwin
15
-
nativeBuildInputs = [ autoreconfHook ];
23
+
patches = [
24
+
# https://github.com/scarrazza/apfel/pull/54
25
+
./cmake.patch
26
+
];
27
+
28
+
nativeBuildInputs = [
29
+
cmake
30
+
swig
31
+
];
32
+
buildInputs = [
33
+
gfortran
34
+
lhapdf
35
+
python3
36
+
zlib
37
+
];
38
+
39
+
cmakeFlags = [
40
+
"-DAPFEL_DOWNLOAD_PDFS=OFF"
41
+
"-DAPFEL_Python_SITEARCH=autoprefix"
42
+
];
16
43
17
-
buildInputs = [ gfortran lhapdf python3 zlib ];
44
+
doCheck = true;
45
+
nativeCheckInputs = [
46
+
lhapdf.pdf_sets.NNPDF23_nlo_as_0118
47
+
lhapdf.pdf_sets.NNPDF31_nnlo_as_0118
48
+
];
18
49
19
-
enableParallelBuilding = true;
50
+
env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}";
20
51
21
52
meta = with lib; {
22
53
description = "A PDF Evolution Library";
23
-
license = licenses.gpl3Plus;
24
-
homepage = "https://apfel.mi.infn.it/";
25
-
platforms = platforms.unix;
54
+
homepage = "https://apfel.mi.infn.it/";
55
+
license = licenses.gpl3Plus;
26
56
maintainers = with maintainers; [ veprbl ];
57
+
platforms = platforms.unix;
27
58
};
28
59
}