From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gE5sM824dmCABwAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:41:33 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sHQ1Lc24dmAIcAAAbx9fmQ (envelope-from ) for ; Wed, 14 Apr 2021 09:41:33 +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 13F1523336 for ; Wed, 14 Apr 2021 11:41:33 +0200 (CEST) Received: from localhost ([::1]:39954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbt-0006m7-8I for larch@yhetil.org; Wed, 14 Apr 2021 05:14:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb4-0005R0-71 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50223) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb3-00023u-Vg 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 1lWbb3-0007EE-R0 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 08/37] gnu: Add ocaml-stdio. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14: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: 47768@debbugs.gnu.org Cc: pukkamustard Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160827330 (code B ref 47768); Wed, 14 Apr 2021 09:14:05 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:28 +0000 Received: from localhost ([127.0.0.1]:33419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaR-00076V-1v for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:27 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48591) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaN-00074Y-Pa for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:24 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EFEC8240100 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391598; bh=mR20YkVLXsM/jjoa7vVRKP+aJH/GwEBogKW1gHIbf1s=; h=From:To:Cc:Subject:Date:From; b=CwufotxsiWgQo3tDu0+HGBdVo6B3YeFpeK+P12YGxSjUctdPDcy0+7iLoY+7qNou+ RRWTnhSphV/CVPfcrjy4Iz4NVzBJkYusMO1ycw9aYhyUs4n/sDYCEuabIhl971QjrS CCKsr2ScohFEK7/R8FHGm7XSN9W31iHELfaKbYKwSYlLqboT04ii6YcIPcklI3v0qF 7mtHojxEXejXaxWJgrzPIQSyvqSckx+8aIlNR/q5t3nu/feW9qC/dQNnpxBTgzz+Fm CoCpGFaF6HDGXifTau6l16bf764RqO2DpKqA995a1mnQbvlrCPigju70RKqW/3AKHL appS7m5wzXI3A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbK0bm5z9rxk; Wed, 14 Apr 2021 11:13:17 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:34 +0200 Message-Id: <20210414091303.6990-8-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=1618393293; 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=ykSCZ6PCgTYhqLd3TJN5G+SAYNKrxl6+jL0KAQCbx0k=; b=S8IrNaG0etuu+6IHAENwKRVxyIrhggk1GL1AqVhiafpOG+JNhlUOz8lHGNUCm50+l4N3ZV bZCpQ0PtjVyLdMDdZ+7H4C3SWm0/YUkAdKOwG9g1Bx01ylVAK4G3f9mjcB/k2MmpZOJUYD NhRh5vGHLpjUfbba/lEGCzj7yEww5ElMjMuJuNKEnpPr3XsoFwUNw+V4Dr7bHo1MOWnIYI WZyZBMqR4t3kHJEMKepi0+Opr95vHYyJaPtMilIU//BEPQWBXqx0mcsr+bCX+4JxoAC+05 aSojjEnQzcnOL9sD2lqSyfwgyaDRi/iOW6DGToHK1uMwRq/2XXJpiGYZt97oyA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618393293; a=rsa-sha256; cv=none; b=cc/lR+JIroOV1MH7N7PkCDLVnQLl+5tgFd++hjR2S4oH0EKPEEeLMEckdg6aEx4FsgWjMZ CrPRUFSZx1mmfj1DqZTv/irAmJwnQoJS39AWWleLC6q1sVu2fJEeLpbKAWMI6EOHUD47Si /fAtb/VedwqSI9x9UgSyQSNzk8ByMreffMS+dAX8onAQHB8Sh+GFoSs9of0rN4UZ7oSyJh G9BUvDVXfY0iuT4Qv5HgWZ6Of2s99UJG/l+07Dx1Y4RsmYpNbir6z5+OCcbh+Dk9F9U7nB zk5BEuKceNakhtwFSoPyN3Ce01NPKXbUeH6GWJi10+4wcQzPJZpxatAHp4x9mQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=Cwufotxs; 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=Cwufotxs; 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: 13F1523336 X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: mN5hYKkILgt9 * gnu/packages/ocaml.scm (ocaml-stdio): New variable. (ocaml4.07-stdio): Inherit from ocaml-stdio. --- gnu/packages/ocaml.scm | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43a3bc1d40..03bcb3d351 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1978,7 +1978,7 @@ library.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite))) @@ -4086,7 +4086,7 @@ syntax checking on dedukti files.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") @@ -4429,7 +4429,7 @@ Atom.") `(("gsl" ,gsl))) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description @@ -4714,30 +4714,20 @@ 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-stdio +(define-public ocaml-stdio (package - (name "ocaml4.07-stdio") - (version "0.11.0") + (name "ocaml-stdio") + (version "0.14.0") (home-page "https://github.com/janestreet/stdio") (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append home-page ".git")) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn")))) + (janestreet-origin "stdio" version + "1hj5hraprqy2i90a690l11yjszvb99j818q3d684ryx6p2lddk0l")) (build-system dune-build-system) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) - (arguments - `(#:tests? #f ;no tests - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-base" ,ocaml-base) + ("ocaml-sexplib0" ,ocaml-sexplib0))) + (arguments `(#:tests? #f)) ;no tests + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It @@ -4745,6 +4735,16 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) +(define-public ocaml4.07-stdio + (package-with-ocaml4.07 + (package + (inherit ocaml-stdio) + (version "0.11.0") + (source + (janestreet-origin "stdio" version + "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9")) + (properties '())))) + (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers") @@ -4794,7 +4794,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments @@ -5422,7 +5422,7 @@ else expression.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") @@ -5551,7 +5551,7 @@ useful errors on failure.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib) @@ -5827,7 +5827,7 @@ various Jane Street packages.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") (description "Configurator is a small library that helps writing OCaml @@ -5920,7 +5920,7 @@ thousands of times faster than fork. ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) @@ -5967,7 +5967,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random) - ("ocaml-stdio" ,ocaml4.07-stdio) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" @@ -6251,7 +6251,7 @@ library FFTW.") `(("openblas" ,openblas) ("lapack" ,lapack) ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-stdio" ,ocaml4.07-stdio))) + ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK") -- 2.31.1