all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: Vivien Kraus <vivien@planete-kraus.eu>
Cc: 49823-done@debbugs.gnu.org, Maxime Devos <maximedevos@telenet.be>,
	Leo Prikler <leo.prikler@student.tugraz.at>
Subject: bug#49823: [PATCH] gnu: Add jsonnet.
Date: Thu, 12 Aug 2021 09:53:53 +0200	[thread overview]
Message-ID: <87im0bhze6.fsf@gnu.org> (raw)
In-Reply-To: <87y2981e8x.fsf@planete-kraus.eu> (Vivien Kraus's message of "Wed, 11 Aug 2021 12:12:46 +0200")

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

Hi Vivien,

Vivien Kraus <vivien@planete-kraus.eu> skribis:

> From 8ce461001ed14c3267d839334e4853feaed69b50 Mon Sep 17 00:00:00 2001
> From: Vivien Kraus <vivien@planete-kraus.eu>
> Date: Mon, 2 Aug 2021 16:07:08 +0200
> Subject: [PATCH] gnu: Add jsonnet.
>
> * gnu/packages/cpp.scm (jsonnet): New variable.

Applied with the tweak below.

Thank you, and thanks for taking the time for the extra work!

Ludo’.


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

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 870c02dac3..8c8109fb83 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1232,16 +1232,13 @@ of reading and writing XML.")
             (rename-file "third_party/md5" ".md5")
             (delete-file-recursively "third_party")
             (delete-file-recursively "doc/third_party")
-            (substitute*
-                '("core/vm.cpp")
+            (substitute* '("core/vm.cpp")
               (("#include \"json.hpp\"") "#include <nlohmann/json.hpp>"))
             (mkdir "third_party")
             (rename-file ".md5" "third_party/md5")))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DUSE_SYSTEM_GTEST=ON" "-DUSE_SYSTEM_JSON=ON")))
-    (propagated-inputs
-     '())
     (native-inputs
      `(("googletest" ,googletest)
        ("pkg-config" ,pkg-config)))

      reply	other threads:[~2021-08-12  7:55 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02 15:01 [bug#49823] [PATCH] gnu: Add jsonnet Vivien Kraus via Guix-patches via
2021-08-02 16:15 ` [bug#49823] Using texinfo for the description Vivien Kraus via Guix-patches via
2021-08-02 16:35   ` Maxime Devos
2021-08-02 17:09     ` Vivien Kraus via Guix-patches via
2021-08-02 17:52       ` Leo Prikler
2021-08-02 23:21         ` Vivien Kraus via Guix-patches via
2021-08-10 12:58 ` [bug#49823] [PATCH] gnu: Add jsonnet Ludovic Courtès
2021-08-10 14:28   ` Vivien Kraus via Guix-patches via
2021-08-11  9:56     ` Ludovic Courtès
2021-08-11 10:12       ` Vivien Kraus via Guix-patches via
2021-08-12  7:53         ` Ludovic Courtès [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=87im0bhze6.fsf@gnu.org \
    --to=ludo@gnu.org \
    --cc=49823-done@debbugs.gnu.org \
    --cc=leo.prikler@student.tugraz.at \
    --cc=maximedevos@telenet.be \
    --cc=vivien@planete-kraus.eu \
    /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.