diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2022-10-28 07:15:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 07:15:59 -0500 |
| commit | 294da2c1673f84e6ecaf043ba07c5da59d34824b (patch) | |
| tree | cfd3f620fefb9ac4434ee4c77413be31464e4d5a | |
| parent | Merge pull request #196347 from aaronjheng/nix-store-gcs-proxy (diff) | |
| parent | cxxtest: use python3 (diff) | |
| download | nixpkgs-294da2c1673f84e6ecaf043ba07c5da59d34824b.tar.gz | |
Merge pull request #197060 from aaronjheng/cxxtest
cxxtest: use python3
| -rw-r--r-- | pkgs/development/libraries/cxxtest/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 3469cda3fc70..3b8d470d17f0 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cxxtest"; version = "4.4"; @@ -13,15 +13,26 @@ buildPythonApplication rec { sourceRoot = "source/python"; + checkInputs = [ python3Packages.ply ]; + + preCheck = '' + cd ../ + ''; + postCheck = '' - python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../test/GoodSuite.h - $CXX -I.. -o build/GoodSuite build/GoodSuite.cpp + cd python3 + python scripts/cxxtestgen --error-printer -o build/GoodSuite.cpp ../../test/GoodSuite.h + $CXX -I../../ -o build/GoodSuite build/GoodSuite.cpp build/GoodSuite ''; + preInstall = '' + cd python3 + ''; + postInstall = '' mkdir -p "$out/include" - cp -r ../cxxtest "$out/include" + cp -r ../../cxxtest "$out/include" ''; dontWrapPythonPrograms = true; @@ -29,8 +40,8 @@ buildPythonApplication rec { meta = with lib; { homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; - platforms = platforms.unix; license = licenses.lgpl3; - maintainers = [ maintainers.juliendehos ]; + platforms = platforms.unix; + maintainers = with maintainers; [ juliendehos ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 083626b746b5..368a2ddb9f75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18368,7 +18368,7 @@ with pkgs; cxxopts = callPackage ../development/libraries/cxxopts { }; - cxxtest = python2Packages.callPackage ../development/libraries/cxxtest { }; + cxxtest = python3Packages.callPackage ../development/libraries/cxxtest { }; cypress = callPackage ../development/web/cypress { }; |