guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: skopeo: Build documentation.


From: guix-commits
Subject: branch master updated: gnu: skopeo: Build documentation.
Date: Wed, 04 Nov 2020 08:09:22 -0500

This is an automated email from the git hooks/post-receive script.

jlicht pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new b457837  gnu: skopeo: Build documentation.
b457837 is described below

commit b4578379e57b59d90c6056b7c241109062c0c2a8
Author: Jelle Licht <jlicht@fsfe.org>
AuthorDate: Wed Nov 4 13:18:46 2020 +0100

    gnu: skopeo: Build documentation.
    
    * gnu/packages/virtualization.scm (skopeo)[native-inputs]: Add
    go-github-com-go-md2man.
    [arguments]<phases>{build-docs}: New phase.
    {install}: Update make target to install manpages. Install example
    configuration.
---
 gnu/packages/virtualization.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index ac062df..b20fb70 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1606,7 +1606,8 @@ Open Container Initiative (OCI) image layout and its 
tagged images.")
                 "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"))))
     (build-system go-build-system)
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("go-github-com-go-md2man" ,go-github-com-go-md2man)))
     (inputs
      `(("btrfs-progs" ,btrfs-progs)
        ("eudev" ,eudev)
@@ -1625,13 +1626,18 @@ Open Container Initiative (OCI) image layout and its 
tagged images.")
          (replace 'build
            (lambda* (#:key import-path #:allow-other-keys)
              (with-directory-excursion (string-append "src/" import-path)
-               ;; TODO: build manpages with 'go-md2man'.
                (invoke "make" "bin/skopeo"))))
+         (add-after 'build 'build-docs
+           (lambda* (#:key import-path #:allow-other-keys)
+             (with-directory-excursion (string-append "src/" import-path)
+               (invoke "make" "docs"))))
          (replace 'install
            (lambda* (#:key import-path outputs #:allow-other-keys)
              (with-directory-excursion (string-append "src/" import-path)
                (let ((out (assoc-ref outputs "out")))
-                 (invoke "make" "install-binary" "install-completions"
+                 (install-file "default-policy.json"
+                               (string-append out "/etc/containers"))
+                 (invoke "make" "install-binary" "install-completions" 
"install-docs"
                          (string-append "PREFIX=" out)))))))))
     (home-page "https://github.com/containers/skopeo";)
     (synopsis "Interact with container images and container image registries")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]