[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/13: gnu: chezmoi: Refresh package style.
From: |
guix-commits |
Subject: |
04/13: gnu: chezmoi: Refresh package style. |
Date: |
Fri, 28 Jun 2024 10:40:26 -0400 (EDT) |
sharlatan pushed a commit to branch master
in repository guix.
commit 77ec077071910b51ac71e1fc4dd7be24f0a7b615
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Tue Jun 18 17:47:39 2024 +0100
gnu: chezmoi: Refresh package style.
* gnu/packages/configuration-management.scm (chezmoi): Use G-expressions
and list style, re-indent.
[arguments]: <#:go>: Set to go-1.21.
Change-Id: I5a7a4deffcd8b9102614b3f628a7ddd33ee82633
---
gnu/packages/configuration-management.scm | 68 ++++++++++++++++---------------
1 file changed, 36 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/configuration-management.scm
b/gnu/packages/configuration-management.scm
index c8d38afa2b..c061684a6a 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
+;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +20,7 @@
(define-module (gnu packages configuration-management)
#:use-module (gnu packages)
#:use-module (guix build-system go)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
@@ -45,38 +47,40 @@
"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.21
+ #: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
- branch master updated (6a7d5cda17 -> ae55410e07), guix-commits, 2024/06/28
- 02/13: gnu: go-github-com-masterminds-sprig: Move to golang-xyz., guix-commits, 2024/06/28
- 08/13: gnu: go-github-com-masterminds-semver: Rename variable., guix-commits, 2024/06/28
- 09/13: gnu: go-github-com-masterminds-semver-v3: Update to 3.2.1., guix-commits, 2024/06/28
- 04/13: gnu: chezmoi: Refresh package style.,
guix-commits <=
- 01/13: gnu: go-github-com-nwaples-rardecode-v2: Rename variable., guix-commits, 2024/06/28
- 03/13: gnu: chezmoi: Remove propagated inputs., guix-commits, 2024/06/28
- 10/13: gnu: go-github-com-klauspost-cpuid: Move to golang-xyz., guix-commits, 2024/06/28
- 06/13: gnu: go-github-com-masterminds-sprig-v3: Enable tests., guix-commits, 2024/06/28
- 12/13: gnu: Add go-github-com-bmatcuk-doublestar-v4., guix-commits, 2024/06/28
- 11/13: gnu: Add go-github-com-klauspost-cpuid-v2., guix-commits, 2024/06/28
- 05/13: gnu: go-github-com-masterminds-sprig: Rename variable., guix-commits, 2024/06/28
- 13/13: gnu: go-github-com-dlclark-regexp2: Move to golang-xyz., guix-commits, 2024/06/28
- 07/13: gnu: go-github-com-masterminds-semver: Move to golang-xyz., guix-commits, 2024/06/28