From patchwork Wed Feb 14 21:10:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 60316 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 CD7E627BBEA; Wed, 14 Feb 2024 21:12:27 +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.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED, URIBL_SBL_A 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 C6B6527BBE2 for ; Wed, 14 Feb 2024 21:12:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raMXo-0007Y8-V1; Wed, 14 Feb 2024 16:11:52 -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 1raMXn-0007Xf-7J for guix-patches@gnu.org; Wed, 14 Feb 2024 16:11:51 -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 1raMXm-0005dD-VI for guix-patches@gnu.org; Wed, 14 Feb 2024 16:11:50 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raMY0-0003xz-4n; Wed, 14 Feb 2024 16:12:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69136] [PATCH 6/6] gnu: chezmoi: Update to 1.8.10. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 14 Feb 2024 21:12:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69136 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69136@debbugs.gnu.org Cc: Sharlatan Hellseher , Katherine Cox-Buday , Sharlatan Hellseher X-Debbugs-Original-Xcc: Katherine Cox-Buday , Sharlatan Hellseher Received: via spool by 69136-submit@debbugs.gnu.org id=B69136.170794510215178 (code B ref 69136); Wed, 14 Feb 2024 21:12:04 +0000 Received: (at 69136) by debbugs.gnu.org; 14 Feb 2024 21:11:42 +0000 Received: from localhost ([127.0.0.1]:53298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raMXd-0003we-Av for submit@debbugs.gnu.org; Wed, 14 Feb 2024 16:11:41 -0500 Received: from mail-wm1-f54.google.com ([209.85.128.54]:42058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raMXW-0003vS-E0 for 69136@debbugs.gnu.org; Wed, 14 Feb 2024 16:11:35 -0500 Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-411f03e5c46so1324955e9.0 for <69136@debbugs.gnu.org>; Wed, 14 Feb 2024 13:11:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707945010; x=1708549810; 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=YH2slRQ142ub2kHwqirsLYsRIMZdDDpgGirqb64NeXA=; b=U0YKzi2TGcTKnjIJpjQYQHytIWihIWPJwpHz0FwbsC7EKfjzBKRL1c/jqToR4i9JNo lVVlp3DbJEsfn/ou3e8RadNreW7w/+xjo5iAQROyLHWZgmox9rXFs5RePFWFbcKxyVAR UKqCghijl64JwP2U4rRiYFja+4EvzIglvztpqH4lhMaPJOk37IY7OwvzZhGkBDXqu1Tr tVhqZkfYO5KSwTS8YuuPTMpQsEPPbP7z17ePl1WwgJJQ1g2ZpZ4c2RuUwhnZlBgohE7Q MeDfm6HpBY6lXzp5KtBYs+TRHVyvLLmbcSLu5Oajm1wPE8amORuS1L2gGR8czGtgp2MN X0lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707945010; x=1708549810; 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=YH2slRQ142ub2kHwqirsLYsRIMZdDDpgGirqb64NeXA=; b=Ou/Ht9GFF2LnscQEURbjAtbQLOepawOI7O3brsoIbs1y/lPqUrhITMXuwlfHqdARF3 FlGFrtYayqNVpy4+EpMFhtLcXiUVbQCwVVZin+XOIaVvMVqmRc1LwuDnL3TstlrHCUkA MjVCereMdIqLbhKuYbiXhEQ8bVWGoOcoXNLBRv22elqO8+tpaFZYYJAFNazdv0G//M+8 7nM3bkCqCLCU6SYNkgSVZClJ/gjBy9g52/87AJZPVTSukXQEsGb0q2UgfHLTuk2f86Wc spfawA2nFbnqWhyZ3dS2Bnsf8CL6yEn/uQFYerVQ6e3+iWS9Eoo57fms2zNbmr8YT0W3 HkqQ== X-Gm-Message-State: AOJu0Yz+ZyLBd5Ys2batcaTa4mX2xfWKySOaEs2DI0dCysuWTMZJRJ9u nhp/JW5Pg3EARM44QssF54ZSNhyQr3lxJnxGx+SWmshgCQVATTjBPvYUm4JtFiyJBw== X-Google-Smtp-Source: AGHT+IHlsCwsTUEO5U2IVMc9288DypIMITcFkwQaAS3zubRDJDcnHAK4JxQD3G4JBA9jZr5oAzCl/A== X-Received: by 2002:a05:600c:5191:b0:411:f0d2:7315 with SMTP id fa17-20020a05600c519100b00411f0d27315mr2415431wmb.9.1707945010558; Wed, 14 Feb 2024 13:10:10 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c379300b00411c3c2fc55sm2929342wmr.45.2024.02.14.13.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 13:10:10 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 14 Feb 2024 21:10:03 +0000 Message-ID: <81918de85fa99cb5da4b4602f6410e6039b5458e.1707944340.git.sharlatanus@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 to 1.8.10. [arguments] <#:phases>: Add 'remove-failing-test-scripts phase, deleting testdata scripts requiring additional programs. [native-inputs]: Remove go-github-com-bmatcuk-doublestar and go-github-com-google-go-github; add go-github-com-bmatcuk-doublestar-v2, go-github-com-google-go-github-v33, and go-golang-org-x-term. Change-Id: Ia0b9b7e4dd00e99bc8150816c46b456cc272b25c --- gnu/packages/configuration-management.scm | 44 ++++++++++++++++++----- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index c1874fef2d..34b7876138 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -32,9 +32,7 @@ (define-module (gnu packages configuration-management) (define-public chezmoi (package (name "chezmoi") - ;; XXX: Make sure 7f238faa61e46d79b54d4d0ea8f0b5fc27db84b2 applied before - ;; version update, which should fix @code{password-store} integration. - (version "1.8.1") + (version "1.8.10") (source (origin (method git-fetch) (uri (git-reference @@ -43,24 +41,53 @@ (define-public chezmoi (file-name (git-file-name name version)) (sha256 (base32 - "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw")))) + "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb")))) (build-system go-build-system) (arguments `(#:import-path "github.com/twpayne/chezmoi" - ;; We don't need to install the source code for end-user applications. - #:install-source? #f)) + #: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 go-github-com-aymerick-douceur - go-github-com-bmatcuk-doublestar + go-github-com-bmatcuk-doublestar-v2 go-github-com-charmbracelet-glamour go-github-com-chris-ramon-douceur go-github-com-coreos-go-semver go-github-com-danwakefield-fnmatch go-github-com-dlclark-regexp2 go-github-com-godbus-dbus - go-github-com-google-go-github + go-github-com-google-go-github-v33 go-github-com-google-go-querystring go-github-com-google-goterm go-github-com-google-renameio @@ -99,6 +126,7 @@ (define-public chezmoi go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-oauth2 + go-golang-org-x-term go-gopkg-in-errgo-fmt-errors)) (home-page "https://www.chezmoi.io/") (synopsis "Personal configuration files manager")