From patchwork Sat May 18 01:11:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Henrique Gomes Higino X-Patchwork-Id: 64534 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 71E3D27BBEA; Sat, 18 May 2024 02:15:09 +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=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 A67CF27BBE2 for ; Sat, 18 May 2024 02:15:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s88eL-0000u0-3w; Fri, 17 May 2024 21:14:13 -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 1s88e9-0000qB-BX for guix-patches@gnu.org; Fri, 17 May 2024 21:14:02 -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 1s88e9-0004bv-3h for guix-patches@gnu.org; Fri, 17 May 2024 21:14:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s88eC-0004yL-3r; Fri, 17 May 2024 21:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71023] [PATCH 5/9] gnu: chezmoi: Update go version. Resent-From: Luis Higino Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 18 May 2024 01:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71023 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71023@debbugs.gnu.org Cc: Luis Higino , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 71023-submit@debbugs.gnu.org id=B71023.171599481919013 (code B ref 71023); Sat, 18 May 2024 01:14:04 +0000 Received: (at 71023) by debbugs.gnu.org; 18 May 2024 01:13:39 +0000 Received: from localhost ([127.0.0.1]:58261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s88dm-0004wa-H0 for submit@debbugs.gnu.org; Fri, 17 May 2024 21:13:39 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:55607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s88dl-0004wC-0y for 71023@debbugs.gnu.org; Fri, 17 May 2024 21:13:37 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1ec92e355bfso27824245ad.3 for <71023@debbugs.gnu.org>; Fri, 17 May 2024 18:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715994747; x=1716599547; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IvqQKLCrfgd3qR9sGY/iWk8hZBv6SEGRay2/LMP260w=; b=U53FDDXFYT516/c+7N6ADtpHkgbF7hxU1mXaj2PtCedezcr+Oovp7xRUwp6txNSrR9 mL3cPGGvnrmdwbY0po8PSCdtwq0sMhYtrHPF/ucBlwA34O6C4N6CzDzhDJEcMjkl/W8T /fnKa5wfO0pkDyqN8vbCSxmUOok1mVgq/gOU5oj7fe3vWQNYRbjBNdy35/VAy1i514c4 BOLPikIpIUCXSOfoJNy8pcaAhQ6Qe7cM0UheeRHbce1kNwrkJlt2qV9Y/itmjKmJWbK8 0AfbVL0W3R8vyFMtC+Xj6zMeyuZDAT29i3pBosgYcRrEz1SGuVIekS4ESIJlBiCcuGa1 PrBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715994747; x=1716599547; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IvqQKLCrfgd3qR9sGY/iWk8hZBv6SEGRay2/LMP260w=; b=Jy+cDk+gT+t0+AgFcPCO/blphyhewNooLOfm+yrPM+lbP7h626BpZE1pUGIOgw116E kHDouBk8kbSeJUXTJboVxcjsDJp9KkmfnUnTDW01843cVDB5LFA3tSyDu39/kKuh9N3A SHhAk6JbhnBBqPSWG8hef7swZ5jQdWtyRAxAg5H4QA8/1j3NfS5PlGeYZ2tThkiOsKFW erzNV0t3BE1DG7pqoiFbsOJ/mXxVgzl6Z6JVT8A45dGDU5NjW//sqPI7B/KMIOaXCHjY JOBtjwN6yPuCV1VP5RbTgSECOKDw7mDN9oc9FVAG3VcqY6mskVgk5hc9TsGCWfE+bvVG FPtQ== X-Gm-Message-State: AOJu0YxCxC/UzZguKHW++EXHM0wBoBcUX6ZG8g8WwWMh4vgE/8dcMwAN 1IHm+KvLY9FhfPwsy5GL3qBYaVvUev8MYxXRN1B1psbQzUytRoekbKGmaDom X-Google-Smtp-Source: AGHT+IHMjCwuFwv/eSKXkJHRL7VizokWzQYfdbHlSVolY34W3fmo6hELHYmXvEg3NMlSTZvKP80zSw== X-Received: by 2002:a05:6a21:c92:b0:1af:881c:e924 with SMTP id adf61e73a8af0-1afde20dfd8mr24146319637.62.1715994747002; Fri, 17 May 2024 18:12:27 -0700 (PDT) Received: from localhost ([201.17.159.119]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-661d37dc138sm956278a12.39.2024.05.17.18.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 18:12:26 -0700 (PDT) From: Luis Higino Date: Sat, 18 May 2024 01:11:54 +0000 Message-ID: <4b90f13cc76d9ce76948e9c5de30ec8ea1b19474.1715964816.git.luishenriquegh2701@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/configuration-management.scm (chezmoi): Update go version. Change-Id: Iac2d344a4b48fc9296528bee84a59598ff45c61b --- gnu/packages/configuration-management.scm | 67 ++++++++++++----------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index de27f50e0c..d67db49e7a 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -18,6 +18,7 @@ (define-module (gnu packages configuration-management) #:use-module (gnu packages) + #:use-module (guix gexp) #:use-module (guix build-system go) #:use-module (guix git-download) #:use-module (gnu packages golang) @@ -45,38 +46,40 @@ (define-public chezmoi "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/twpayne/chezmoi" - #:install-source? #f - #:phases - (modify-phases %standard-phases - ;; Remove test script which expect additional user's programs available - ;; in the PATH. The testdata directory is removed in the latest version - ;; (2.46.1) of the program. - (add-after 'unpack 'remove-failing-test-scripts - (lambda* (#:key import-path #:allow-other-keys) - (for-each (lambda (f) - (delete-file (string-append "src/" import-path "/testdata/scripts/" f))) - '("bitwarden.txt" - "cd.txt" - "cd_unix.txt" - "completion.txt" - "diff.txt" - "edit.txt" - "editconfig.txt" - "git.txt" - "gopass.txt" - "keepassxc.txt" - "lastpass.txt" - "onepassword.txt" - "pass.txt" - "runscriptdir_unix.txt" - "script_unix.txt" - "secretgeneric.txt" - "secretgopass.txt" - "secretkeepassxc.txt" - "secretlastpass.txt" - "secretonepassword.txt" - "secretpass.txt"))))))) + (list + #:go go-1.18 + #:import-path "github.com/twpayne/chezmoi" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + ;; Remove test script which expect additional user's programs available + ;; in the PATH. The testdata directory is removed in the latest version + ;; (2.46.1) of the program. + (add-after 'unpack 'remove-failing-test-scripts + (lambda* (#:key import-path #:allow-other-keys) + (for-each (lambda (f) + (delete-file (string-append "src/" import-path "/testdata/scripts/" f))) + '("bitwarden.txt" + "cd.txt" + "cd_unix.txt" + "completion.txt" + "diff.txt" + "edit.txt" + "editconfig.txt" + "git.txt" + "gopass.txt" + "keepassxc.txt" + "lastpass.txt" + "onepassword.txt" + "pass.txt" + "runscriptdir_unix.txt" + "script_unix.txt" + "secretgeneric.txt" + "secretgopass.txt" + "secretkeepassxc.txt" + "secretlastpass.txt" + "secretonepassword.txt" + "secretpass.txt"))))))) (native-inputs (list go-etcd-io-bbolt go-github-com-alecthomas-chroma