From patchwork Fri Jul 5 08:58:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 65937 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0B7BA27BBE2; Fri, 5 Jul 2024 14:48:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 59AAE27BBE9 for ; Fri, 5 Jul 2024 14:48:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPjI9-0003Q9-VQ; Fri, 05 Jul 2024 09:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPjI8-0003Ps-C4 for guix-patches@gnu.org; Fri, 05 Jul 2024 09:48:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPjI8-0003li-3N for guix-patches@gnu.org; Fri, 05 Jul 2024 09:48:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPjIA-0007kC-Mw for guix-patches@gnu.org; Fri, 05 Jul 2024 09:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71948] [PATCH] gnu: rapidcheck: Update to 0.0.0-1.ff6af6f. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 05 Jul 2024 13:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71948 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71948@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172018722929700 (code B ref -1); Fri, 05 Jul 2024 13:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 5 Jul 2024 13:47:09 +0000 Received: from localhost ([127.0.0.1]:43768 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPjHI-0007iy-Gl for submit@debbugs.gnu.org; Fri, 05 Jul 2024 09:47:08 -0400 Received: from lists.gnu.org ([209.51.188.17]:47208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPjHG-0007iq-9E for submit@debbugs.gnu.org; Fri, 05 Jul 2024 09:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sPjHC-0003Ls-Tg for guix-patches@gnu.org; Fri, 05 Jul 2024 09:47:02 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sPjHA-0003g0-Hm for guix-patches@gnu.org; Fri, 05 Jul 2024 09:47:02 -0400 Received: by mail-wr1-x442.google.com with SMTP id ffacd0b85a97d-367a2c2e41aso676316f8f.2 for ; Fri, 05 Jul 2024 06:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720187217; x=1720792017; darn=gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=oUtMKxNlnP2RgxKvynYm5mwONq7JzhDwoZwW8S+CnYU=; b=RB8TX+iThmsWnO6+wXqY0xaJKvws2YzW5RTDUwtNARXTNgFYgSTBv7v9HgS22VzCo2 sx6p8+N0n2/R3rfm/smKoxY6N9F7sM5Ked9nwIWejGU9ii02wbLxK1Kt/UFGQXMf/EZj y5MyJplEq7xfVEhrr9U3UtBLmI3NPEEOIL3iZQh19JzX4v6Zu3cj2KWZXFd4PDpt7zrD 45rkvANdv4USdM15nPDgfrzqD+nl7yhFPNMZFBW96c/GxXCxVytZ7u6gtkFr+LAlCzj5 XDnz1M/QXMZRPc6nVSvUCLrRhDo0xX+aCyOFq6ErXpRQ9+baF2VU4m+yHFBSy3pSqlpZ EDcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720187217; x=1720792017; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oUtMKxNlnP2RgxKvynYm5mwONq7JzhDwoZwW8S+CnYU=; b=oGsQLPn7eGwcN4+3rgMJO/y5YssZOfj+5pIKuZQGzvxFR1r616WKYwoSTE3OFnhveG CwTVATY8Vyx0fs810AAOl9j6E/i31sfb+A9u3HVaXAcv+16Dy4AB/uZedDE8/LbmwnMB xHmnHoNgkmKADID+y/wbKXiDDf+S132G27GxZfA0HZgw+xdCymvwAq0P4d9nNLYam8XG kMTNYCd9W7whP7ob0FGcaR9GF27nwEC90c65m8Jc4v5NyVzYFE08eyZ5agQ80HiO3UUn M/nSJg2/jli4FlXef/sDCjBJccXR9kEcrEHhZTgV5njK675zr8RDeNnbk9zgfrJX7Lvo Te8Q== X-Gm-Message-State: AOJu0YxP5Hiteh2WxuaeBsPXp4AZue6Z0wBM4uHavMP/Q9vuihoiaBVb 1rlcWfbVSY5/ogc8SFHjklGVtnwXX+vGrHiKnhGkzTINz7qtuwC9DlzMnNVq X-Google-Smtp-Source: AGHT+IG3Ai+RJO6d4PtSP30E5gdSOJhsBwMUeOU9p/tcxP+jBZhbKMlTS8zuaRDr4bpWplC61ctUIg== X-Received: by 2002:adf:e952:0:b0:367:a4c7:a134 with SMTP id ffacd0b85a97d-367a4c7a744mr2221761f8f.40.1720187216556; Fri, 05 Jul 2024 06:46:56 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36796a6053fsm5950576f8f.57.2024.07.05.06.46.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jul 2024 06:46:55 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Fri, 5 Jul 2024 10:58:57 +0200 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=liliana.prikler@gmail.com; helo=mail-wr1-x442.google.com X-Spam_score_int: 25 X-Spam_score: 2.5 X-Spam_bar: ++ X-Spam_report: (2.5 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_03_06=1.592, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MALFORMED_FREEMAIL=3.002, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (rapidcheck): Update to 0.0.0-1.ff6af6f. [source]: Add snippet to find inputs. [arguments]: Remove #:phases and #:tests?. <#:configure-flags?>: Add “-DRC_ENABLE_BOOST=on”, “-DRC_ENABLE_CATCH=on”, “-DRC_ENABLE_DOCTEST=on”, “-DRC_ENABLE_GTEST=on”, and “-DRC_ENABLE_TESTS=on”. [inputs]: Add boost, catch2, doctest and googletest. [native-inputs]: Add catch2 and googletest. --- gnu/packages/check.scm | 44 ++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 17 deletions(-) base-commit: 5ee2799cabba4b2d462ac064a98789d7bca07923 diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 550a5d0f1d..1ed0ad9c98 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -73,6 +73,7 @@ (define-module (gnu packages check) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages boost) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -3396,8 +3397,8 @@ (define-public libfaketime (license license:gpl2))) (define-public rapidcheck - (let ((commit "a5724ea5b0b00147109b0605c377f1e54c353ba2") - (revision "0")) + (let ((commit "ff6af6fc683159deb51c543b065eba14dfcf329b") + (revision "1")) (package (name "rapidcheck") (version (git-version "0.0.0" revision commit)) @@ -3410,24 +3411,33 @@ (define-public rapidcheck (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0f2dmsym8ibnwkaidxmgp73mg0sdniwsyn6ppskh74246h29bbcy")))) + (base32 "1s2qva1amhs887jcdj12ppxk9kkfvy25xy7vzhkwb7rljr3gj713")) + (modules '((guix build utils))) + (snippet + #~(begin + (make-file-writable "ext/CMakeLists.txt") + (call-with-output-file "ext/CMakeLists.txt" + (lambda (out) + (display "find_package(Catch2 REQUIRED GLOBAL)\n" out) + (display "find_package(GTest GLOBAL)\n" out) + (display "find_package(Boost GLOBAL)\n" out))) + (substitute* "extras/boost/test/CMakeLists.txt" + (("^([ ]*)boost" all spaces) + (string-append spaces "Boost::boost"))))))) (arguments (list - #:tests? #f ;require fetching submodules - #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-extra-headers - (lambda _ - (with-directory-excursion "../source/extras" - (for-each - (lambda (dir) - (let ((dir (string-append dir "/include/rapidcheck/")) - (dest (string-append #$output - "/include/rapidcheck"))) - (copy-recursively dir dest))) - '("boost" "boost_test" "catch" "gmock" "gtest")))))))) + #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + "-DRC_ENABLE_BOOST=on" + "-DRC_ENABLE_CATCH=on" + "-DRC_ENABLE_DOCTEST=on" + "-DRC_ENABLE_GTEST=on" + "-DRC_ENABLE_TESTS=on"))) (build-system cmake-build-system) + (inputs (list boost + catch2 + doctest + googletest)) + (native-inputs (list catch2 googletest)) (home-page "https://github.com/emil-e/rapidcheck") (synopsis "Property based testing framework for C++") (description "Rapidcheck is a property based testing framework for C++.