From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MC24Dcy3dmA9BQAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:37:16 +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 IKt8CMy3dmB6bAAAbx9fmQ (envelope-from ) for ; Wed, 14 Apr 2021 09:37:16 +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 D524A23936 for ; Wed, 14 Apr 2021 11:16:13 +0200 (CEST) Received: from localhost ([::1]:42830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbd7-00084B-1D for larch@yhetil.org; Wed, 14 Apr 2021 05:16:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbE-0005hm-4C for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbA-0002Ab-Lr for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbA-0007GJ-H2 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 28/37] gnu: Add ocaml-fieldslib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163827634 (code B ref 47768); Wed, 14 Apr 2021 09:14:12 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:58 +0000 Received: from localhost ([127.0.0.1]:33505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaw-0007BY-Bb for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:52061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaW-000759-TT for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5CC682400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391612; bh=yCb4qHzYZrC5lK9A57Jr7nAu7j7Fek0nUa1Y0NPTo4w=; h=From:To:Cc:Subject:Date:From; b=IrJG89V3wTJk7U08nusHQp7aZZmCleZ+kybNqbdO01JmzPERqmXPMw1KrUOLP0Zy9 0koJWHFqcegzp7XkLypIaP/irHmrO8eKWPBRAmJomju6d7ygV4RnNraO+XiqjaMEg9 Uub4Rb6zk+Uklnoif+35k/emBPnQI294qZBCr3RgxY+N+3bC8ilNxSMwtCyTfq7D51 /GoaxFOBKrIN+1alkDTU4cTwe1k8z0SY3lTxOXnyXVtsmaP6RxskSTv7X42WDC5cEv IwU+OWoZQK7X5BCrYSEzg9hLH6Q23lM3vrgazj0iGbUBdSdFis3Mg5DRD0sQgppvEy mwhAV3EM6POgA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbb60y4z9rxP; Wed, 14 Apr 2021 11:13:31 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:54 +0200 Message-Id: <20210414091303.6990-28-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618391774; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: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=rY9c+dl0Bo3lw2OGTQd1Mgh4FGSlbYIstqClxIWkY40=; b=Wskm+VX49s7AHwrxr4GOH8zPqP/IMT5p/ricU++/GGCnUej6lsSLn07w2oP78O/CJMj2i7 NQ6tXvry6p3M1oPxIFkP9A5JEEMhD44CQcPZiVqPOkrHVFCtZB/6HSXbHg0MaoEGVxQmI+ 1cw30gKNKdJ1/JQPB+AXX35ZK9sk3ZbHS/xClv6ElYq9lqtwAT7dDyBnISD7yoE9FpLvqr AoK45kHqJSp9p4+CQjrlL/25x/7IZ4VgT9CcpGuKiR4W/PDP29cmjl0MXcS5iKqOyXJm7r B4aVvTOR3gnSs+IimlotTu+pTo0KwTaZjsYnokkQTCNeOdOCCPhIzzzSMkOaNg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618391774; a=rsa-sha256; cv=none; b=se6c833Vs5D3yMlsWSaB280p7sB75Pl+F5nwx2I802RZTWdXj+OMAuw4IsJCY4d1/YTvat vbHWWJ49sirxzzpO5mFEjfhqe9A4kGy2fu0Z9JRLzH1evcu6fuaFfPwBPvW7IjMsG0m2su drt9584aQx7NC8li1Qpb11xO0ftRLk6P/1mUENeu7EiT1BdBpJv49dFkywCTzah8Fg5fFq Dr5gd9bOdW96YY4ACovgCjemURG+kWFO6+v8KX0zEOsUhQzkAWye4JzfP40bxN0y0T41PS N65Ej0KXxn6ux1A4o3qGq+DhGaIshYjcSQZTaVP6kJ1UUy+O1CH7pE82mXLurA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=IrJG89V3; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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: 3.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=IrJG89V3; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); 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: D524A23936 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: CzW6g3xpGNsE * gnu/packages/ocaml.scm (ocaml-fieldslib): New variable. (ocaml4.07-fieldslib): Inherit from ocaml-fieldslib. --- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b4640037f5..6415e27ff9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4987,31 +4987,21 @@ by making sure that you only compare comparable values.") "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) (properties `((upstream-name . "ppx_compare")))))) -(define-public ocaml4.07-fieldslib +(define-public ocaml-fieldslib (package - (name "ocaml4.07-fieldslib") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) "/files/" - "fieldslib-v" version ".tar.gz")) - (sha256 - (base32 - "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")))) + (name "ocaml-fieldslib") + (version "0.14.0") + (source (janestreet-origin + "fieldslib" version + "10n5y376fb5jgqk9h8vq158rm1b36h9lzh6p11q33h6xgvb1v6n3")) (build-system dune-build-system) - (arguments - ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + (arguments `(#:tests? #f)) ; No tests (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "fieldslib"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "fieldslib") + (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing @@ -5019,6 +5009,16 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-fieldslib + (package-with-ocaml4.07 + (package + (inherit ocaml-fieldslib) + (version "0.11.0") + (source (janestreet-origin + "fieldslib" version + "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) + (properties `((upstream-name . "fieldslib")))))) + (define-public ocaml4.07-variantslib (package (name "ocaml4.07-variantslib") @@ -5065,7 +5065,7 @@ standard library.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-fieldslib" ,ocaml4.07-fieldslib) + ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) @@ -6161,7 +6161,7 @@ standard library that was developed by Jane Street.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator) - ("ocaml-fieldslib" ,ocaml4.07-fieldslib) + ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) -- 2.31.1