diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2015-05-25 10:38:42 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-05-25 10:39:13 +0200 |
| commit | 0e9464478d0e3ae52f79e94db700b9dd39e4cec5 (patch) | |
| tree | f8627de936d4701c043ec142db454cda37b6ae03 /pkgs | |
| parent | 0f6f4004f3c912eb7b633de33211ed6bb61ef628 (diff) | |
| download | nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.tar nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.tar.gz nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.tar.bz2 nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.tar.lz nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.tar.xz nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.tar.zst nixpkgs-0e9464478d0e3ae52f79e94db700b9dd39e4cec5.zip | |
catch: add version 1.1-3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/catch/default.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 39 insertions, 1 deletions
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix new file mode 100644 index 00000000000..49376b74c17 --- /dev/null +++ b/pkgs/development/libraries/catch/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, cmake, fetchFromGitHub }: + +stdenv.mkDerivation rec { + + name = "catch-${version}"; + version = "1.1-3"; + + src = fetchFromGitHub { + owner = "philsquared"; + repo = "Catch"; + rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355"; + sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5"; + }; + + buildInputs = [ cmake ]; + dontUseCmakeConfigure = true; + + buildPhase = '' + cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release + cd Build + make + cd .. + ''; + + installPhase = '' + mkdir -p $out + mv include $out/. + ''; + + meta = with stdenv.lib; { + description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; + homepage = "http://catch-lib.net"; + license = licenses.boost; + maintainers = with maintainers; [ edwtjo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3913e9f65e8..d22a888a1c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -748,6 +748,8 @@ let capstone = callPackage ../development/libraries/capstone { }; + catch = callPackage ../development/libraries/catch { }; + catdoc = callPackage ../tools/text/catdoc { }; cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; @@ -4498,7 +4500,7 @@ let teyjus = callPackage ../development/compilers/teyjus { omake = omake_rc1; }; - + thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome.GConf; }; |