unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Matthew James Kraai <kraai@ftbfs.org>
To: "(" <paren@disroot.org>
Cc: 58408@debbugs.gnu.org
Subject: [bug#58408] [PATCH] gnu: Add doctl.
Date: Wed, 12 Oct 2022 18:02:45 -0700	[thread overview]
Message-ID: <Y0djtcxbw+WK8B+l@carlo> (raw)
In-Reply-To: <CNK19Z8FY4YC.OR66N9FBGHZG@guix-framework>

Hi,

On Wed, Oct 12, 2022 at 04:01:32PM +0100, ( wrote:
> Hello,
> 
> On Wed Oct 12, 2022 at 2:08 PM BST, Matthew James Kraai wrote:
> > Here's an updated patch that installs autocompletion scripts for Bash, fish, and Zsh.
> 
> Nice catch :)
> 
> > +                 (lambda _
> > +                   (let ((install-completion
> > +                          (lambda (shell file)
> > +                            (let ((file (string-append #$output file)))
> > +                              (mkdir-p (dirname file))
> > +                              (with-output-to-file file
> > +                                (lambda _
> > +                                  (invoke (string-append #$output "/bin/doctl")
> > +                                          "completion" shell)))))))
> > +                     (install-completion "bash" "/etc/bash_completion.d/doctl")
> > +                     (install-completion "fish"
> > +                                         "/etc/fish/completions/doctl.fish")
> > +                     (install-completion "zsh"
> > +                                         "/etc/zsh/site-functions/_doctl")))))))
> 
> I think it might be better to use ``(define (...) ...)'' instead of
> ``(let ((... (lambda ...))) ...)'' here.

Thanks for the suggestion.  How about the following patch?

-- 
Matt

From f1bf9f77084a5543975364c304bcf9574abffb5b Mon Sep 17 00:00:00 2001
From: Matthew James Kraai <kraai@ftbfs.org>
Date: Sun, 9 Oct 2022 05:07:23 -0700
Subject: [PATCH] gnu: Add doctl.

* gnu/packages/admin.scm (doctl): New variable.
---
 gnu/packages/admin.scm | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 13d582403b..bc8b7e9efa 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Andreas Rammhold <andreas@rammhold.de>
 ;;; Copyright © 2022 ( <paren@disroot.org>
+;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5596,3 +5597,52 @@ (define-public rex
 several hosts in succession or in parallel.  It can also be used to copy a
 file or files to several hosts.")
     (license license:gpl3+)))
+
+(define-public doctl
+  (package
+    (name "doctl")
+    (version "1.83.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/digitalocean/doctl")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1narjmj3npd39gxi42k3h4zjyiaq5lvjv31vaxw8slf9h9sjhjh9"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/digitalocean/doctl/cmd/doctl"
+           #:unpack-path "github.com/digitalocean/doctl"
+           #:go go-1.19
+           #:build-flags
+           #~(list (string-append "-ldflags=-X github.com/digitalocean/doctl.Label=release"
+                                  " -X github.com/digitalocean/doctl.Major="
+                                  (car (string-split #$version #\.))
+                                  " -X github.com/digitalocean/doctl.Minor="
+                                  (cadr (string-split #$version #\.))
+                                  " -X github.com/digitalocean/doctl.Patch="
+                                  (caddr (string-split #$version #\.))))
+           #:install-source? #f
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'install 'install-completions
+                 (lambda _
+                   (define (install-completion shell file)
+                     (let ((file (string-append #$output file)))
+                       (mkdir-p (dirname file))
+                       (with-output-to-file file
+                         (lambda _
+                           (invoke (string-append #$output "/bin/doctl")
+                                   "completion" shell)))))
+                   (install-completion "bash" "/etc/bash_completion.d/doctl")
+                   (install-completion "fish"
+                                       "/etc/fish/completions/doctl.fish")
+                   (install-completion "zsh"
+                                       "/etc/zsh/site-functions/_doctl"))))))
+    (home-page "https://github.com/digitalocean/doctl")
+    (synopsis "Command line client for DigitalOcean")
+    (description
+     "@code{doctl} provides a unified command line interface to the DigitalOcean API.")
+    (license license:asl2.0)))
-- 
2.38.0





  reply	other threads:[~2022-10-13  1:03 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-10  9:54 [bug#58408] [PATCH] gnu: Add doctl Matthew James Kraai
2022-10-10 11:01 ` ( via Guix-patches via
2022-10-10 13:20   ` Matthew James Kraai
2022-10-10 15:21     ` ( via Guix-patches via
2022-10-11 13:36       ` Matthew James Kraai
2022-10-11 13:41         ` ( via Guix-patches via
2022-10-12 13:08 ` Matthew James Kraai
2022-10-12 15:01   ` ( via Guix-patches via
2022-10-13  1:02     ` Matthew James Kraai [this message]
2022-10-13  6:11       ` ( via Guix-patches via
2022-10-21  3:38       ` Matthew James Kraai
2022-10-23 13:07         ` bug#58408: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Y0djtcxbw+WK8B+l@carlo \
    --to=kraai@ftbfs.org \
    --cc=58408@debbugs.gnu.org \
    --cc=paren@disroot.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).