summary refs log tree commit diff
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2016-04-27 16:07:36 +0200
committerEdward Tjörnhammar <ed@cflags.cc>2016-04-27 16:07:36 +0200
commita19016b79e95b926a9aba47d632958d00943f1cb (patch)
tree56bd1eed5143093bbd7a66b649cff342ea5c2f08
parente6e7c1e914b816397836d1508c2bee345e0518e0 (diff)
parent6c0404730f6470932493d59530f396a53c3a0e75 (diff)
downloadnixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.tar
nixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.tar.gz
nixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.tar.bz2
nixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.tar.lz
nixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.tar.xz
nixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.tar.zst
nixpkgs-a19016b79e95b926a9aba47d632958d00943f1cb.zip
Merge pull request #15027 from knedlsepp/bump_catch
catch: 1.2.1 -> 1.5.0
-rw-r--r--pkgs/development/libraries/catch/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 625ec2995e3..3ab520fd4a6 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -3,20 +3,20 @@
 stdenv.mkDerivation rec {
 
   name = "catch-${version}";
-  version = "1.2.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
     rev = "v" + version;
-    sha256 = "0rz2nmvvh66x6w2nb7l08vc5x9aqg1qfz2qfiykaz1ybc19fwck2";
+    sha256 = "1ag8siafg7fmb50qdqznryrg3lvv56f09nvqwqqn2rlk83zjnaw0";
   };
 
   buildInputs = [ cmake ];
   dontUseCmakeConfigure = true;
 
   buildPhase = ''
-    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release
+    cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON
     cd Build
     make
     cd ..