From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OPpqIe75QmTZLAEASxT56A (envelope-from ) for ; Fri, 21 Apr 2023 23:02:38 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id sI1kIe75QmRuDgAAauVa8A (envelope-from ) for ; Fri, 21 Apr 2023 23:02:38 +0200 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 274682DDBD for ; Fri, 21 Apr 2023 23:02:38 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppxtM-00046a-H0; Fri, 21 Apr 2023 17:02:04 -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 1ppxtK-00045k-OO for guix-patches@gnu.org; Fri, 21 Apr 2023 17:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppxtK-0006gm-F4 for guix-patches@gnu.org; Fri, 21 Apr 2023 17:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppxtK-0005DP-BC for guix-patches@gnu.org; Fri, 21 Apr 2023 17:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63006] [PATCH 2/3] gnu: Go: Do not depend on tzdata. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2023 21:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63006 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 63006@debbugs.gnu.org Received: via spool by 63006-submit@debbugs.gnu.org id=B63006.168211087519976 (code B ref 63006); Fri, 21 Apr 2023 21:02:02 +0000 Received: (at 63006) by debbugs.gnu.org; 21 Apr 2023 21:01:15 +0000 Received: from localhost ([127.0.0.1]:41295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxsY-0005C6-M4 for submit@debbugs.gnu.org; Fri, 21 Apr 2023 17:01:15 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:48529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxsW-0005Bc-FP for 63006@debbugs.gnu.org; Fri, 21 Apr 2023 17:01:12 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 60ECA5C00B0; Fri, 21 Apr 2023 17:01:07 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 21 Apr 2023 17:01:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; t=1682110867; x=1682197267; bh=X+mBpuOF+VaMrwcoNGrbb/gdUnjhEAAa+8SEEXqYn0I=; b= W+EJK+wJad3+rDKaTnCHvqEqXmbTcRJA23ql+TiTHfUd6peej4s1QQbzHXjFNVH1 0HgTHPlL5Gp6x/Pei6OI9oekT4EYFtqnKPG92YsVzaEbEcKsaZoBy1oKTHJNeQhB 3D+shpfmQ679f3Aao/7iReVhAsVBhrq2n3af1Oaurws= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1682110867; x=1682197267; bh=X +mBpuOF+VaMrwcoNGrbb/gdUnjhEAAa+8SEEXqYn0I=; b=Girfu+5QY2FZ8MTzQ 9eC4xGh959K2Avh7uH1EwONTIM7PpnRTOxWtEpqEhuvOYEkKuY5tsO1sZ7i/UFSe CejqG/wJ1giQZXHbxYHh6oh830tpfaaihL3n8iupOPx71HT/+3ge4suctsljxeb1 kROYfP5faA5/z+dUDVbPUzTsLqOMitYsYkbzE1bZxFJf6uk570C0ljs9Q/KMXFxx neV6Udg8ZweOb9eyC3aFchMMdcOQp2PI3oyJ64XVuBXOP2Y1aU68wcB7/7yaK9Xs yuByjp1nOLPpx/nn7ZWN4aH/Go3ZQ9eg0FGmyjKZgts1ZIIz2uZtbL4QaVy2xtgN OoGew== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtgedgudehhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeekjeejheekgfetieevuedtuedtvd efieduveettdeiteehgefffeeufedtfeeiveenucffohhmrghinheplhguqdhlihhnuhig rdhnvghtpdhsohdrnhgvthenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <63006@debbugs.gnu.org>; Fri, 21 Apr 2023 17:01:07 -0400 (EDT) From: Leo Famulari Date: Fri, 21 Apr 2023 17:01:01 -0400 Message-Id: <4e15e1076c425b3e8e924edfc8adf61cba0df036.1682110862.git.leo@famulari.name> X-Mailer: git-send-email 2.39.2 In-Reply-To: <724078bec9b692f2d0e3fae4a03a23ef96d94ee5.1682110862.git.leo@famulari.name> References: <724078bec9b692f2d0e3fae4a03a23ef96d94ee5.1682110862.git.leo@famulari.name> 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682110958; a=rsa-sha256; cv=none; b=EbRG9jjHw2qFPElLyC0UvROMO3ckwqYCTo1goQ6MW0qQZ4KbB0Y1dlOEJBkf+8iQS++OZN Xw53K3Uf7Av3iGOZilwiuyuSylBKMibj7db7r+EMs81tQAPo8ZZyINkm/R/cslH0y3g6n/ B5TlBiAFhpr00bY6VW2gECA9zz7EniYJnZVntecjA6UOr95bm97DKi/V8+ueGQan8iGyaZ y4NDodpCIQrjy2YlNqqHV0EgBCteGqudyCpxwYWu8jlPCy0L43GwROSUGzXOoXooawY2h9 fxNtbfvdRWGKymPXadfv9Lkwe3zYCFf0JeQuyi45YbC7uByCbLn8Lxtyr9F+Yw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=W+EJK+wJ; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=Girfu+5Q; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682110958; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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:dkim-signature; bh=X+mBpuOF+VaMrwcoNGrbb/gdUnjhEAAa+8SEEXqYn0I=; b=q1HROTAzRXigBAdFgBRJ7pimayblnOD4ILWWQbQosAWiyY+we2RaepT399DUKcvcAPKdi/ 6kaoqncrfRGi1kN5oRJ7AFIurYw/6NCMQXp8LaPsBrP46hHSDDdnwJD8fcJzeBd8F87+Rk NQIEiI+LeuwLZUeSoz+G2xxxdnqBGqNAu8qHediUfGYVQatJFpd0z3hHL/78bzHZ3i7ZQj qo+zmqx2UtOMpfwu2hY5rsYU2TMULU9fa5/jMqPQ5e7anId85Shg5UP4NXyMlvuGPvwO37 xp0BKfJtMQMSg5d7D+8tSPAFIeErisQfgHLzid2aFQLFW+lSYDfAJnL1hxk3Qw== X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=famulari.name header.s=mesmtp header.b=W+EJK+wJ; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm3 header.b=Girfu+5Q; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 2.19 X-Spam-Score: 2.19 X-Migadu-Queue-Id: 274682DDBD X-TUID: z7BhF9PiXrIF * gnu/packages/golang.scm (go-1.4)[inputs]: Remove tzdata. [arguments]: Adjust accordingly. (go-1.14, go-1.16, go-1.17)[arguments]: Adjust accordingly. --- gnu/packages/golang.scm | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 24dae34e20..73c70f55fb 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -139,8 +139,6 @@ (define-public go-1.4 (ld (string-append (assoc-ref inputs "libc") "/lib")) (loader (car (find-files ld "^ld-linux.+"))) (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (output (assoc-ref outputs "out"))) ;; Removing net/ tests, which fail when attempting to access @@ -195,8 +193,6 @@ (define-public go-1.4 (substitute* "net/lookup_unix.go" (("/etc/protocols") (string-append net-base "/etc/protocols"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path)) (substitute* (find-files "cmd" "asm.c") (("/lib/ld-linux.*\\.so\\.[0-9]") loader)) #t))) @@ -238,8 +234,7 @@ (define-public go-1.4 (copy-recursively "../" output) #t)))))) (inputs - `(("tzdata" ,tzdata) - ("pcre" ,pcre) + `(("pcre" ,pcre) ("gcc:lib" ,(canonical-package gcc) "lib"))) (native-inputs (list pkg-config which net-base perl)) @@ -285,8 +280,6 @@ (define-public go-1.14 (loader (car (append (find-files ld "^ld-linux.+") (find-files ld "^ld(64)?\\.so.+")))) (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo")) (output (assoc-ref outputs "out"))) ;; Having the patch in the 'patches' field of breaks @@ -400,8 +393,6 @@ (define-public go-1.14 (("/etc/protocols") (string-append net-base "/etc/protocols"))) (substitute* "net/port_unix.go" (("/etc/services") (string-append net-base "/etc/services"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path)) (substitute* (find-files "cmd" "\\.go") (("/lib(64)?/ld-linux.*\\.so\\.[0-9]") loader)) #t))) @@ -497,9 +488,7 @@ (define-public go-1.16 (replace 'prebuild (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((gcclib (string-append (assoc-ref inputs "gcc:lib") "/lib")) - (net-base (assoc-ref inputs "net-base")) - (tzdata-path - (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + (net-base (assoc-ref inputs "net-base"))) ;; Having the patch in the 'patches' field of breaks ;; the 'TestServeContent' test due to the fact that @@ -591,9 +580,7 @@ (define-public go-1.16 (substitute* "net/lookup_unix.go" (("/etc/protocols") (string-append net-base "/etc/protocols"))) (substitute* "net/port_unix.go" - (("/etc/services") (string-append net-base "/etc/services"))) - (substitute* "time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path))))) + (("/etc/services") (string-append net-base "/etc/services")))))) (replace 'build (lambda* (#:key inputs outputs (parallel-build? #t) #:allow-other-keys) @@ -665,9 +652,7 @@ (define-public go-1.17 (setenv "GOCACHE" "/tmp/go-cache")))) (add-after 'unpack 'patch-source (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((net-base (assoc-ref inputs "net-base")) - (tzdata-path (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo"))) + (let* ((net-base (assoc-ref inputs "net-base"))) ;; XXX: Remove when #49729 is merged? (for-each make-file-writable (find-files "src")) @@ -696,9 +681,7 @@ (define-public go-1.17 (string-append net-base "/etc/protocols"))) (substitute* "src/net/port_unix.go" (("/etc/services") - (string-append net-base "/etc/services"))) - (substitute* "src/time/zoneinfo_unix.go" - (("/usr/share/zoneinfo/") tzdata-path))))) + (string-append net-base "/etc/services")))))) ;; Keep this synchronized with the package inputs. ;; Also keep syncthonized with later versions of go. ,@(if (or (target-arm?) (target-ppc64le?)) -- 2.39.2