From 0f510fc044b817285de6bcccfa0cd4573cc3db4b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 1 Jan 2025 16:47:29 +0000 Subject: [PATCH] gnu: go-github-com-golangplus-testing: Fix tests. These changes need to be applied together to allow bootstrapping of missing inputs. * gnu/packages/golang-check.scm (go-github-com-golangplus-testing-bootstrap): New variable. (go-github-com-golangplus-testing) [native-inputs]: Add go-github-com-golangplus-bytes-bootstrap. * gnu/packages/golang-xyz.scm (go-github-com-golangplus-bytes): New variable. Change-Id: Ib97363281fc9a169a734a63197db70a3ce8f9d48 --- gnu/packages/golang-check.scm | 13 +++++++++++++ gnu/packages/golang-xyz.scm | 36 +++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index be36e7503f..3061731ad1 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -631,12 +631,25 @@ package, but can be used in other contexts too.") (build-system go-build-system) (arguments '(#:import-path "github.com/golangplus/testing")) + (native-inputs + (list go-github-com-golangplus-bytes-bootstrap)) (propagated-inputs (list go-github-com-golangplus-fmt)) (synopsis "Additions to Go's standard testing package") (description "This package provides additions to Go's stdlib testing.") (license license:bsd-3))) +(define-public go-github-com-golangplus-testing-bootstrap + (hidden-package + (package + (inherit go-github-com-golangplus-testing) + (arguments + (list #:skip-build? #t + #:tests? #f + #:import-path "github.com/golangplus/testing")) + (native-inputs '()) + (propagated-inputs '())))) + (define-public go-github-com-google-gofuzz (package (name "go-github-com-google-gofuzz") diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 2b4dc18eda..e5bc020440 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -5215,6 +5215,42 @@ execution.") "The chardet package ports character set detection from ICU to Go.") (license license:expat))) +(define-public go-github-com-golangplus-bytes + (package + (name "go-github-com-golangplus-bytes") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golangplus/bytes") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r8f9m7hm6idnbapfb01nw5h09a20b09r7sky2gkniympn98ra75")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/golangplus/bytes")) + (native-inputs + (list go-github-com-golangplus-testing-bootstrap)) + (home-page "https://github.com/golangplus/bytes") + (synopsis "Extention to Golang standard @code{bytes} library.") + (description + "Package bytesp is a plus to the standard @code{bytes} package.") + (license license:bsd-3))) + +(define-public go-github-com-golangplus-bytes-bootstrap + (hidden-package + (package + (inherit go-github-com-golangplus-bytes) + (arguments + (list #:skip-build? #t + #:tests? #f + #:import-path "github.com/golangplus/bytes")) + (native-inputs '()) + (propagated-inputs '())))) + (define-public go-github-com-gologme-log (package (name "go-github-com-gologme-log")