From 6778866a7a5154a7e4c0ce617d013c8a7105b244 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 13 Jul 2017 23:38:57 -0400
Subject: [PATCH] lhapdf: 6.1.6 -> 6.2.0

---
 .../libraries/physics/lhapdf/default.nix      | 12 ++++------
 .../physics/lhapdf/distutils-c++.patch        | 24 -------------------
 .../libraries/physics/lhapdf/maintainer.sh    |  2 +-
 .../libraries/physics/lhapdf/pdf_sets.nix     |  2 +-
 4 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/physics/lhapdf/distutils-c++.patch

diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix
index 90a6d17f09aa..ed8c4daa38b0 100644
--- a/pkgs/development/libraries/physics/lhapdf/default.nix
+++ b/pkgs/development/libraries/physics/lhapdf/default.nix
@@ -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;
 
diff --git a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch b/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
deleted file mode 100644
index 822c3e382724..000000000000
--- a/pkgs/development/libraries/physics/lhapdf/distutils-c++.patch
+++ /dev/null
@@ -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:
diff --git a/pkgs/development/libraries/physics/lhapdf/maintainer.sh b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
index b0ced3b24e0c..a8518d340b76 100755
--- a/pkgs/development/libraries/physics/lhapdf/maintainer.sh
+++ b/pkgs/development/libraries/physics/lhapdf/maintainer.sh
@@ -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}\" = \""
diff --git a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
index c2a0babb4d5b..79a28922a4e6 100644
--- a/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
+++ b/pkgs/development/libraries/physics/lhapdf/pdf_sets.nix
@@ -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;
       };