From patchwork Mon Dec 4 15:48:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 57290 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 876CC27BBE9; Mon, 4 Dec 2023 15:50:12 +0000 (GMT) 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_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 2DEAC27BBE2 for ; Mon, 4 Dec 2023 15:50:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rABCj-0000Pm-PK; Mon, 04 Dec 2023 10:49:53 -0500 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 1rABCi-0000Pd-Dc for guix-patches@gnu.org; Mon, 04 Dec 2023 10:49:52 -0500 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 1rABCi-0006fF-5f for guix-patches@gnu.org; Mon, 04 Dec 2023 10:49:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rABCs-0002IT-CT for guix-patches@gnu.org; Mon, 04 Dec 2023 10:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67624] [PATCH] gnu: ncdu: Use zig-build-system. Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Dec 2023 15:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67624 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67624@debbugs.gnu.org Cc: Ekaitz Zarraga X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17017049688773 (code B ref -1); Mon, 04 Dec 2023 15:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 4 Dec 2023 15:49:28 +0000 Received: from localhost ([127.0.0.1]:35497 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rABCK-0002HQ-12 for submit@debbugs.gnu.org; Mon, 04 Dec 2023 10:49:28 -0500 Received: from lists.gnu.org ([2001:470:142::17]:55910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rABCH-0002HC-FN for submit@debbugs.gnu.org; Mon, 04 Dec 2023 10:49:26 -0500 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 1rABC0-0000Lk-T1 for guix-patches@gnu.org; Mon, 04 Dec 2023 10:49:09 -0500 Received: from dane.soverin.net ([185.233.34.150]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rABBr-0006ba-2l for guix-patches@gnu.org; Mon, 04 Dec 2023 10:49:08 -0500 Received: from smtp.soverin.net (c04smtp-lb01.int.sover.in [10.10.4.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dane.soverin.net (Postfix) with ESMTPS id 4SkSkw6y1szHZ; Mon, 4 Dec 2023 15:48:56 +0000 (UTC) Received: from smtp.soverin.net (smtp.soverin.net [10.10.4.99]) by soverin.net (Postfix) with ESMTPSA id 4SkSkv6cn1z5K; Mon, 4 Dec 2023 15:48:55 +0000 (UTC) Authentication-Results: smtp.soverin.net; dkim=pass (2048-bit key; unprotected) header.d=elenq.tech header.i=@elenq.tech header.a=rsa-sha256 header.s=soverin1 header.b=c9IYTo4f; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=soverin1; t=1701704936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uocmFYi72iTCzOOD8SWPEH1YFotauPr+uAhoX06qGgM=; b=c9IYTo4faU6exILD0sb/ebN8J5Ckm4orhqyfJiHoaJvMD4ec5ftTAuFVxdN2JzZ87ViRDl zP1FDAxblXXIFHnChsqgqBGzNvTTYsOMtcAymKFr8E1cvdrvPjD1CilFCPZQBdaZLJ/EXS CqytKbR/AgCAu/wvC3wP5DLG79dS1Z2NTDft+xrdLWhQGAEfBgXa+s3WcLilGV5hlrpOx6 f+qQOwd8y+nWDd7h6OO7ABEtxOUzdPQ7rE0ewcafOpwCi72NG4ipMS/UfuCNZbJfPLaKe6 cBeWHoqnhZRf5EV4AI7O4l8TZu0mPihXS9D2Gzc+QyvSuWZL4TyIamsRmpjKbQ== From: Ekaitz Zarraga Date: Mon, 4 Dec 2023 16:48:39 +0100 Message-ID: <26548efff715c63df08ca3a92cde262da4a6a989.1701704919.git.ekaitz@elenq.tech> MIME-Version: 1.0 Received-SPF: pass client-ip=185.233.34.150; envelope-from=ekaitz@elenq.tech; helo=dane.soverin.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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/ncdu.scm(ncdu): Move to zig-build-system. [build-system]: Use zig-build-system. [phases]: Delegate phase manipulation to the build-system. Remove 'validate-runpath as it fails (we should remove it in the build-system directly). [make-flags]: Remove them. [native-inputs]: Remove zig-0.10. Change-Id: I9027a1cbd925cfb0c135740e81a33b62cb9d91ca --- gnu/packages/ncdu.scm | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) base-commit: 61cc93e49cdc35d3cc1b7f6018a2645628c5e892 diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 30460b404d..1e7598a7fd 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -27,8 +27,8 @@ (define-module (gnu packages ncdu) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix build-system gnu) - #:use-module (gnu packages perl) - #:use-module (gnu packages zig)) + #:use-module (guix build-system zig) + #:use-module (gnu packages perl)) (define-public ncdu-1 ;; This old version is ‘LTS’. Version 2 works fine and has more features, @@ -73,28 +73,16 @@ (define-public ncdu #~(begin ;; Delete a pregenerated man page. We'll build it ourselves. (delete-file "ncdu.1"))))) + (build-system zig-build-system) (arguments (list - #:make-flags - #~(list (string-append "PREFIX=" #$output) - (string-append "CC=" #$(cc-for-target)) - (string-append "ZIG_FLAGS=-Drelease-fast")) #:phases #~(modify-phases %standard-phases - (delete 'configure) ; No configure script. - (add-before 'build 'pre-build - (lambda _ - (setenv "ZIG_GLOBAL_CACHE_DIR" - (mkdtemp "/tmp/zig-cache-XXXXXX")))) + (delete 'validate-runpath) (add-after 'build 'build-manpage (lambda _ - (invoke "make" "doc"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "zig" "test" "build.zig"))))))) - (native-inputs - (list perl zig-0.10)) + (invoke "make" "doc")))))) + (native-inputs (list perl)) (properties `((tunable? . #t))))) (define-public ncdu-2