From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qJWuJ92r8WC/RAEAgWs5BA (envelope-from ) for ; Fri, 16 Jul 2021 17:55:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id gNZiI92r8WD/YgAA1q6Kng (envelope-from ) for ; Fri, 16 Jul 2021 15:55:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5858E5B75 for ; Fri, 16 Jul 2021 17:55:09 +0200 (CEST) Received: from localhost ([::1]:36218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QBA-0002vT-D8 for larch@yhetil.org; Fri, 16 Jul 2021 11:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m4QB4-0002uI-Tf for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QB4-0005kw-MZ for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m4QB4-000326-6W for guix-patches@gnu.org; Fri, 16 Jul 2021 11:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49597] [PATCH core-updates 02/15] gnu: tzdata: Remove input labels. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Jul 2021 15:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49597 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49597@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49597-submit@debbugs.gnu.org id=B49597.162645088411585 (code B ref 49597); Fri, 16 Jul 2021 15:55:02 +0000 Received: (at 49597) by debbugs.gnu.org; 16 Jul 2021 15:54:44 +0000 Received: from localhost ([127.0.0.1]:52134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QAm-00030h-0q for submit@debbugs.gnu.org; Fri, 16 Jul 2021 11:54:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43118) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m4QAk-00030M-37 for 49597@debbugs.gnu.org; Fri, 16 Jul 2021 11:54:42 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33712) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m4QAe-0005Tw-RH; Fri, 16 Jul 2021 11:54:36 -0400 Received: from vpn-0-27.aquilenet.fr ([2a0c:e300:4:27::]:38216 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m4QAe-0004IN-B7; Fri, 16 Jul 2021 11:54:36 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Fri, 16 Jul 2021 17:54:07 +0200 Message-Id: <20210716155420.32447-2-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210716155420.32447-1-ludo@gnu.org> References: <20210716155420.32447-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626450909; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Z/wxEpoGVJUavyyWFtsH1/9XNvd7XssLM9PE4KFD2+g=; b=p/rVOZlu1L6gLNZ3tVSIiGnbXRpR5QoydJqTQ4Jyk7iVhS2DcyWhk/g04c/CPwMs1QG0uY AleFENMl/X4cTig9HWSEsL65F0a7O2mmxpomTUPpLQV5xdsva1Ak19z2QKGj92tONasT9x XtNmFA7WgeP2N4C3aD5unzM6czN7VrY7biIi8hAfaUrCMu53aXeaa0PGinUttL01qxFFxK Wl8C/i1EvLFaWdYWsyADfHVIkTROLbbMUl6TwZ2j9x6R1QIBmHrVVabYXvZrlYjwbdanbw UqLVINNbHys9w5PDu2807Un1HZyP9MbhOoQvGFQJP7+30fc+FVActRdJWMUdGA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626450909; a=rsa-sha256; cv=none; b=qExFqJViRBSoXWdORkDKXtBPpKCPD8XMwMNXHvotwQgkC+HMENbYW4NUZJ2Fyvl/vvhFte Zug2LW3XUj+IBa3h3DtE31qwnbE0FE7V7mecZBzbUONEIhbG5MR6xpBLTbsN5RfaXNyCm5 WXrPpGOK1Ant90gmUEx2LFbLp/rtH1VD5lN3WHicPmvubp0w3SQFw1UBwZl/xcgGYT6Jbh rnltpGUlixFk0NVIou1Yw0ZL8ec7AesaC0EJdcWgeVjtbTuOD3P5T1+6p9/tcYqKTQEL7g nBwyL3ryVlKYCI6CaqX9tKgGdnZohZReTyzKTFzNmW1fSj05wdGr2cS5S3z2Kw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.09 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5858E5B75 X-Spam-Score: 2.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: vw9T7jmrIPeh * gnu/packages/base.scm (tzdata)[arguments]: Turn flags and phases into a gexp. [inputs]: Turn into a plain list. --- gnu/packages/base.scm | 128 ++++++++++++++++++++++-------------------- 1 file changed, 66 insertions(+), 62 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9c1c946e4a..d6e0e55678 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages gettext) #:use-module (guix i18n) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -1253,63 +1254,66 @@ command.") "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr")))) (build-system gnu-build-system) (arguments - `(#:tests? #f - #:make-flags (let ((out (assoc-ref %outputs "out")) - (tmp (getenv "TMPDIR"))) - (list (string-append "TOPDIR=" out) - (string-append "TZDIR=" out "/share/zoneinfo") - (string-append "TZDEFAULT=" out - "/share/zoneinfo/localtime") + (list #:tests? #f + #:make-flags + #~(let ((out #$output) + (tmp (getenv "TMPDIR"))) + (list (string-append "TOPDIR=" out) + (string-append "TZDIR=" out "/share/zoneinfo") + (string-append "TZDEFAULT=" out + "/share/zoneinfo/localtime") - ;; Likewise for the C library routines. - (string-append "LIBDIR=" tmp "/lib") - (string-append "MANDIR=" tmp "/man") + ;; Likewise for the C library routines. + (string-append "LIBDIR=" tmp "/lib") + (string-append "MANDIR=" tmp "/man") - ;; XXX: tzdata 2020b changed the on-disk format - ;; of the time zone files from 'fat' to 'slim'. - ;; Many packages (particularly evolution-data-server) - ;; can not yet handle the latter, so we stick with - ;; 'fat' for now. - ,@(if (version>=? (package-version this-package) - "2020b") - '("CPPFLAGS=-DZIC_BLOAT_DEFAULT='\"fat\"'") - '()) + ;; XXX: tzdata 2020b changed the on-disk format + ;; of the time zone files from 'fat' to 'slim'. + ;; Many packages (particularly evolution-data-server) + ;; can not yet handle the latter, so we stick with + ;; 'fat' for now. + #$@(if (version>=? (package-version this-package) + "2020b") + '("CPPFLAGS=-DZIC_BLOAT_DEFAULT='\"fat\"'") + '()) - "AWK=awk" - "CC=gcc")) - #:modules ((guix build utils) - (guix build gnu-build-system) - (srfi srfi-1)) - #:phases - (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key source inputs #:allow-other-keys) - (invoke "tar" "xvf" source) - (invoke "tar" "xvf" (assoc-ref inputs "tzcode")))) - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Move data in the right place. - (let ((out (assoc-ref outputs "out"))) - ;; Discard zic, dump, and tzselect, already - ;; provided by glibc. - (delete-file-recursively (string-append out "/usr")) - (symlink (string-append out "/share/zoneinfo") - (string-append out "/share/zoneinfo/posix")) - (delete-file-recursively - (string-append out "/share/zoneinfo-posix")) - (copy-recursively (string-append out "/share/zoneinfo-leaps") - (string-append out "/share/zoneinfo/right")) - (delete-file-recursively - (string-append out "/share/zoneinfo-leaps"))))) - (delete 'configure)))) - (inputs `(("tzcode" ,(origin - (method url-fetch) - (uri (string-append - "https://data.iana.org/time-zones/releases/tzcode" - version ".tar.gz")) - (sha256 - (base32 - "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))) + "AWK=awk" + "CC=gcc")) + #:modules '((guix build utils) + (guix build gnu-build-system) + (srfi srfi-1)) + #:phases + #~(modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source inputs #:allow-other-keys) + (invoke "tar" "xvf" source) + (invoke "tar" "xvf" + #$(match (package-inputs this-package) + (((_ tzcode)) tzcode))))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move data in the right place. + (let ((out (assoc-ref outputs "out"))) + ;; Discard zic, dump, and tzselect, already + ;; provided by glibc. + (delete-file-recursively (string-append out "/usr")) + (symlink (string-append out "/share/zoneinfo") + (string-append out "/share/zoneinfo/posix")) + (delete-file-recursively + (string-append out "/share/zoneinfo-posix")) + (copy-recursively (string-append out "/share/zoneinfo-leaps") + (string-append out "/share/zoneinfo/right")) + (delete-file-recursively + (string-append out "/share/zoneinfo-leaps"))))) + (delete 'configure)))) + (inputs (list (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb"))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) @@ -1338,14 +1342,14 @@ and daylight-saving rules.") (base32 "1wxskk9mh1x2073n99qna2mq58mgi648mbq5dxlqfcrnvrbkk0cd")))) (inputs - `(("tzcode" ,(origin - (method url-fetch) - (uri (string-append - "https://data.iana.org/time-zones/releases/tzcode" - version ".tar.gz")) - (sha256 - (base32 - "1mgsckixmmk9qxzsflfxnp3999qi3ls72bgksclk01g852x51w3c"))))))))) + (list (origin + (method url-fetch) + (uri (string-append + "https://data.iana.org/time-zones/releases/tzcode" + version ".tar.gz")) + (sha256 + (base32 + "1mgsckixmmk9qxzsflfxnp3999qi3ls72bgksclk01g852x51w3c")))))))) (define-public libiconv (package -- 2.32.0