From 17af21d2316dd13d1602e33fd9e6892725272e82 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Mar 2018 15:35:15 -0600 Subject: [PATCH 1/2] range-v3: 2017-01-30 -> 0.3.5 --- pkgs/development/libraries/range-v3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index f1d9026b5f92..044a0f86c6c7 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "2017-01-30"; + version = "0.3.5"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; - rev = "bab29767cce120e11872d79a2537bc6f0be76963"; - sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi"; + rev = version; + sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; dontBuild = true; From 2e59e03d177ca60fc893735b0936c1c5edea80f2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Mar 2018 15:46:03 -0600 Subject: [PATCH 2/2] range-v3: tests --- pkgs/development/libraries/range-v3/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 044a0f86c6c7..bddda1dff552 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "range-v3-${version}"; @@ -11,11 +11,12 @@ stdenv.mkDerivation rec { sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/include - mv include/ $out/ - ''; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkTarget = "test"; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17";