Skip to content

rapidcheck: Simplify installation, update, pkg-config #274297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roberth merged 3 commits into from
Dec 17, 2023
Merged

rapidcheck: Simplify installation, update, pkg-config #274297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab8cf01
rapidcheck: Use stock installation, multiple outputs
Ericson2314 Dec 14, 2023
789df4b
rapidcheck: unstable-2023-04-16 -> unstable-2023-12-14
Ericson2314 Dec 14, 2023
a7447f9
rapidcheck: Add `meta.pkgConfigModules` and test
Ericson2314 Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 23 additions & 15 deletions pkgs/development/libraries/rapidcheck/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,40 +3,48 @@
, fetchFromGitHub
, cmake
, unstableGitUpdater
, testers
}:

stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rapidcheck";
version = "unstable-2023-04-16";
version = "unstable-2023-12-14";

src = fetchFromGitHub {
owner = "emil-e";
repo = "rapidcheck";
rev = "a5724ea5b0b00147109b0605c377f1e54c353ba2";
hash = "sha256-nq2VBDREkAOnvtdYr3m0TYNXx7mv9hbV5HZFVL2uTTg=";
rev = "ff6af6fc683159deb51c543b065eba14dfcf329b";
hash = "sha256-Ixz5RpY0n8Un/Pv4XoTfbs40+70iyMbkQUjDqoLaWOg=";
};

outputs = [ "out" "dev" ];

nativeBuildInputs = [ cmake ];

cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
(lib.cmakeBool "RC_INSTALL_ALL_EXTRAS" true)
];

# Install the extras headers
postInstall = ''
cp -r $src/extras $out
chmod -R +w $out/extras
rm $out/extras/CMakeLists.txt
rm $out/extras/**/CMakeLists.txt
'';

passthru.updateScript = unstableGitUpdater { };
passthru = {
updateScript = unstableGitUpdater { };
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};

meta = with lib; {
description = "A C++ framework for property based testing inspired by QuickCheck";
inherit (src.meta) homepage;
inherit (finalAttrs.src.meta) homepage;
maintainers = with maintainers; [ ];
license = licenses.bsd2;
pkgConfigModules = [
"rapidcheck"
# Extras
"rapidcheck_boost"
"rapidcheck_boost_test"
"rapidcheck_catch"
"rapidcheck_doctest"
"rapidcheck_gtest"
];
platforms = platforms.all;
};
}
})
2 changes: 0 additions & 2 deletions pkgs/tools/package-management/nix/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,6 @@ self = stdenv.mkDerivation {
"--enable-gc"
] ++ lib.optionals (!enableDocumentation) [
"--disable-doc-gen"
] ++ lib.optionals atLeast214 [
"CXXFLAGS=-I${lib.getDev rapidcheck}/extras/gtest/include"
] ++ lib.optionals stdenv.isLinux [
"--with-sandbox-shell=${busybox-sandbox-shell}/bin/busybox"
] ++ lib.optionals (atLeast210 && stdenv.isLinux && stdenv.hostPlatform.isStatic) [
Expand Down