From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 GC0wCASpZmKDJQEAbAwnHQ (envelope-from ) for ; Mon, 25 Apr 2022 15:58:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OE75BwSpZmIYbAAAauVa8A (envelope-from ) for ; Mon, 25 Apr 2022 15:58:28 +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 7441E45793 for ; Mon, 25 Apr 2022 15:58:27 +0200 (CEST) Received: from localhost ([::1]:34008 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nizEQ-000783-A8 for larch@yhetil.org; Mon, 25 Apr 2022 09:58:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nizE2-00077X-1E for guix-patches@gnu.org; Mon, 25 Apr 2022 09:58:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nizE1-0000KL-Oi for guix-patches@gnu.org; Mon, 25 Apr 2022 09:58:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nizE1-000604-Oc for guix-patches@gnu.org; Mon, 25 Apr 2022 09:58:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54882] [PATCH v2] gnu: Add hut. Resent-From: Dhruvin Gandhi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Apr 2022 13:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54882@debbugs.gnu.org Cc: Dhruvin Gandhi Received: via spool by 54882-submit@debbugs.gnu.org id=B54882.165089506423042 (code B ref 54882); Mon, 25 Apr 2022 13:58:01 +0000 Received: (at 54882) by debbugs.gnu.org; 25 Apr 2022 13:57:44 +0000 Received: from localhost ([127.0.0.1]:35714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nizDk-0005zZ-4b for submit@debbugs.gnu.org; Mon, 25 Apr 2022 09:57:44 -0400 Received: from out0.migadu.com ([94.23.1.103]:47075) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nizDg-0005zO-Q6 for 54882@debbugs.gnu.org; Mon, 25 Apr 2022 09:57:42 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dhruvin.dev; s=key1; t=1650895059; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=9kQbdxEmq/RhDgDH7sBbGt8OFcC3EfcAYAN4/fZHi8M=; b=D/4LcbE1lE/fi3KTFsLIay0Cf7KWXWHXVi81uaMHClM2DfoBtm+YzzLIWdnSU2z3M4yQPB kWFKSRQj+RBiLPqKSc1DCgSLnmDndFRGo7x48UI8WsWpiHYBe3LmtnB57GE+wOjZAwUjSZ 3/BOaxkoKJKW7jVvdgi9QqyKQbaux+s= Date: Mon, 25 Apr 2022 19:26:45 +0530 Message-Id: <20220425135645.24457-1-contact@dhruvin.dev> In-Reply-To: <20220412121039.23573-1-contact@dhruvin.dev> References: <20220412121039.23573-1-contact@dhruvin.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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" Reply-to: Dhruvin Gandhi X-ACL-Warn: , Dhruvin Gandhi via Guix-patches From: Dhruvin Gandhi via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1650895107; h=from:from:sender:sender:reply-to: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-cc: 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=9kQbdxEmq/RhDgDH7sBbGt8OFcC3EfcAYAN4/fZHi8M=; b=YZ8FrmUcJpyf7R3aoPbB4krzI5gQYJ35UpHyZg+GHbXesyLPyzKNJxThULR0reCY29q49D IEktAnf/NUnafpp3l68FpODI7J/HA1oY+WddusK7n1lIOJ5Ry18H9NtTWnC/PxZ+WCQ0E6 Efbk6PJ5vnczYVyoVjGrrga7lD+RupC6b/hwX/DFWQ9WDjlYzsGTd2P9gFau6nv5ixM308 6dgiiXDGaNdlaJD9T3vevVld8tumd/ShvH1IKl8hysPTVeloKgwwM25g7BBDpXS0FHtSu1 b8jbKy+a6UgNWhIf3y3O+ptoYLBaCotDpNjDNUhgu07UdKAs8pZqysNmf0zGVw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650895107; a=rsa-sha256; cv=none; b=QYnOprbzaGux6QbVZzDy8PZqG7ouuZCVOs6x8LDLxi2DFcv1Daexx811IN+6goKdJSXiWm 8EJRiadUn4yUmyrFl1Wqi+0XAbq3sGD5V400NRzs0EVTSUzwExpjaf/6HdNRtqwzkw3axL YVtcfIp/tca8dNRvuskkjP1AYbR0Ajf7h2vNiTVlb6Jo9s6Adgp+15vfsv03xM+cNwpZyy fj/yivNuwin9P4HiGNv3U+dU5dPc1zb6dh9FWBjwW6lFhxcpc6T3kUX9OT//rr+DjU84TA QHckjOHCEA92zHcJGPk4W0dyDCq6fsHWfXjUnQR6kxmBUNSPT3l7ntVvjdR2aw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dhruvin.dev header.s=key1 header.b="D/4LcbE1"; dmarc=pass (policy=none) header.from=gnu.org; 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: -4.21 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=dhruvin.dev header.s=key1 header.b="D/4LcbE1"; dmarc=pass (policy=none) header.from=gnu.org; 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: 7441E45793 X-Spam-Score: -4.21 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6fCnRhY2+95J * gnu/packages/version-control.scm (hut): New variable. --- gnu/packages/golang.scm | 118 +++++++++++++++++++++++++++++++ gnu/packages/version-control.scm | 43 +++++++++++ 2 files changed, 161 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 820e6b54ab..8b28546095 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2021 Philip McGrath ;;; Copyright © 2021 Lu Hui ;;; Copyright © 2022 Pier-Hugues Pellerin +;;; Copyright © 2022 Dhruvin Gandhi ;;; ;;; This file is part of GNU Guix. ;;; @@ -9775,3 +9776,120 @@ (define-public go-github-com-go-chi-chi-v5 "@code{go-github-com-go-chi-chi-v5} is an HTTP router that lets the user decompose request handling into many smaller layers.") (license license:expat))) + +(define-public go-github-com-google-shlex + (package + (name "go-github-com-google-shlex") + (version "0.0.0-20191202100458-e7afc7fbc510") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/shlex") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14z8hqyik910wk2qwnzgz8mjsmiamxa0pj55ahbv0jx6j3dgvzfm")))) + (build-system go-build-system) + (arguments '(#:import-path "github.com/google/shlex")) + (home-page "https://github.com/google/shlex") + (synopsis "Lexer for go that supports shell-style quoting, commenting, +and escaping") + (description + "Package shlex implements a simple lexer which splits input in to tokens using +shell-style rules for quoting and commenting.") + (license license:asl2.0))) + +(define-public go-git-sr-ht--emersion-go-scfg + (package + (name "go-git-sr-ht--emersion-go-scfg") + (version "0.0.0-20211215104734-c2c7a15d6c99") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/go-scfg") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02gn8hz8zfv8y0krysx2wv951gw8hmhdfqf1ysidwm7i293365w4")))) + (build-system go-build-system) + (arguments '(#:import-path "git.sr.ht/~emersion/go-scfg")) + (propagated-inputs + `(("go-github-com-google-shlex" ,go-github-com-google-shlex) + ("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew))) + (home-page "https://git.sr.ht/~emersion/go-scfg") + (synopsis "Library to parse scfg files") + (description "Package scfg parses configuration files.") + (license license:expat))) + +(define-public go-git-sr-ht--emersion-gqlclient + (package + (name "go-git-sr-ht--emersion-gqlclient") + (version "0.0.0-20220202181617-4e6e9c763dd2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~emersion/gqlclient") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d9hmaz7yy02bk455gmaav818xi49sw69jyx6dxzymv6ln7r1cv1")))) + (build-system go-build-system) + (arguments '(#:import-path "git.sr.ht/~emersion/gqlclient")) + (home-page "https://git.sr.ht/~emersion/gqlclient") + (synopsis "GraphQL client and code generator") + (description + "This package provides a GraphQL client and code generator for Go.") + (license license:expat))) + +(define-public go-github-com-juju-ansiterm + (package + (name "go-github-com-juju-ansiterm") + (version "0.0.0-20210929141451-8b71cc96ebdc") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/juju/ansiterm") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05mk7mlvg11dd6b0j0wlq547ghbmx2ywwrlbcb4kddpg7qaqp1va")))) + (build-system go-build-system) + (arguments '(#:import-path "github.com/juju/ansiterm")) + (propagated-inputs + `(("go-gopkg-in-check-v1" ,go-gopkg-in-check-v1) + ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-github-com-mattn-go-colorable" ,go-github-com-mattn-go-colorable) + ("go-github-com-lunixbochs-vtclean" + ,go-github-com-lunixbochs-vtclean))) + (home-page "https://github.com/juju/ansiterm") + (synopsis "Writer to output ANSI escape codes for color and styles") + (description + "Package ansiterm provides a Writer that writes out the ANSI escape codes for +color and styles.") + (license license:lgpl3))) + +(define-public go-github-com-lunixbochs-vtclean + (package + (name "go-github-com-lunixbochs-vtclean") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lunixbochs/vtclean") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jqn33l1kzy4dk66zbvxz7rlgkgg34s9mhc8z0lrz0i88466zhd8")))) + (build-system go-build-system) + (arguments '(#:import-path "github.com/lunixbochs/vtclean")) + (home-page "https://github.com/lunixbochs/vtclean") + (synopsis "Filter out terminal escape sequences") + (description + "Clean up raw terminal output by stripping escape sequences, optionally +preserving color.") + (license license:expat))) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 03c0d4420d..b5b3d1a1ae 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Dhruvin Gandhi ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,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) @@ -3330,3 +3332,44 @@ (define-public git-filter-repo Git project instead of @command{git filter-branch}.") (license (list license:expat ;; Main license. license:gpl2)))) ;; For test harness. + +(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 + '(#: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 + `(("scdoc" ,scdoc) + ("go-golang-org-x-term" ,go-golang-org-x-term) + ("go-golang-org-x-oauth2" ,go-golang-org-x-oauth2) + ("go-github-com-spf13-cobra" ,go-github-com-spf13-cobra) + ("go-github-com-juju-ansiterm" ,go-github-com-juju-ansiterm) + ("go-git-sr-ht--emersion-gqlclient" ,go-git-sr-ht--emersion-gqlclient) + ("go-git-sr-ht--emersion-go-scfg" ,go-git-sr-ht--emersion-go-scfg))) + (home-page "https://git.sr.ht/~emersion/hut") + (synopsis "CLI tool for sr.ht") + (description "This package provides a CLI tool for sr.ht.") + (license license:agpl3))) -- 2.36.0