Package: guix-patches;
Reported by: Dhruvin Gandhi <contact <at> dhruvin.dev>
Date: Tue, 12 Apr 2022 12:11:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: tracker <at> debbugs.gnu.org Subject: bug#54882: closed ([PATCH 0/2] gnu: Add hut.) Date: Sat, 08 Oct 2022 04:17:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Sat, 08 Oct 2022 00:16:24 -0400 with message-id <87a6672bmv.fsf_-_ <at> gmail.com> and subject line Re: bug#54882: [PATCH 0/2] gnu: Add hut. has caused the debbugs.gnu.org bug report #54882, regarding [PATCH 0/2] gnu: Add hut. to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs <at> gnu.org.) -- 54882: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=54882 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Dhruvin Gandhi <contact <at> dhruvin.dev> To: guix-patches <at> gnu.org Cc: Dhruvin Gandhi <contact <at> dhruvin.dev> Subject: [PATCH 0/2] gnu: Add hut. Date: Tue, 12 Apr 2022 17:40:39 +0530This patch adds hut. Commit messages may need some corrections. I excluded dependencies that are not used to build/test the package. Dhruvin Gandhi (2): gnu: go-github-com-spf13-cobra: Update to 1.4.0. gnu: Add hut. gnu/packages/golang.scm | 148 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 146 insertions(+), 2 deletions(-) -- 2.35.1
[Message part 3 (message/rfc822, inline)]
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Dhruvin Gandhi <contact <at> dhruvin.dev> Cc: 54882-done <at> debbugs.gnu.org Subject: Re: bug#54882: [PATCH 0/2] gnu: Add hut. Date: Sat, 08 Oct 2022 00:16:24 -0400Hello! Dhruvin Gandhi <contact <at> dhruvin.dev> writes: > * gnu/packages/version-control.scm (hut): New variable. > --- > gnu/packages/version-control.scm | 61 ++++++++++++++++++++++++++++++++ > 1 file changed, 61 insertions(+) > > diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm > index eefb4a01ec..860c281ab2 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -45,6 +45,7 @@ > ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo <at> hotmail.com> > ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan <at> gmail.com> > ;;; Copyright © 2022 Maxime Devos <maximedevos <at> telenet.be> > +;;; Copyright © 2022 Dhruvin Gandhi <contact <at> dhruvin.dev> > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -104,6 +105,7 @@ (define-module (gnu packages version-control) > #:use-module (gnu packages image) > #:use-module (gnu packages linux) > #:use-module (gnu packages mail) > + #:use-module (gnu packages man) > #:use-module (gnu packages maths) > #:use-module (gnu packages nano) > #:use-module (gnu packages ncurses) > @@ -3407,3 +3409,62 @@ (define-public gitlint > "Gitlint is a Git commit message linter written in Python: it checks your > commit messages for style.") > (license license:expat))) > + > +(define-public hut > + (package > + (name "hut") > + (version "0.1.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://git.sr.ht/~emersion/hut") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "15ag8fibnahcfgd0w2j4k813z10ymi39rx8d3c8b9955zc62p1fr")))) > + (build-system go-build-system) > + (arguments > + (list > + #:import-path "git.sr.ht/~emersion/hut" > + #:phases > + #~(modify-phases > + %standard-phases > + (replace 'build > + (lambda* (#:key import-path #:allow-other-keys) > + (with-directory-excursion > + (string-append "src/" import-path) > + ;; From guix/build/go-build-system.scm > + (setenv "CGO_LDFLAGS" "-s -w") > + (invoke "make" "all" "GOFLAGS=-v -x")))) > + (replace 'install > + (lambda* (#:key import-path outputs #:allow-other-keys) > + (with-directory-excursion (string-append "src/" import-path) > + (invoke "make" "install" > + (string-append "PREFIX=" (assoc-ref outputs "out"))))))))) > + (native-inputs > + (list scdoc)) > + (inputs > + (list go-golang-org-x-term > + go-golang-org-x-oauth2 > + go-github-com-spf13-cobra > + go-github-com-juju-ansiterm > + go-git-sr-ht--emersion-gqlclient > + go-git-sr-ht--emersion-go-scfg)) > + (home-page "https://git.sr.ht/~emersion/hut") > + (synopsis "CLI tool for sr.ht") > + (description "@command{hut} is a CLI tool for > +@uref{https://sr.ht/~sircmpwn/sourcehut/, sr.ht}. It helps you interact with > +sr.ht's public services: > +@itemize > +@item builds: submit, and manage build jobs > +@item git: create, and manage git repositories, and artifacts > +@item hg: list Mercurial repositories > +@item lists: manage mailing lists, and patches > +@item meta: manage PGP, and SSH keys > +@item pages: publish, and manage hosted websites > +@item paste: create, and manage pastes > +@item todo: create, and manage trackers, and tickets > +@item graphql: interact with GraphQL APIs directly > +@end itemize") > + (license license:agpl3))) Thanks for this contribution! I've applied the 6 patches of this series, making them appear in the correct order, and made some changes to them, mostly making complete sentences in the description and fixing the indentation (please use the Emacs-based formatting tool next time, or 'guix style', which should get this right). I've also removed the double hydhen ('--') from package names, as we do not have this convention in Guix. For 'hut', I've taken the liberty to adjust the package definition like: --8<---------------cut here---------------start------------->8--- modified gnu/packages/version-control.scm @@ -3464,56 +3464,63 @@ (define-public hut (name "hut") (version "0.1.0") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~emersion/hut") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "15ag8fibnahcfgd0w2j4k813z10ymi39rx8d3c8b9955zc62p1fr")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/hut") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15ag8fibnahcfgd0w2j4k813z10ymi39rx8d3c8b9955zc62p1fr")))) (build-system go-build-system) (arguments - (list - #:import-path "git.sr.ht/~emersion/hut" - #:phases - #~(modify-phases - %standard-phases + (list + #:import-path "git.sr.ht/~emersion/hut" + #:phases + #~(modify-phases %standard-phases (replace 'build (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion - (string-append "src/" import-path) - ;; From guix/build/go-build-system.scm + (with-directory-excursion (string-append "src/" import-path) + ;; The flags are copied from (guix build go-build-system). (setenv "CGO_LDFLAGS" "-s -w") (invoke "make" "all" "GOFLAGS=-v -x")))) (replace 'install - (lambda* (#:key import-path outputs #:allow-other-keys) + (lambda* (#:key import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (invoke "make" "install" - (string-append "PREFIX=" (assoc-ref outputs "out"))))))))) + (string-append "PREFIX=" #$output)))))))) (native-inputs - (list scdoc)) + (list scdoc)) (inputs - (list go-golang-org-x-term - go-golang-org-x-oauth2 - go-github-com-spf13-cobra - go-github-com-juju-ansiterm - go-git-sr-ht--emersion-gqlclient - go-git-sr-ht--emersion-go-scfg)) + (list go-git-sr-ht-emersion-go-scfg + go-git-sr-ht-emersion-gqlclient + go-github-com-juju-ansiterm + go-github-com-spf13-cobra + go-golang-org-x-oauth2 + go-golang-org-x-term)) (home-page "https://git.sr.ht/~emersion/hut") (synopsis "CLI tool for sr.ht") (description "@command{hut} is a CLI tool for @uref{https://sr.ht/~sircmpwn/sourcehut/, sr.ht}. It helps you interact with sr.ht's public services: -@itemize -@item builds: submit, and manage build jobs -@item git: create, and manage git repositories, and artifacts -@item hg: list Mercurial repositories -@item lists: manage mailing lists, and patches -@item meta: manage PGP, and SSH keys -@item pages: publish, and manage hosted websites -@item paste: create, and manage pastes -@item todo: create, and manage trackers, and tickets -@item graphql: interact with GraphQL APIs directly -@end itemize") +@table @asis +@item builds +submit and manage build jobs +@item git +create, and manage git repositories and artifacts +@item hg +list Mercurial repositories +@item lists +manage mailing lists and patches +@item meta +manage PGP, and SSH keys +@item pages +publish and manage hosted websites +@item paste +create and manage pastes +@item todo +create and manage trackers, tickets +@item graphql +interact with GraphQL APIs directly +@end table") (license license:agpl3))) --8<---------------cut here---------------end--------------->8--- Normalizing the formatting of the code a bit, and turning the itemize list into a table in the description. Pushed, thank you! Closing. -- Thanks, Maxim
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.