diff mbox series

[bug#58408] gnu: Add doctl.

Message ID Y0djtcxbw+WK8B+l@carlo
State New
Headers show
Series [bug#58408] gnu: Add doctl. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Matthew James Kraai Oct. 13, 2022, 1:02 a.m. UTC 
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?

Comments

\( Oct. 13, 2022, 6:11 a.m. UTC | #1 
All LGTM now :)

    -- (
diff mbox series

Patch

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)))