From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QH7BNPWiE2ELCgEAgWs5BA (envelope-from ) for ; Wed, 11 Aug 2021 12:14:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GDQkMPWiE2GycgAAbx9fmQ (envelope-from ) for ; Wed, 11 Aug 2021 10:14:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 872791C0DD for ; Wed, 11 Aug 2021 12:14:13 +0200 (CEST) Received: from localhost ([::1]:39072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDlFU-0006a7-Fl for larch@yhetil.org; Wed, 11 Aug 2021 06:14:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDlFK-0006Ue-PX for guix-patches@gnu.org; Wed, 11 Aug 2021 06:14:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDlFK-0005ZX-Io for guix-patches@gnu.org; Wed, 11 Aug 2021 06:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDlFK-0007Eu-BO for guix-patches@gnu.org; Wed, 11 Aug 2021 06:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49823] [PATCH] gnu: Add jsonnet. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Aug 2021 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 49823@debbugs.gnu.org, Leo Prikler , Maxime Devos Received: via spool by 49823-submit@debbugs.gnu.org id=B49823.162867679427753 (code B ref 49823); Wed, 11 Aug 2021 10:14:02 +0000 Received: (at 49823) by debbugs.gnu.org; 11 Aug 2021 10:13:14 +0000 Received: from localhost ([127.0.0.1]:33502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDlEY-0007DY-8l for submit@debbugs.gnu.org; Wed, 11 Aug 2021 06:13:14 -0400 Received: from planete-kraus.eu ([89.234.140.182]:39116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDlEU-0007DI-Rq for 49823@debbugs.gnu.org; Wed, 11 Aug 2021 06:13:12 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id afe7dce0; Wed, 11 Aug 2021 10:13:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= references:from:to:cc:subject:in-reply-to:date:message-id :mime-version:content-type; s=*; bh=yGrV8R4C7hcQxuW5eLlKBTtj5/Q=; b= eI24gY0DJcyuHOmhhAh7UcqHbIw/P0OL1+tV8bw0XP1r/VV0HWkSlDjab7mOGWPe M7WXHmp7c61VfSWenFm0WV05Y3zZ4hUzocyJnFQrx7qKevFVLkcTQM/Tt+s79IIt ORB7MwiDoNhg/98zuA0Sd7Ry3j9rFhNkbpDZbFRpS90= Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id bd20a32a (TLSv1.3:AEAD-CHACHA20-POLY1305-SHA256:256:NO); Wed, 11 Aug 2021 10:12:55 +0000 (UTC) References: <71fbbaa57a2c1dba8f0d956ea162c2e15d332e0c.camel@planete-kraus.eu> <878s19sbgf.fsf@gnu.org> <874kbx2x3e.fsf@planete-kraus.eu> <87k0kspan5.fsf@gnu.org> User-agent: mu4e 1.4.15; emacs 27.2 In-reply-to: <87k0kspan5.fsf@gnu.org> Date: Wed, 11 Aug 2021 12:12:46 +0200 Message-ID: <87y2981e8x.fsf@planete-kraus.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches From: Vivien Kraus via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628676853; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=7Oj7tOdic8VImxstUKn3Hm2cZwU3J58EsSLQAQbxP3E=; b=oHZ+Wn+Wb8KdW24l8sgo1lBmbCgRlcRcquSmLmReRIXWv7PodPhlFWLTKOUl6EKcddt8C0 lxnKISlcuXq7Ss1zq8yKpoGDjkZ1wl+3M+D0EmVjo9V/a/e53kb4jVG85JbXqYgERC7MJE 6IEKSF2SVFgxxarqby3W0ik7qHnJHgYRJCl4g9yMih2gWHADXFnw5TzD02uCRHmPaeGwLZ Ci9k3RvZ4rlTz0FD3W4XTZEvqVhWK+1a/23CNToWm2B5uuBVhezgiZgGjw5uuxEuVFMOe8 KYR+HWz18ut7IFYFxcq1KLCuzJSQ8V4+mc+iZHGLZDBnyuM+JbB+Hfr2ePM1GA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628676853; a=rsa-sha256; cv=none; b=daOP9ftVkt/nvWFK6GV38opxX90DbNx4/2E3zt9CpTl3eu22MwuQHvtHyJqYiuhcY57lZF vYnVhIOTHVEE1PB3zQFqa14vqojCyyqTSNXOshYZV/MAE0PK4PBWsbSHyiUDUM3tejDRwN e6sl5RvQqCZ5YKP+oHYv53O+eoPRE0WHGRV5B/blyMB2mbvzHdbml1PLkQit7yky1jWB12 oiRZroKl8Jtj/gK5O0hcQL1K2yp4TjxDRKh80EXP/YT0H9ZJKbBY2aTVVUZASipZ8ecUb5 /UI2L6BVs+ejlqgj590v55S/F745ZAs1XIjzKYrRpneyRW3JQGBMwdSCHlXFXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.91 Authentication-Results: aspmx1.migadu.com; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 872791C0DD X-Spam-Score: -2.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: U3o/8Zf8PZ3O --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: >> OK. Should I keep the bundled MD5 implementation then? > > Yeah, I think so. Clearly it=E2=80=99s a gray area, there are pros and c= ons, > but I=E2=80=99d lean towards minimal changes to upstream source. Here you go :) --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-jsonnet.patch Content-Description: jsonnet with the bundled md5 code >From 8ce461001ed14c3267d839334e4853feaed69b50 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 2 Aug 2021 16:07:08 +0200 Subject: [PATCH] gnu: Add jsonnet. * gnu/packages/cpp.scm (jsonnet): New variable. --- gnu/packages/cpp.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 42e9d50687..870c02dac3 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -45,6 +45,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix modules) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -1211,3 +1212,43 @@ of reading and writing XML.") ;; incompatible with the GPL v2. Refer to the file named FLOSSE for the ;; details. (license license:gpl2+))) + +(define-public jsonnet + (package + (name "jsonnet") + (version "0.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/jsonnet") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim")) + (modules '((guix build utils))) + (snippet + #~(begin + (rename-file "third_party/md5" ".md5") + (delete-file-recursively "third_party") + (delete-file-recursively "doc/third_party") + (substitute* + '("core/vm.cpp") + (("#include \"json.hpp\"") "#include ")) + (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))) + (inputs + `(("json-modern-cxx" ,json-modern-cxx))) + (home-page "https://jsonnet.org/") + (synopsis "Data templating language") + (description "Jsonnet is a templating language extending JSON +syntax with variables, conditions, functions and more.") + (license license:asl2.0))) -- 2.32.0 --=-=-=--