ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 02:05:51 +03:00
Code Issues Projects Releases Wiki Activity

lhapdf: 6.1.6 -> 6.2.0

Browse Source
This commit is contained in:
Dmitry Kalinkin 2017-07-13 23:38:57 -04:00
parent bc2c576132
commit 6778866a7a
No known key found for this signature in database
GPG Key ID: 5157B3EC8B2CA333
4 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/physics/lhapdf/default.nix
View File

@ -1,19 +1,15 @@
{ stdenv, fetchurl, boost, python2 }:
{ stdenv, fetchurl, python2 }:
stdenv.mkDerivation rec {
name = "lhapdf-${version}";
version = "6.1.6";
version = "6.2.0";
src = fetchurl {
url = "http://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
sha256 = "1sgbaxv8clcfy4d96fkwfyqcd4b29i0hwv32ry4vy69j5qiki0f2";
sha256 = "005jfapdj3mmk62p9qgvw7nyg93pqy249p1xy2ws1qx42xj76lih";
};
buildInputs = [ boost python2 ];
patches = [ ./distutils-c++.patch ];
configureFlags = "--with-boost=${boost.dev}";
buildInputs = [ python2 ];
enableParallelBuilding = true;

24
pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
View File

@ -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
pkgs/development/libraries/physics/lhapdf/maintainer.sh
View File

@ -2,7 +2,7 @@
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
echo -n " \"${pdf_set%.tar.gz}\" = \""

2
pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
View File

@ -6,7 +6,7 @@ let
inherit name;
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;
};