From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCsYX-0007a6-5E for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCsYN-0003SB-Vs for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:35 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51572) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCsYC-0003Ka-0F for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gCsYB-0006vI-Sy for guix-patches@gnu.org; Wed, 17 Oct 2018 16:36:15 -0400 Subject: [bug#33079] [PATCH 33/34] gnu: Fix ocaml-rresult. Resent-Message-ID: From: Julien Lepiller Date: Wed, 17 Oct 2018 22:34:41 +0200 Message-Id: <20181017203442.7075-33-julien@lepiller.eu> In-Reply-To: <20181017203442.7075-1-julien@lepiller.eu> References: <20181017223130.775b25fc@lepiller.eu> <20181017203442.7075-1-julien@lepiller.eu> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33079@debbugs.gnu.org * gnu/packages/ocaml.scm (ocaml-rresult)[native-inputs]: Add ocamlbuild. (ocaml4.02-rresult): New variable. --- gnu/packages/ocaml.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fc5fbc3f2..36e034889 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1759,7 +1759,8 @@ creation and publication procedures.") "1xxycxhdhaq8p9vhwi93s2mlxjwgm44fcxybx5vghzgbankz9yhm")))) (build-system ocaml-build-system) (native-inputs - `(("opam" ,opam))) + `(("opam" ,opam) + ("ocamlbuild" ,ocamlbuild))) (propagated-inputs `(("topkg" ,ocaml-topkg))) (arguments @@ -1775,6 +1776,9 @@ declarative manner, without resorting to exceptions. It defines combinators to operate on the result type available from OCaml 4.03 in the standard library.") (license license:isc))) + +(define-public ocaml4.02-rresult + (package-with-ocaml4.02 ocaml-rresult)) (define-public ocaml-sqlite3 (package -- 2.18.0