From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iPEDI8yXtmCPBgEAgWs5BA (envelope-from ) for ; Tue, 01 Jun 2021 22:25:48 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id WG5NHsyXtmDmewAAB5/wlQ (envelope-from ) for ; Tue, 01 Jun 2021 20:25:48 +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 4553E24AEE for ; Tue, 1 Jun 2021 22:25:48 +0200 (CEST) Received: from localhost ([::1]:57686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAxP-0001Fp-9L for larch@yhetil.org; Tue, 01 Jun 2021 16:25:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAwk-0007uu-AL for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54547) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAwk-0000B0-2i for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAwj-0006ta-Va for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 09/42] gnu: Add ocaml-compiler-libs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:25:05 +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: Xinglu Chen Cc: pukkamustard , 47768@debbugs.gnu.org Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.162257907826261 (code B ref 47768); Tue, 01 Jun 2021 20:25:05 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:38 +0000 Received: from localhost ([127.0.0.1]:37809 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwH-0006pV-Kl for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49907) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwF-0006ov-Hx for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EDD922400FD for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579070; bh=mLbSJlGWP8R5rhy02/K7Axi7kXW+e2NVAxHaxTDSc4E=; h=From:To:Cc:Subject:Date:From; b=GT2PODNu3JgUKUsB560SSWvIbSPbaFKDpj9sDNhmEaMjqopkQsviq/D43D+jnvS1L phNhelGG82HhsvzxmARGNeXp1mednPBJ7DW8thweutciSYOADlc+ypP6P8sRLHtV/B YE9uUngDwqhh2CByfHcGeWYQyCnQcqM5SoyiVWo2Vlb6dBekrPhGU7cNVj0tGsNIFY xP3/1Sg/2JO3gtKFYQJ42l3rWzKAmpJYuDmBegXbvQJkAf1DIjkOzDtuMmzlMZ9cW4 ee69NHnW0shnEBG8QU06FImei9dbwNl4k3dXMr/Q/fNQiKwrZpUec9gfcaVg0NeVX3 kI5/QUHkH4ayg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkCb3qrKz9rxD; Tue, 1 Jun 2021 22:24:27 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:22:52 +0000 Message-Id: <20210601202325.8777-10-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> 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=1622579148; 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=ELKKuMZQd1bwbk8PT7E12Fbtk1PfyS0z+I7YbWXB4TI=; b=spbxRnMpmXEHrBhhsdEoy+IHASYZ1xPOQ9L2jZMm9t2vSjXKMLZLNkhzKbwN2NQx1fafLa 3Lj+bxdTdZJ+/kn7g32zliYkZ+c4mu3akxajcLA5N5xJDeBmb+4NTuzZou8L9emCKQwZW0 Rrg/GAt/i7igKO1pwNZxflhgzYGujz1zlZWiQwtJ6gG4sREplnQSU7pTxRkJHzeD878zA3 oFnxJiPZrgLYK0FE7TnkngwiAqzfycJhVSwf39HUXCrm3ecighxcb7BsVYGSzuLJNVxg0D akhoJ3uRxpXXwiOHQRrewET73slfLoh6Jip2vzT9z61VaeNLgld2ovLgKHb/iA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622579148; a=rsa-sha256; cv=none; b=ZwTmrmU1VE4mvuuAh34o8GqEoQ28h2tE8XBd3kp8qUEYLKqte8sL0wOPgBCPbZtaZBOSzT hOMjxJNJYiymfFp49c6lljnRzCvPLfS4FpuHveAMK6HWCk2PyLGmzlxf7iWpq7yh7s/vep gU24rqkrUr1kuFobeiC0KbGhwJIt8gkqWMJfsEfZguSzbJDOaA7mLaqhEsCvDOjIG1SQtv oLSHW7nQ3yW2I1tAEQ6Dww8v/uXHj7by3fEIz5ySXhKIIFRrN9JbK/hG0VcjF0Ug67Q4XS mcLUsy1ZTqnsLAhbcUS5wiFoz4f+ZO0LQW8uG7oBLdaP2DYsSvig6xf88C7UaQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=GT2PODNu; 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.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=GT2PODNu; 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: 4553E24AEE X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: JjGrxBXje222 * 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 95407de74d..93cfa8f54b 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