about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2018-03-01 16:37:56 -0600
committerGitHub <noreply@github.com>2018-03-01 16:37:56 -0600
commitd545bb649a275758bdf2aea51e7cd5b5d70855f7 (patch)
tree25d8a05c42ff025041ed4e9b1ff09430ba7eeef5
parent786f4020129fe7329caf48d2d2a82b641041d448 (diff)
parent2e59e03d177ca60fc893735b0936c1c5edea80f2 (diff)
downloadnixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.tar
nixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.tar.gz
nixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.tar.bz2
nixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.tar.lz
nixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.tar.xz
nixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.tar.zst
nixlib-d545bb649a275758bdf2aea51e7cd5b5d70855f7.zip
Merge pull request #36192 from dtzWill/update/range-v3-0.3.5
rangev3: 2017-01-30 -> 0.3.5, build and run tests
-rw-r--r--pkgs/development/libraries/range-v3/default.nix19
1 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
index f1d9026b5f92..bddda1dff552 100644
--- a/pkgs/development/libraries/range-v3/default.nix
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -1,21 +1,22 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 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;
-  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";