From 997b93cc4a6deff54ebd854a716cca94095114bf Mon Sep 17 00:00:00 2001 From: Josselin Poiret Date: Wed, 1 Mar 2023 10:48:35 +0100 Subject: gnu: go-github-com-robfig-cron-1.2: Move to (gnu packages golang). Because (gnu packages golang) and (gnu packages check) use each other, this avoids an undefined symbol due to a module dependency cycle. * gnu/packages/check.scm (go-github-com-robfig-cron-1.2): Move to... * gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): ...here. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/check.scm | 18 ------------------ gnu/packages/golang.scm | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 4e907afeb6..44860e3018 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1029,24 +1029,6 @@ C++ but is used in C and C++ projects and frequently used in embedded systems but it works for any C/C++ project.") (license license:bsd-3))) -;; Required by actionlint. The version of `go-github-com-robfig-cron' -;; packaged in Guix is newer and changed some error messages, causing -;; unit tests in actionlint to fail. -(define-public go-github-com-robfig-cron-1.2 - (package - (inherit go-github-com-robfig-cron) - (name "go-github-com-robfig-cron") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/robfig/cron") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva")))))) - (define-public actionlint (package (name "actionlint") diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 7268b661cf..465e0fd4c7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6882,6 +6882,24 @@ and aid debugging.") a cron spec parser and job runner.") (license license:expat))) +;; Required by actionlint. The version of `go-github-com-robfig-cron' +;; packaged in Guix is newer and changed some error messages, causing +;; unit tests in actionlint to fail. +(define-public go-github-com-robfig-cron-1.2 + (package + (inherit go-github-com-robfig-cron) + (name "go-github-com-robfig-cron") + (version "1.2.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/robfig/cron") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva")))))) + (define-public go-github-com-shirou-gopsutil (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") (revision "0")) -- cgit v1.2.3