all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Tobias Geerinckx-Rice via Guix-patches via <guix-patches@gnu.org>
To: 39574-done@debbugs.gnu.org
Subject: bug#39574: [PATCH] gnu: Add libcyaml.
Date: Thu, 13 Feb 2020 00:56:07 +0100	[thread overview]
Message-ID: <87y2t7e4x4.fsf@nckx> (raw)
In-Reply-To: <5794eac4fb9ef5e9215527c24cecfb7fc362d6a7.camel@zrythm.org>


[-- Attachment #1.1: Type: text/plain, Size: 168 bytes --]

Alexandros,

Pushed as eb642f3d247ee0c74122017354c57bdce028eb57, with the 
indentation tweaks below (C-M-q in emacs, and moving the comment 
in-line).

Thanks!

T G-R


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: Type: text/patch, Size: 2041 bytes --]

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 18e392f857..7f67dd764e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1441,15 +1441,14 @@ hash/signatures.")
     (name "libcyaml")
     (version "1.0.1")
     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/tlsa/libcyaml.git")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-          (base32
-            "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/tlsa/libcyaml.git")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0h5ydyqdl8kzh526np3jsi0pm7ks16nh1hjkdsjcd6pacw7y6i6z"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags
@@ -1457,20 +1456,19 @@ hash/signatures.")
              (string-append "CC=gcc"))
        #:phases
        (modify-phases %standard-phases
-         ;; no configure script
-         (delete 'configure)
+         (delete 'configure)            ; no configure script
          (replace 'check
            (lambda _
              (setenv "CC" "gcc")
              (invoke "make" "test"))))))
     (inputs
-      `(("libyaml" ,libyaml)))
+     `(("libyaml" ,libyaml)))
     (native-inputs
-      `(("pkg-config", pkg-config)
-        ("git", git)))
+     `(("git", git)
+       ("pkg-config", pkg-config)))
     (synopsis "C library for reading and writing YAML")
     (description
-      "LibCYAML is a C library written in ISO C11 for reading and writing
+     "LibCYAML is a C library written in ISO C11 for reading and writing
 structured YAML documents.  The fundamental idea behind CYAML is to allow
 applications to construct schemas which describe both the permissible
 structure of the YAML documents to read/write, and the C data structure(s)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

      reply	other threads:[~2020-02-12 23:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-12 12:55 [bug#39574] [PATCH] gnu: Add libcyaml Alexandros Theodotou
2020-02-12 23:56 ` Tobias Geerinckx-Rice via Guix-patches via [this message]

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

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

  git send-email \
    --in-reply-to=87y2t7e4x4.fsf@nckx \
    --to=guix-patches@gnu.org \
    --cc=39574-done@debbugs.gnu.org \
    --cc=me@tobias.gr \
    /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 external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.