diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-28 00:13:53 +0300 |
| commit | 4ff8f377afcfcb206c585f165dc1332c9fb1eba1 (patch) | |
| tree | 2df363c4be265610f3982377b3a1dc61870a544a /pkgs/development/libraries/catch/default.nix | |
| parent | 7ac1ef05fa162d8e3c35925034df72288df77c8b (diff) | |
| parent | 49d1acb50f6465aceb5502de62e0c5d3a3d1d1a4 (diff) | |
| download | nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.gz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.bz2 nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.lz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.xz nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.tar.zst nixlib-4ff8f377afcfcb206c585f165dc1332c9fb1eba1.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/catch/default.nix')
| -rw-r--r-- | pkgs/development/libraries/catch/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 625ec2995e34..3ab520fd4a6b 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 .. |