mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-02 08:07:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: go-github-com-petermattis-goid: Update to 0.0.0-2.bb94eb5.

Browse source 
* gnu/packages/golang-check.scm (go-github-com-petermattis-goid): Update to 0.0.0-2.bb94eb5.

Change-Id: I8403c200037dccac6c65def47e97a0218ff3f9a9
This commit is contained in:
Sharlatan Hellseher 2024-06-26 21:37:54 +01:00
parent f046e348e1
commit fb217d218e
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/golang-check.scm
View file

@ -732,10 +732,9 @@ (define-public go-github-com-prashantv-gostub
original value once the test has been run.")
(license license:expat)))
<<<<<<< HEAD
(define-public go-github-com-petermattis-goid
(let ((commit "b0b1615b78e5ee59739545bb38426383b2cda4c9")
(revision "1"))
(let ((commit "bb94eb51e7a772d09cef11768f3248ac25adf9f9")
(revision "2"))
(package
(name "go-github-com-petermattis-goid")
(version (git-version "0.0.0" revision commit))
@ -747,7 +746,7 @@ (define-public go-github-com-petermattis-goid
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0ghfxn045r0bbn2vszw897lxzmhnm4k59aypjvpxl0pbzsw9ab2c"))))
(base32 "0hr94frr0rhac4mb9r7ixdgr6hm63rxh6z43rhn2wn7fdy8csw11"))))
(build-system go-build-system)
(arguments
(list
@ -758,7 +757,7 @@ (define-public go-github-com-petermattis-goid
"This package offers a method of programmatically retrieving the
current goroutine's ID.")
(license license:asl2.0))))
=======
(define-public go-github-com-sasha-s-go-deadlock
(package
(name "go-github-com-sasha-s-go-deadlock")
@ -783,7 +782,6 @@ (define-public go-github-com-sasha-s-go-deadlock
(description
"This package provides tools for detecting deadlocks at run-time in Go.")
(license license:asl2.0)))
>>>>>>> 23b9baa200 (gnu: go-github-com-sasha-s-go-deadlock: Move to golang-check.)
(define-public go-github-com-stretchr-testify
(package