From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KECNAM35QGONFwEAbAwnHQ (envelope-from ) for ; Sat, 08 Oct 2022 06:17:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id qAahAM35QGPmVQEA9RJhRA (envelope-from ) for ; Sat, 08 Oct 2022 06:17:17 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 78FD43115E for ; Sat, 8 Oct 2022 06:17:16 +0200 (CEST) Received: from localhost ([::1]:38958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oh1H1-0007mC-7b for larch@yhetil.org; Sat, 08 Oct 2022 00:17:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55958) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oh1Gr-0007li-AR for guix-patches@gnu.org; Sat, 08 Oct 2022 00:17:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oh1Gp-0002O5-0u for guix-patches@gnu.org; Sat, 08 Oct 2022 00:17:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oh1Go-0006hg-J1 for guix-patches@gnu.org; Sat, 08 Oct 2022 00:17:02 -0400 Subject: bug#54882: [PATCH 0/2] gnu: Add hut. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 08 Oct 2022 04:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 54882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Dhruvin Gandhi Cc: 54882-done@debbugs.gnu.org Mail-Followup-To: 54882@debbugs.gnu.org, maxim.cournoyer@gmail.com, contact@dhruvin.dev Received: via spool by 54882-done@debbugs.gnu.org id=D54882.166520259425723 (code D ref 54882); Sat, 08 Oct 2022 04:17:02 +0000 Received: (at 54882-done) by debbugs.gnu.org; 8 Oct 2022 04:16:34 +0000 Received: from localhost ([127.0.0.1]:37865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oh1GL-0006gp-GN for submit@debbugs.gnu.org; Sat, 08 Oct 2022 00:16:34 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:43822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oh1GJ-0006gb-BL for 54882-done@debbugs.gnu.org; Sat, 08 Oct 2022 00:16:32 -0400 Received: by mail-qk1-f178.google.com with SMTP id t7so4020650qkt.10 for <54882-done@debbugs.gnu.org>; Fri, 07 Oct 2022 21:16:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=pBbh0lFlQEz3N/ygZYCabujrp1uSIxL2Drm+Snzjmjg=; b=cY+DjqFVZUTxKQ7LP5yBE9ZdKTEuPTs9ZjE/3meApt6SGz8sWg93HtgmH6h9fL+RND kbBWlHEYxjRsd+YD5vGTqLpqWYHONxmO0D+vTtOKBhuCt7d8Wnl+kFHC+itdN0fk+fVb 0By/eDqAj4YRylOyh1BJh/xV0JrQyMq95QXro5A8dZPuL4/tBi+Yx5EtRh/0Q/WuGorK XjYM1XE9gVhh1nkd4KXLowBK4yULO2W5B70I5r7DQi0ceSVwFD6A3E7kDcgpbeEd4yuj 7ErJ91ht7tGSsHro3vkIDt4OKyioXBUEon9hxYjLT4HTLtwKUs38BqIYWA4+pcDL5Huz swvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pBbh0lFlQEz3N/ygZYCabujrp1uSIxL2Drm+Snzjmjg=; b=eHfF9F5EWCeoFOsYA691Ylzb76PheJ6QONd6Y9VfykJnP7p0y1lBFAL+yCQ1/dvgP2 OBeZ5UhSYnOzUxcfQ8uSMjYbxv7ZXhW+ez5rOM2G59/xDJmZWDkstSYeBnEThlawaLis d9ic4u69dog8IMTZB0UmytO5KglLOpQOmFCGggOD7gPWnC7A0OMrqtdpeIdsahM1ymuw zbobkOsi5zwyYzCcvnjM8JTCHRk3AdpPXo6hKbotsQ36KaGpAFxRfrh1qW3CjsdewGNA PBfSiPsD1ycmaZCJ2ybw5t0OJnezsqLlrKPwwM05uudDEwVDxrarfJroh7IsB9I5UTiH t6Fw== X-Gm-Message-State: ACrzQf06HZlFpBjI0yTWm/6veY7X+//r5ClxaFFumSxIfcH6lOcZTNBW zvJyAbvxphVC6qBcB3aBOPfgdFIHrJX3rw== X-Google-Smtp-Source: AMsMyM6i0Fd4YjQ//LY13DAKismhQlX9OixxPVq3QsInvmdBiTL1XCU1qWT2f8rAQ7Wliph0crMZOQ== X-Received: by 2002:a05:620a:4244:b0:6cf:8a7b:3224 with SMTP id w4-20020a05620a424400b006cf8a7b3224mr5988951qko.32.1665202585487; Fri, 07 Oct 2022 21:16:25 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1005]) by smtp.gmail.com with ESMTPSA id do37-20020a05620a2b2500b006ea18f550b0sm2108561qkb.48.2022.10.07.21.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Oct 2022 21:16:25 -0700 (PDT) From: Maxim Cournoyer References: <20220623093808.21573-1-contact@dhruvin.dev> <20220623093808.21573-6-contact@dhruvin.dev> Date: Sat, 08 Oct 2022 00:16:24 -0400 In-Reply-To: <20220623093808.21573-6-contact@dhruvin.dev> (Dhruvin Gandhi's message of "Thu, 23 Jun 2022 15:08:08 +0530") Message-ID: <87a6672bmv.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665202636; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=pBbh0lFlQEz3N/ygZYCabujrp1uSIxL2Drm+Snzjmjg=; b=cU4w60ae8tp/f49QgRzDZswg4J4AcYdMZu+G9tMlsoUwDrMKww9WQM/k2933cOQHR02vVy dsJqH2Zdlx2zGr0/5ZVAsEngKQTRimOldxNJaHyv22BbJp+S97S/0kB/inbdr+JdDw56Ik 8SLvJbwz3ueK9KmXc2yRtENoRzvW/W1naXCcphUpqIhuP7y9M3DWT31HIzt+me1abNwllF G9Ep0ubeL6IZgCZRxLAe8wqVQQalAulIqvpjroP8a4gLc/vD1eIeSOrwtld2myGL7fVKOk uwxqplzc51j5lRq+Rq+/RhfxIhXlSoXp0BJqQAmsgPfnzmLMhKF03olYMSFcvg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665202636; a=rsa-sha256; cv=none; b=oHKKTVVU5kM7UHEyTequMsnuZmQk6SLCnMN88xI3KVsgOjz/UDTNRugYxEUU/wIDPzXnT5 vwlOJW8Wk/YNqDWp58ock9Xmayc89BrVwkbEKoBHMj/+ZrvJW35wHpXeHwAJFWV5j2e4A0 zo3Rvl0djIo4TKW+G4gqMCaU0K32IqH8VJSVG1DErNz4A7JWhXMvel2fhN4IbVf0Oag+6W XEp+Pg3k9GXPVZwoQTIGnbZuzTEoORzPs1XlgGzNJ9sq3LMqmJh+KmuMQKP6RKebhncH18 TCGOzxQ+lcCJoJqgfa47/OEPzzbrv+dIAWOarVqt9dQsr9nb1mHX1HgknLvj6A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=cY+DjqFV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 6.12 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=cY+DjqFV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 78FD43115E X-Spam-Score: 6.12 X-Migadu-Scanner: scn1.migadu.com X-TUID: AAu38wswsIsL Hello! Dhruvin Gandhi 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-cont= rol.scm > index eefb4a01ec..860c281ab2 100644 > --- a/gnu/packages/version-control.scm > +++ b/gnu/packages/version-control.scm > @@ -45,6 +45,7 @@ > ;;; Copyright =C2=A9 2021 Foo Chuan Wei > ;;; Copyright =C2=A9 2022 Jai Vetrivelan > ;;; Copyright =C2=A9 2022 Maxime Devos > +;;; Copyright =C2=A9 2022 Dhruvin Gandhi > ;;; > ;;; 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 check= s 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=3D-v -x")))) > + (replace 'install > + (lambda* (#:key import-path outputs #:allow-other-keys) > + (with-directory-excursion (string-append "src/" import-pat= h) > + (invoke "make" "install" > + (string-append "PREFIX=3D" (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=3D-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=3D" (assoc-ref outputs "out")))))= )))) + (string-append "PREFIX=3D" #$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 w= ith 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. --=20 Thanks, Maxim