From 45f6bb6ba5aad658f6799a632950e1e26f0052d6 Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Tue, 27 Jun 2017 18:00:40 +0300
Subject: [PATCH 1/2] boost-build: update to version 2016.03

---
 .../development/tools/boost-build/default.nix | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 240d24961e00..39dd0069b4c6 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "boost-build-2.0-m12";
+  name = "boost-build-2.0-${version}";
+  version = "2016.03";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/boost/${name}.tar.bz2";
-    sha256 = "10sbbkx2752r4i1yshyp47nw29lyi1p34sy6hj7ivvnddiliayca";
+  src = fetchFromGitHub {
+    owner = "boostorg";
+    repo = "build";
+    rev = version;
+    sha256 = "1qw5marmp7z09nwcjlqrmqdg9b6myfqj3zvfz888x9mbidrmhn6p";
   };
 
   hardeningDisable = [ "format" ];
@@ -17,30 +20,17 @@ stdenv.mkDerivation rec {
   '';
 
   buildPhase = ''
-    cd jam_src
-    ./build.sh
+    ./bootstrap.sh
   '';
 
   installPhase = ''
-    # Install Bjam
-    mkdir -p $out/bin
-    cd "$(ls | grep bin)"
-    cp -a bjam $out/bin
-
-    # Bjam is B2
-    ln -s bjam $out/bin/b2
-
-    # Install the shared files (don't include jam_src)
-    cd ../..
-    rm -rf jam_src
-    mkdir -p $out/share
-    cp -a . $out/share/boost-build
+    ./b2 install --prefix=$out
   '';
 
   meta = with stdenv.lib; {
     homepage = http://www.boost.org/boost-build2/;
     license = stdenv.lib.licenses.boost;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ ivan-tkatchev ];
   };
 }

From 33adb080803dae5ab8f5cf62aa0e9dc25130fab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 28 Jun 2017 09:40:31 +0100
Subject: [PATCH 2/2] boost-build: drop spurious version infix

---
 pkgs/development/tools/boost-build/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix
index 39dd0069b4c6..89c1b560eaca 100644
--- a/pkgs/development/tools/boost-build/default.nix
+++ b/pkgs/development/tools/boost-build/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "boost-build-2.0-${version}";
+  name = "boost-build-${version}";
   version = "2016.03";
 
   src = fetchFromGitHub {