From patchwork Tue Aug 6 13:09:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Faiz X-Patchwork-Id: 66827 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 1461627BBEA; Tue, 6 Aug 2024 14:11:01 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 19CFD27BBE2 for ; Tue, 6 Aug 2024 14:11:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbJxc-0008IM-Va; Tue, 06 Aug 2024 09:10:45 -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 1sbJxX-0007r6-FL for guix-patches@gnu.org; Tue, 06 Aug 2024 09:10:41 -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 1sbJxX-0003Be-29 for guix-patches@gnu.org; Tue, 06 Aug 2024 09:10:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=From:MIME-Version:Date:To:In-Reply-To:References:Subject; bh=0uYBIu9wCMRCGGbYziEh9q7aStmNUF19tUB4M9xz2Ok=; b=j1TnH5hLY+OzgCgrmnmL8rxCMsk3PEM1J6eiW3yMFzozNCeBI+566zkZtLAZ/dvGufTaThrRVfwGwOlw2P0Ck+1BhD7UqfT77lPxkHk7RnsUmYDE18HVP/Rfp3+ppT2AJTeRE/G/+ugkvTPyx+CGl2J9+z4pSbBBLovfbUkLaz/JTLQoAzjNfwitAMpGBrTZbyspyYDUQslvilXLYtHAkEeOEBEsEXV9vgVqXXr7wB8QYn7BniTUz5Wb3CrgD87Sp9VU9cvIQdwClGDtmnlO1iO0Zua7SrqQi8HOTv9wwh450rq85hOF4qg2Z7PgmWXoGQjSndECYURAWLxkj/utfg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbJxu-0004eO-Kd for guix-patches@gnu.org; Tue, 06 Aug 2024 09:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69276] [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style. References: In-Reply-To: Resent-From: Adam Faiz Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Aug 2024 13:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69276@debbugs.gnu.org Received: via spool by 69276-submit@debbugs.gnu.org id=B69276.172294981017754 (code B ref 69276); Tue, 06 Aug 2024 13:11:02 +0000 Received: (at 69276) by debbugs.gnu.org; 6 Aug 2024 13:10:10 +0000 Received: from localhost ([127.0.0.1]:60425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbJx4-0004cI-0Q for submit@debbugs.gnu.org; Tue, 06 Aug 2024 09:10:10 -0400 Received: from layka.disroot.org ([178.21.23.139]:59056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbJx1-0004c8-TD for 69276@debbugs.gnu.org; Tue, 06 Aug 2024 09:10:08 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 83D0640D1E for <69276@debbugs.gnu.org>; Tue, 6 Aug 2024 15:09:43 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id JvCG2_xBb38D for <69276@debbugs.gnu.org>; Tue, 6 Aug 2024 15:09:42 +0200 (CEST) Message-ID: <405ac53a-7195-4b9f-db06-022e6bb3433c@disroot.org> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1722949780; bh=lfEqqRGWCAuV8mnPyRTYD3toVMKoRr4lqszw4ZWA8gs=; h=Date:To:From:Subject; b=ZwL9lUDSVgIKe44LLfjJhhlum0zy2M+qvvSySprb+AP6cKL2NmhtdygIk7xOkeAPH FaDremx7Njn2bWglZU6m0sCx1N7DbFDeL/k2PuYIDpqR1dn0oyuBrap2uHQMBYt1BN DEXkEwfdjbIdTwq8p3stzsoOGvxPqdY6mS/Zz4u20OjZ+9xKCaByAQMFE1ye8Ia6G2 U9vKbH0RD3jJNiuI1lDy1NWyyr8UTXAToQ80DixuHnP9v09uAxx0Kzx3hxj2QUtCXX d8wb8/0VMH6AJbrRpVf9j7wywate9it4tXICNSMWu6j3DqXMYN7mOf92KicrtHy4BD ZjrxsVlyNzO5g== Date: Tue, 6 Aug 2024 21:09:17 +0800 MIME-Version: 1.0 Content-Language: en-US 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: , Reply-to: Adam Faiz X-ACL-Warn: , Adam Faiz via Guix-patches X-Patchwork-Original-From: Adam Faiz via Guix-patches via From: Adam Faiz 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 From 646cc0c6857c41564eda8ccc0ade07ae16a18a6c Mon Sep 17 00:00:00 2001 Message-ID: <646cc0c6857c41564eda8ccc0ade07ae16a18a6c.1722949379.git.adam.faiz@disroot.org> In-Reply-To: References: From: AwesomeAdam54321 Date: Tue, 6 Aug 2024 20:55:13 +0800 Subject: [PATCH 2/2] gnu: libtorrent-rasterbar: Use gexps and new input style. * gnu/packages/bittorrent.scm (libtorrent-rasterbar)[arguments]: Use gexps. [native-inputs]: Drop labels. --- gnu/packages/bittorrent.scm | 75 +++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index abc598f7fa..fa2765da5b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -433,33 +433,34 @@ (define-public libtorrent-rasterbar (base32 "0pc8rbcp7njbx8m02z47pcbbwcp5cjggbgq4sfjc19dc3n65p4zw")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-Dpython-bindings=ON" - "-Dbuild_tests=ON") - ;; Tests do not reliably work when executed in parallel. - #:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (let* ((disabled-tests - '( - ;; Requires a non-localhost IPv4 interface. - "test_upnp" - ;; test_ssl needs to be run separately. - "test_ssl")) - (exclude-regex (string-append "^(" - (string-join disabled-tests "|") - ")$")) - (timeout "600") - (jobs (if parallel-tests? - (number->string (parallel-job-count)) - "1"))) - (when tests? - (invoke "ctest" - "-E" exclude-regex - "-j" jobs - "--timeout" timeout - "--output-on-failure") + (list + #:configure-flags + #~'("-Dpython-bindings=ON" + "-Dbuild_tests=ON") + ;; Tests do not reliably work when executed in parallel. + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (let* ((disabled-tests + '(;; Requires a non-localhost IPv4 interface. + "test_upnp" + ;; test_ssl needs to be run separately. + "test_ssl")) + (exclude-regex (string-append "^(" + (string-join disabled-tests "|") + ")$")) + (timeout "600") + (jobs (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) + (when tests? + (invoke "ctest" + "-E" exclude-regex + "-j" jobs + "--timeout" timeout + "--output-on-failure") ;; test_ssl relies on bundled TLS certificates with a fixed ;; expiry date. To ensure succesful builds in the future, ;; fake the time to be roughly that of the release. @@ -471,17 +472,17 @@ (define-public libtorrent-rasterbar ;; ;; Note: The test_ssl test times out in the ci. ;; Temporarily disable it until that is resolved. - ;; (invoke "faketime" "2022-10-24" - ;; "ctest" - ;; "-R" "^test_ssl$" - ;; "-j" jobs - ;; "--timeout" timeout - ;; "--output-on-failure") - ))))))) + #;(invoke "faketime" "2022-10-24" + "ctest" + "-R" "^test_ssl$" + "-j" jobs + "--timeout" timeout + "--output-on-failure")))))))) (inputs (list boost openssl)) - (native-inputs `(("libfaketime" ,libfaketime) - ("python-wrapper" ,python-wrapper) - ("pkg-config" ,pkg-config))) + (native-inputs + (list libfaketime + python-wrapper + pkg-config)) (home-page "https://www.libtorrent.org/") (synopsis "Feature-complete BitTorrent implementation") (description