From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mGUGJAW6dmBREgAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:46:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 8NsGHgW6dmAVRAAA1q6Kng (envelope-from ) for ; Wed, 14 Apr 2021 09:46:45 +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 2D45E24262 for ; Wed, 14 Apr 2021 11:46:45 +0200 (CEST) Received: from localhost ([::1]:38240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbf-0005ub-UY for larch@yhetil.org; Wed, 14 Apr 2021 05:14:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb4-0005S7-Kj for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb4-000243-Bz for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb4-0007EL-7F for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 09/37] gnu: Add ocaml-compiler-libs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:06 +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.161839160927349 (code B ref 47768); Wed, 14 Apr 2021 09:14:06 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:29 +0000 Received: from localhost ([127.0.0.1]:33425 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-00076k-Vn for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:37688) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaO-00074e-AY for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 6F3AF1A022C for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391598; bh=xQpzw1BQgopjwyhCNkmnIe/4TUFW58sFoLOp2bZ3V9A=; h=From:To:Cc:Subject:Date:From; b=R7mXriIuDQYn0D9o8jDjI1FXVI46oU3wWnKdqQAJSS9zhKq+D+gGedxmvL0ZofHNB ffSl9adh9TXBwsNWAVpyi1H/A1MDceG2A8iBW/0qxDZLAIl4qekMkyIKCBeaLqrVRZ MEI1GkskyhksOoAMrtN4ljrPkNiZ6lWAPjWOpyqO+Uzq0JAlQv+k9pDnZld0CCQEjm mRw+PrkcujPgbZpvvFbsUxmK9EsUWjNOvF6cbl81s3Nr/lMObTCv3mQe+uRHKYx5m7 hnr+uKUy72agpt4riDMZhsgETq3+GWKSjTRy36JoG9nSZFY0tMVoNgLQeHi9hjOirY mQ64R97hYa9Pw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbK6DJsz9rxr; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:35 +0200 Message-Id: <20210414091303.6990-9-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=1618393605; 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=GZZESVAWSW53Us+TfxRJTtryRO72/6Sf4Ei3rglTIRk=; b=CM6k+JXK/zbAOjtP5vVgpRFvMMxaaeOGrkssb8f203aeFkcwZhZ7oz/eSdrxwhrRiKL0zn wJOEJwEZQBaDU0MnD/HYUXoHUhTgVNQglOchlIY30/uyKRLgJNUrSxkjBkDjTI8uQ1KF3w fwr6JCyuxeaEqn/VjWVU3DJf0EX/lK0i20FAyj6kDOiZCibSDSqUXa9p0ecyOJH34yw4Zg D7rcZ5UK+wsyPFIgGn6XVKI8LFs2L4annGM7Z6K0Pz109PrIdPXB8rCTqdPGZCANmxicYK amHmdn1NncL35vl/ce3BsgPTchOujiQjdAByDTe3FmqvFFMGAfCrtBssSSevuA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618393605; a=rsa-sha256; cv=none; b=jgXC6wOWK3HdpjaAxewxrufmBwqORClZ3R4gooJFnyzxinlCyudl8JCCQCA6FcSrz55tAe buer3ZvBVXlJ5vpD+2NoDvXt+cDQ8oSMM2o5vBJqsByyye+RhRCX054s6cZn04Jk+ExOls /qo9/5x68XZWUSyGq4LDV5tb0IM3OX0r6KeEslvBntrfeJSM+Tph+VeevQMk0YEOwHvaA5 ntRd1ZrVj5xPNAea/W2wwhBngIQaFIO6W69qzX25M0NdcPEYP7+85gBCa8JbCdf817X68f +XD1FzVQI+AqJtkfi11KgQP/C99Qd2TFCCEHU4N0XQXZzVnJ7IQL5jGoIzOaIQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=R7mXriIu; 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=R7mXriIu; 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: 2D45E24262 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3YOx1BfCVPbp * gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable. (ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs. --- gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 03bcb3d351..1f47fc4de3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4084,7 +4084,7 @@ syntax checking on dedukti files.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -4686,34 +4686,50 @@ provided by companion libraries such as #:dune ,ocaml4.07-dune)) (properties '())))) -(define-public ocaml4.07-compiler-libs +(define-public ocaml-compiler-libs (package - (name "ocaml4.07-compiler-libs") - (version "0.11.0") + (name "ocaml-compiler-libs") + (version "0.12.3") (home-page "https://github.com/janestreet/ocaml-compiler-libs") (source (origin (method git-fetch) (uri (git-reference - (url (string-append home-page ".git")) + (url home-page) (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5")))) (build-system dune-build-system) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "ocaml-compiler-libs"))) + (arguments `(#:tests? #f)) ;no tests + (properties `((upstream-name . "ocaml-compiler-libs") + (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs)))) (synopsis "Compiler libraries repackaged") (description "This package simply repackages the OCaml compiler libraries so they don't expose everything at toplevel. For instance, @code{Ast_helper} is now @code{Ocaml_common.Ast_helper}.") (license license:expat))) +(define-public ocaml4.07-compiler-libs + (package-with-ocaml4.07 + (package + (inherit ocaml-compiler-libs) + (name "ocaml-compiler-libs") + (version "0.11.0") + (home-page "https://github.com/janestreet/ocaml-compiler-libs") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s")))) + (properties `((upstream-name . "ocaml-compiler-libs")))))) + (define-public ocaml-stdio (package (name "ocaml-stdio") @@ -4790,7 +4806,7 @@ as part of the same ocaml-migrate-parsetree driver.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) + ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) -- 2.31.1