From a5862202148b114dbbdbbcab6a79f2ea40ac49f7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 21 Dec 2024 23:44:09 +0000 Subject: [PATCH] gnu: go-github-com-go-git-gcfg: Move to golang-vcs. * gnu/packages/golang.scm (go-github-com-go-git-gcfg): Move from here ... * gnu/packages/golang-vcs.scm: ... to here. Add goalng-xyz module. Change-Id: I218c5e5c663ea5ba54cef9f26fec95912bbcac34 --- gnu/packages/golang-vcs.scm | 32 +++++++++++++++++++++++++++++++- gnu/packages/golang.scm | 27 --------------------------- 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/gnu/packages/golang-vcs.scm b/gnu/packages/golang-vcs.scm index b264b3ecaf..967b5ea93d 100644 --- a/gnu/packages/golang-vcs.scm +++ b/gnu/packages/golang-vcs.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2024 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. @@ -25,7 +26,8 @@ (define-module (gnu packages golang-vcs) #:use-module (gnu packages) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) - #:use-module (gnu packages golang-web)) + #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz)) ;;; Commentary: ;;; @@ -37,6 +39,34 @@ (define-module (gnu packages golang-vcs) ;;; Libraries: ;;; +(define-public go-github-com-go-git-gcfg + (package + (name "go-github-com-go-git-gcfg") + (version "1.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-git/gcfg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lb14z4j35pwz2b2rbykkpsq515spwbndb00gwn2xlrzn949xb83")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/go-git/gcfg" + ;; pass; got 10, error + ;; failed to parse "a" as int: expected integer; *ptr==0 + #:test-flags #~(list "-skip" "TestParseInt|TestScanFully"))) + (propagated-inputs + (list go-github-com-pkg-errors + go-gopkg-in-warnings-v0)) + (home-page "https://github.com/go-git/gcfg") + (synopsis "Gcfg reads INI-style configuration files into Go structs") + (description "Gcfg reads INI-style configuration files into Go structs.") + (license license:bsd-3))) + (define-public go-github-com-xanzy-go-gitlab (package (name "go-github-com-xanzy-go-gitlab") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 5725dfc2b4..fdce0bc7a0 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -4871,33 +4871,6 @@ (define-public go-github-com-charmbracelet-harmonica "A simple, efficient spring animation library for smooth, natural motion.") (license license:expat))) -(define-public go-github-com-go-git-gcfg - (package - (name "go-github-com-go-git-gcfg") - (version "1.5.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-git/gcfg") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1lb14z4j35pwz2b2rbykkpsq515spwbndb00gwn2xlrzn949xb83")))) - (arguments - (list - #:import-path "github.com/go-git/gcfg" - ;; pass; got 10, error - ;; failed to parse "a" as int: expected integer; *ptr==0 - #:test-flags #~(list "-skip" "TestParseInt|TestScanFully"))) - (native-inputs - (list go-gopkg-in-warnings-v0 go-github-com-pkg-errors)) - (build-system go-build-system) - (home-page "https://github.com/go-git/gcfg/") - (synopsis "Gcfg reads INI-style configuration files into Go structs") - (description "Gcfg reads INI-style configuration files into Go structs.") - (license license:bsd-3))) - (define-public go-github-com-jba-templatecheck (package (name "go-github-com-jba-templatecheck")