[PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.

  • Done
  • quality assurance status badge
Details
4 participants
  • Katherine Cox-Buday
  • Christopher Baines
  • Tobias Geerinckx-Rice
  • (
Owner
unassigned
Submitted by
Katherine Cox-Buday
Severity
normal
Merged with
K
K
Katherine Cox-Buday wrote on 18 Jan 2023 02:44
(address . guix-patches@gnu.org)(name . Katherine Cox-Buday)(address . cox.katherine.e@gmail.com)
20230118014510.19320-11-cox.katherine.e@gmail.com
* gnu/packages/configuration-management.scm (chezmoi): Define in terms
of'go-gopkg-in-errgo-fmt-errors'.

* (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as "gopkg-in-errgo-fmt-errors".
---
gnu/packages/configuration-management.scm | 2 +-
gnu/packages/golang.scm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)

Toggle diff (40 lines)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 3ebb6957c8..b66f70545a 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -97,7 +97,7 @@ (define-public chezmoi
go-golang-org-x-net
go-golang-org-x-oauth2
go-github-com-rogpeppe-go-internal
- gopkg-in-errgo-fmt-errors))
+ go-gopkg-in-errgo-fmt-errors))
(home-page "https://www.chezmoi.io/")
(synopsis "Personal configuration files manager")
(description "This package helps to manage personal configuration files
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 240f8ea56c..4cef0f61f6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9147,9 +9147,9 @@ (define-public go-github-com-rogpeppe-go-internal
@end itemize\n")
(license license:bsd-3)))
-(define-public gopkg-in-errgo-fmt-errors
+(define-public go-gopkg-in-errgo-fmt-errors
(package
- (name "gopkg-in-errgo-fmt-errors")
+ (name "go-gopkg-in-errgo-fmt-errors")
(version "2.1.0")
(source (origin
(method git-fetch)
@@ -9162,7 +9162,7 @@ (define-public gopkg-in-errgo-fmt-errors
"065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"))))
(build-system go-build-system)
(arguments
- `(#:import-path "gopkg.in/errgo.v2/fmt/errors"
+ `(#:import-path "gopkg.in/errgo.v2"
#:tests? #f
;; Source-only package
#:phases
--
2.38.1
T
T
Tobias Geerinckx-Rice wrote on 18 Jan 2023 11:56
(no subject)
(address . control@debbugs.gnu.org)
542e82bcc0f385c117ba662c7dcf1dbf@tobias.gr
merge 60898 60899 60900 60901 60902
merge 60898 60903 60904 60905 60906
merge 60898 60907 60908 60909 60910
merge 60898 60911 60912 60913 60914
merge 60898 60915 60916 60917 60918
merge 60898 60919 60920
T
T
Tobias Geerinckx-Rice wrote on 18 Jan 2023 12:43
(address . control@debbugs.gnu.org)
37de5823441633151229c783f2acfca3@tobias.gr
merge 60898 60921 60922
thanks

Weird: I got ‘Unknown command or malformed arguments to command.’ for
this obviously correct line.

Let's try again.
K
K
Katherine Cox-Buday wrote on 18 Jan 2023 18:07
Merging erroneously opened bugs
(address . control@debbugs.gnu.org)
87zgafrct9.fsf@gmail.com
merge 60899 60904 60907 60908 60917 60920 60921 60919 60910 60903 60915 60914 60922 60909 60918 60913 60900 60899 60905 60901 60912 60898 60906 60902 60916 60911
--
Katherine
C
C
Christopher Baines wrote on 6 Feb 2023 23:17
Re: [bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.
(name . Katherine Cox-Buday)(address . cox.katherine.e@gmail.com)
87sfficua9.fsf@cbaines.net
Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

Toggle quote (5 lines)
> * gnu/packages/configuration-management.scm (chezmoi): Define in terms
> of'go-gopkg-in-errgo-fmt-errors'.
>
> * (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as "gopkg-in-errgo-fmt-errors".

I'm no expert in changelog entries in commit messages, but I'd probably
write this like:

* gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors):
Rename to …
(go-gopkg-in-errgo-fmt-errors): … this.
* gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update
accordingly.


I think that's a little clearer in terms of the changes being made, and
has less words as well.
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPhfK9fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcChA//c+MTu2nfpm0y6ybSiu0t14QFtYxVZjfu
il2SRFCMGnfTu/okqCFrmNAPQIga77NPmaL9wrCnQFgU+dkdHxm2pUv4Vhl2NqAU
hZTpKNd42FVbPnb4deFptwg5NqgQriGM7JYINNSpQMfdvpuuCSgYhcrix+N6UFQ0
5/wXWR+Bul2a2DPWupq65oDkvu8uX1LWjbt+159PxUhbgaA/f/UzNjvnGH3izl0y
4WJHn/xNcGGbqmSU49lFTwaU9XaqS4odIA+KbfisNNKMP8pur7X2EI9KHti9wMRN
UzuKGQuSchTwhauEFp3KIQX64xF2NphWU1pTags3g+kdYmzqbghLbL3wafBSnn9i
dd0TbN3JK/CSXg/oDDqR4kwC9rkOYTVsKC4DtSl/d8STQGtHmSYxdc1Xeg9RJADi
r+/fdszn7BN5jhUmsPRVBU+JtN+2a40Vnn6veGh3VI5Bh+jRzdFG6pyMunr32mYv
63X1tOseVdWtQvbIRTQJHTADebMQmSo//oZxEl5OXuHhayWn1EHB/O2b1CeU8ALF
FYGeazUzn08vdtbHCkeL+/0sD7gI16qz3qWmdi0Io+/181TtALFCH0D7+Naf+h5G
JodSIYUxIsphsQGsERGNSl1MCZSbZZFIBq09LqFr7y1ka+RXsOkG6GhsOsPUkArb
YaDT0aLIf04=
=SBQE
-----END PGP SIGNATURE-----

(
(
( wrote on 6 Feb 2023 23:22
CQBTX11H53Z6.1931YJ627R8HE@guix-framework
* gnu/packages/configuration-management.scm (chezmoi): Define in terms
of'go-gopkg-in-errgo-fmt-errors'.

* (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as "gopkg-in-errgo-fmt-errors".

LGTM except for the commit message; please adopt Chris's suggestion :)

-- (
-----BEGIN PGP SIGNATURE-----

iQGzBAABCgAdFiEE6Vh10NblKE5doNlW7ImHg/nqI20FAmPhfY4ACgkQ7ImHg/nq
I20fUAwAyQ/t5jHP/jvWUDJmVlhsl0lPLVJmgyQSIAJFYnY8G9IL91Aob/fRfMJZ
xt2s+g8O4R0wcnmFYY1qovnpc3c58Yn/PX84sELOjTFmiJT3hBTOhBzibAQE1SQp
GMyT5SPbdu7/znJsxhJNYGFNNzHeUASGMEAATjE+wsbBGU3gA/eaYchLR3XKCz13
a4vJ44mldpilBBGRgEGuTOT7J99d1eSWtr5yV2sCFNDDBpdYIhPb+64lX1D+dfZn
MM8lgq3FnePKWH4TNb42dAO6m7I36v0MrTedRG1gTzbpCijkZ0ad2bFMqnwN50Hy
MJxAP+5Hv7nJ3O29/1IiEfqUyk9EY5XeJ/+0K9of2NI0EoUEUTlVLwJRISAJzORu
/qWFKrEWt9bdTIdjwWAWUZr4L6S+RKSXXA7glx7OPEP6+Ke0J9ThC0KR7lAncfxx
O3lXPleA78SZJlRWBBVSaPbvTz45/+xZ+jMWFxCg+2NHNYntfN0tegDrtrEQk5AM
Nopa+1bt
=JKZF
-----END PGP SIGNATURE-----


K
K
Katherine Cox-Buday wrote on 7 Feb 2023 18:20
(name . Christopher Baines)(address . mail@cbaines.net)(address . 60908@debbugs.gnu.org)
87edr1xuhm.fsf@gmail.com
Christopher Baines <mail@cbaines.net> writes:

Toggle quote (21 lines)
> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>
>> * gnu/packages/configuration-management.scm (chezmoi): Define in terms
>> of'go-gopkg-in-errgo-fmt-errors'.
>>
>> * (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as
>> "gopkg-in-errgo-fmt-errors".
>
> I'm no expert in changelog entries in commit messages, but I'd probably
> write this like:
>
> * gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors):
> Rename to …
> (go-gopkg-in-errgo-fmt-errors): … this.
> * gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update
> accordingly.
>
>
> I think that's a little clearer in terms of the changes being made,
> and has less words as well.

Thank you for the suggestions; I agree it is much clearer.

The changelog format is something I personally really struggle with, so
I use tools to hopefully get me closer to being correct. I am using the
auto-complete snippets provided `./etc/snippets`, and it looks like this
is the format defined in:

`./etc/snippets/yas/log-edit-mode/guix-vc-commit-message-rename-package`

I'd love to be able to get these right, and I'll endeavor to do so, but
if the tooling is suggesting unhelpful things, it's going to be a real
struggle for me. Should we update the snippets?

--
Katherine
C
C
Christopher Baines wrote on 8 Feb 2023 12:45
(name . Katherine Cox-Buday)(address . cox.katherine.e@gmail.com)(address . 60908@debbugs.gnu.org)
87bkm4752w.fsf@cbaines.net
Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

Toggle quote (36 lines)
> Christopher Baines <mail@cbaines.net> writes:
>
>> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>>
>>> * gnu/packages/configuration-management.scm (chezmoi): Define in terms
>>> of'go-gopkg-in-errgo-fmt-errors'.
>>>
>>> * (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as
>>> "gopkg-in-errgo-fmt-errors".
>>
>> I'm no expert in changelog entries in commit messages, but I'd probably
>> write this like:
>>
>> * gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors):
>> Rename to …
>> (go-gopkg-in-errgo-fmt-errors): … this.
>> * gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update
>> accordingly.
>>
>>
>> I think that's a little clearer in terms of the changes being made,
>> and has less words as well.
>
> Thank you for the suggestions; I agree it is much clearer.
>
> The changelog format is something I personally really struggle with, so
> I use tools to hopefully get me closer to being correct. I am using the
> auto-complete snippets provided `./etc/snippets`, and it looks like this
> is the format defined in:
>
> `./etc/snippets/yas/log-edit-mode/guix-vc-commit-message-rename-package`
>
> I'd love to be able to get these right, and I'll endeavor to do so, but
> if the tooling is suggesting unhelpful things, it's going to be a real
> struggle for me. Should we update the snippets?

I also struggle with this, so I'm don't really have any great
suggestions. If you think the snippets could be improved, then that
sounds great to me.
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmPji4dfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdBzQ/+KOaim9R3aaOyAD72/G5Al/dCM5eqIiqE
f3P5IJ9MrP+duaNAFARw+yPxw355s6zhY929ygv0D3B1gyWnnzBhduwbTCLmzpaT
opLwSt1z9nqIotsxc+KSjy5ij0//prT18k9gTectF8AygE4OpdC64CQwZLGx6/RM
2bDFRIR6b/RiNQs8TY0e4Zlt4ZOgCnaEEHWwKvKD2l4eO1jtPacPpIMFsw+zq3AL
ZebCZSfpE+7v00o2Ae+jam4wYppihLownHyPkSWkHInNFgkiCDlDQ4IiIPuy3ZTr
L5mGk2UQVnvupCR95a+VR6NVj5mWJ2tt1eKnxSmHpoQ0vQ8XBdyF8UhohXxhyFIs
hldVCxPj7HzLUcfD6i4FQ4S31fBjXVf96PTXvM3GapkX1DQvjV9DpzQ1qeizKDti
4g75AsAhTxQ/Gp7+G30+2rsIl6ZkDmhcwtyPMp778rGDDDknn/RVhQsZixEKGKBZ
xKaCU1wWJ+xphVKYF+t2WcxfACFr9GLGV9qAkVsggk/7OA4tGkAX9V/o7MQc974o
RRJUROsiwqfRIrvDL5FWoKgsOFF9MgcjjYeQBQQAKITl3Pjylmwe0H3SUfCTD3zS
m903PG1ag6TXtlqLeyVW8W9X1Mp+6nQYA2ZEItfv4gGbhNNIbqXUdRXcDeb9uHyH
PjArOPfqXi8=
=fUIV
-----END PGP SIGNATURE-----

?