lhapdf: 6.1.6 -> 6.2.0
This commit is contained in:
parent
bc2c576132
commit
6778866a7a
@ -1,19 +1,15 @@
|
|||||||
{ stdenv, fetchurl, boost, python2 }:
|
{ stdenv, fetchurl, python2 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "lhapdf-${version}";
|
name = "lhapdf-${version}";
|
||||||
version = "6.1.6";
|
version = "6.2.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
|
url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
|
||||||
sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2";
|
sha256 = "005jfapdj3mmk62p9qgvw7nyg93pqy249p1xy2ws1qx42xj76lih";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ boost python2 ];
|
buildInputs = [ python2 ];
|
||||||
|
|
||||||
patches = [ ./distutils-c++.patch ];
|
|
||||||
|
|
||||||
configureFlags = "--with-boost=${boost.dev}";
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
@ -1,24 +0,0 @@
|
|||||||
--- a/wrappers/python/Makefile.am
|
|
||||||
+++ b/wrappers/python/Makefile.am
|
|
||||||
@@ -25,7 +25,7 @@ fix-out-of-source: $(FIXSOURCES)
|
|
||||||
|
|
||||||
if WITH_PYTHON
|
|
||||||
|
|
||||||
-PYEXT_ENV = CC=$(CC) CXX=$(CXX)
|
|
||||||
+PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
|
|
||||||
|
|
||||||
## Always force setup.py, it's not good at guessing what needs to rebuild
|
|
||||||
all-local: fix-out-of-source
|
|
||||||
diff --git a/wrappers/python/Makefile.in b/wrappers/python/Makefile.in
|
|
||||||
index 925460c..fdc8888 100644
|
|
||||||
--- a/wrappers/python/Makefile.in
|
|
||||||
+++ b/wrappers/python/Makefile.in
|
|
||||||
@@ -266,7 +266,7 @@ top_builddir = @top_builddir@
|
|
||||||
top_srcdir = @top_srcdir@
|
|
||||||
EXTRA_DIST = lhapdf.cpp lhapdf.pyx clhapdf.pxd
|
|
||||||
FIXSOURCES = $(EXTRA_DIST)
|
|
||||||
-@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CC) CXX=$(CXX)
|
|
||||||
+@WITH_PYTHON_TRUE@PYEXT_ENV = CC=$(CXX) CXX=$(CXX)
|
|
||||||
all: all-am
|
|
||||||
|
|
||||||
.SUFFIXES:
|
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/"
|
BASE_URL="https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/"
|
||||||
|
|
||||||
for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do
|
for pdf_set in `curl $BASE_URL 2>/dev/null | gsed -e "s/.*<a href=\"\([^\"]*.tar.gz\)\".*/\1/;tx;d;:x"`; do
|
||||||
echo -n " \"${pdf_set%.tar.gz}\" = \""
|
echo -n " \"${pdf_set%.tar.gz}\" = \""
|
||||||
|
@ -6,7 +6,7 @@ let
|
|||||||
inherit name;
|
inherit name;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.1/${name}.tar.gz";
|
url = "https://www.hepforge.org/archive/lhapdf/pdfsets/6.2/${name}.tar.gz";
|
||||||
inherit sha256;
|
inherit sha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user