From patchwork Thu Apr 1 18:31:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 28286 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C594427BC75; Thu, 1 Apr 2021 19:34:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA51F27BC74 for ; Thu, 1 Apr 2021 19:34:03 +0100 (BST) Received: from localhost ([::1]:35824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lS28o-00087L-Pk for patchwork@mira.cbaines.net; Thu, 01 Apr 2021 14:34:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lS273-00063h-3B for guix-patches@gnu.org; Thu, 01 Apr 2021 14:32:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lS272-0004iP-J4 for guix-patches@gnu.org; Thu, 01 Apr 2021 14:32:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lS272-0008GJ-GZ for guix-patches@gnu.org; Thu, 01 Apr 2021 14:32:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47539] [PATCH v2 26/26] gnu: Add github-cli. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Apr 2021 18:32:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47539 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47539@debbugs.gnu.org Received: via spool by 47539-submit@debbugs.gnu.org id=B47539.161730191231552 (code B ref 47539); Thu, 01 Apr 2021 18:32:12 +0000 Received: (at 47539) by debbugs.gnu.org; 1 Apr 2021 18:31:52 +0000 Received: from localhost ([127.0.0.1]:58626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lS26i-0008Cp-DO for submit@debbugs.gnu.org; Thu, 01 Apr 2021 14:31:52 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:39278 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lS26g-0008Bc-Fy for 47539@debbugs.gnu.org; Thu, 01 Apr 2021 14:31:51 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1617301904; bh=tBCFN5Ce/WW+PCggpKsrpvC0O/OvbMwmq8EYHT3mdOw=; h=From:To:Subject:In-Reply-To:References:Date; b=EK5OP3GZ/UscEH/J7v+ZGk6SBB/BIYiwhRgBJa2qXv2GOu456+AmgTMmrb8K9l4oD XpeAXiM2sVRB3UE3DiuPfqn51/HmvUzRdcVaFldnsaOlGZplzx0SJRoyjdrNa8rGjj bGWUDixKhYdbtuRI+6tE1lG/Q/V7H2wEFg7TrInM= In-Reply-To: References: Message-Id: Date: Thu, 01 Apr 2021 20:31:44 +0200 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/version-control.scm (github-cli): New variable. --- gnu/packages/version-control.scm | 145 +++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e7fa6e6777..6e66897806 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -118,6 +118,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages swig) #:use-module (gnu packages sync) + #:use-module ((gnu packages syncthing) #:select (go-github-com-kballard-go-shellquote)) #:use-module (gnu packages tcl) #:use-module (gnu packages textutils) #:use-module (gnu packages time) @@ -3021,6 +3022,150 @@ commit message side by side If several repos are related, it helps to see their status together.") (license license:expat)))) +(define-public github-cli + (package + (name "github-cli") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cli/cli.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "009jh1i1ji7d773ismifdw4qvwlb8s1zn14d0n84j9h3n0hyynbc")))) + (build-system go-build-system) + (arguments + '(#:import-path + "github.com/cli/cli/cmd/gh" + #:unpack-path + "github.com/cli/cli" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-safeexec + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "src/github.com/cli/cli/" + ;; 'github.com/cli/safeexec' is only used for Windows, we + ;; replace it with the regular 'os/exec'. See + ;; for discussion. + (substitute* '("pkg/cmd/alias/expand/expand.go" + "script/build.go") + (("github.com/cli/safeexec") "os/exec") + (("safeexec") "exec")) + ;; These files have already imported 'os/exec', meaning that + ;; 'os/exec' would get imported twice, causing an error. + ;; Instead, we just remove the 'github.com/cli/safeexec'. + (substitute* '("cmd/gh/main.go" + "git/git.go" + "pkg/iostreams/iostreams.go" + "pkg/cmd/auth/shared/ssh_keys.go" + "pkg/cmd/pr/checkout/checkout.go" + "pkg/cmdutil/web_browser.go" + "pkg/surveyext/editor_manual.go") + (("\"github.com/cli/safeexec\"") "") + (("safeexec") "exec")))))))) + (native-inputs + `(("go-github-com-cli-shurcool-graphql" + ,go-github-com-cli-shurcool-graphql) + ("go-gopkg-in-yaml-v3" ,go-gopkg-in-yaml-v3) + ("go-golang-org-x-text" ,go-golang-org-x-text) + ("go-golang-org-x-sync" ,go-golang-org-x-sync) + ("go-golang-org-x-crypto" + ,go-golang-org-x-crypto) + ("go-github-com-stretchr-testify" + ,go-github-com-stretchr-testify) + ("go-github-com-spf13-pflag" + ,go-github-com-spf13-pflag) + ("go-github-com-spf13-cobra" + ,go-github-com-spf13-cobra) + ("go-github-com-shurcool-githubv4" + ,go-github-com-shurcool-githubv4) + ("go-github-com-rivo-uniseg" + ,go-github-com-rivo-uniseg) + ("go-github-com-muesli-termenv" + ,go-github-com-muesli-termenv) + ("go-github-com-mitchellh-go-homedir" + ,go-github-com-mitchellh-go-homedir) + ("go-github-com-mgutz-ansi" + ,go-github-com-mgutz-ansi) + ("go-github-com-mattn-go-runewidth" + ,go-github-com-mattn-go-runewidth) + ("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-kballard-go-shellquote" + ,go-github-com-kballard-go-shellquote) + ("go-github-com-itchyny-gojq" + ,go-github-com-itchyny-gojq) + ("go-github-com-henvic-httpretty" + ,go-github-com-henvic-httpretty) + ("go-github-com-hashicorp-go-version" + ,go-github-com-hashicorp-go-version) + ("go-github-com-google-shlex" + ,go-github-com-google-shlex) + ("go-github-com-google-go-cmp-cmp" + ,go-github-com-google-go-cmp-cmp) + ("go-github-com-gabriel-vasile-mimetype" + ,go-github-com-gabriel-vasile-mimetype) + ("go-github-com-enescakir-emoji" + ,go-github-com-enescakir-emoji) + ("go-github-com-cpuguy83-go-md2man-v2" + ,go-github-com-cpuguy83-go-md2man-v2) + ("go-github-com-cli-oauth" + ,go-github-com-cli-oauth) + ("go-github-com-cli-browser" + ,go-github-com-cli-browser) + ("go-github-com-briandowns-spinner" + ,go-github-com-briandowns-spinner) + ("go-github-com-makenowjust-heredoc" + ,go-github-com-makenowjust-heredoc) + ("go-github-com-alecaivazis-survey-v2" + ,go-github-com-alecaivazis-survey-v2) + ("go-github-com-charmbracelet-glamour" + ,go-github-com-charmbracelet-glamour) + ("go-github-com-alecthomas-chroma" + ,go-github-com-alecthomas-chroma) + ("go-github-com-google-goterm" + ,go-github-com-google-goterm) + ("go-github-com-aymerick-douceur" + ,go-github-com-aymerick-douceur) + ("go-github-com-danwakefield-fnmatch" + ,go-github-com-danwakefield-fnmatch) + ("go-github-com-chris-ramon-douceur" + ,go-github-com-chris-ramon-douceur) + ("go-github-com-gorilla-css" + ,go-github-com-gorilla-css) + ("go-golang-org-colorful" + ,go-golang-org-colorful) + ("go-golang-org-x-net" + ,go-golang-org-x-net) + ("go-github-com-muesli-reflow-ansi" + ,go-github-com-muesli-reflow-ansi) + ("go-github-com-microcosm-cc-bluemonday" + ,go-github-com-microcosm-cc-bluemonday) + ("go-github-com-muesli-reflow-wordwrap" + ,go-github-com-muesli-reflow-wordwrap) + ("go-github-com-yuin-goldmark" + ,go-github-com-yuin-goldmark) + ("go-github-com-dlclark-regexp2" + ,go-github-com-dlclark-regexp2) + ("go-github-com-muesli-reflow-indent" + ,go-github-com-muesli-reflow-indent) + ("go-github-com-muesli-reflow-padding" + ,go-github-com-muesli-reflow-padding) + ("go-github-com-olekukonko-tablewriter" + ,go-github-com-olekukonko-tablewriter))) + (home-page "https://github.com/cli/cli") + (synopsis "CLI interface to GitHub") + (description "This package provides the @command{gh} command, an interface +to GitHub on the command line. It brings pull requests, issues, and other +GitHub concepts to the terminal next to where you are already working with Git +and your code.") + (license license:expat))) + (define-public ghq (package (name "ghq")