From 9358929873d235e01461a45b8a2a9789fdb6c5f0 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 29 Mar 2024 13:57:31 +0000 Subject: gnu: go-gopkg-in-natefinch-lumberjack.v2: Move to golang-xyz. * gnu/packages/golang.scm (go-gopkg-in-natefinch-lumberjack.v2): Move from here ... * gnu/packages/golang-xyz.scm: ... to here. * gnu/packages/finance.scm: Add (gnu packages golang-xyz) module. Change-Id: Ib31fe5787f7b9a5c10e527ea344adaf587aeea13 --- gnu/packages/finance.scm | 1 + gnu/packages/golang-xyz.scm | 29 ++++++++++++++++++++++++++++- gnu/packages/golang.scm | 26 -------------------------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e09662abdf..d8b17fc61d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -97,6 +97,7 @@ (define-module (gnu packages finance) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages gsasl) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index c594629d83..8e34c34e7b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -8,10 +8,10 @@ ;;; Copyright © 2019-2022 Efraim Flashner ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020, 2021 Martin Becze ;;; Copyright © 2020, 2021 raingloom ;;; Copyright © 2021 Collin J. Doering ;;; Copyright © 2021 Guillaume Le Vaillant -;;; Copyright © 2021 Martin Becze ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2023, 2024 Sharlatan Hellseher @@ -2331,6 +2331,33 @@ (define-public go-gopkg-in-cheggaaa-pb-v1 (list #:import-path "gopkg.in/cheggaaa/pb.v1")))) +(define-public go-gopkg-in-natefinch-lumberjack.v2 + (package + (name "go-gopkg-in-natefinch-lumberjack.v2") + (version "2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/natefinch/lumberjack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d")))) + (build-system go-build-system) + (arguments + (list + #:import-path "gopkg.in/natefinch/lumberjack.v2")) + (propagated-inputs + (list go-github-com-burntsushi-toml + go-gopkg-in-yaml-v2)) + (home-page "https://github.com/natefinch/lumberjack") + (synopsis "Rolling logger for Go") + (description + "Lumberjack is a Go package for writing logs to rolling files.") + (license license:expat))) + (define-public go-gopkg-in-op-go-logging-v1 (package (inherit go-github-com-op-go-logging) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d2f8874de6..3a10b8c03c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3173,32 +3173,6 @@ (define-public go-gopkg-in-tomb-v1 "t.Fatalf(`Killf(\"BO%%s"))))))) (home-page "https://gopkg.in/tomb.v1"))) -(define-public go-gopkg-in-natefinch-lumberjack.v2 - (package - (name "go-gopkg-in-natefinch-lumberjack.v2") - (version "2.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/natefinch/lumberjack") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d")))) - (build-system go-build-system) - (arguments - '(#:import-path "gopkg.in/natefinch/lumberjack.v2")) - (propagated-inputs - `(("github.com/burntsush/toml" ,go-github-com-burntsushi-toml) - ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2))) - (home-page "https://github.com/natefinch/lumberjack") - (synopsis "Rolling logger for Go") - (description - "Lumberjack is a Go package for writing logs to rolling files.") - (license license:expat))) - (define-public go-github.com-jtolds-gls (package (name "go-github.com-jtolds-gls") -- cgit v1.2.3