From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCsoV-0005vM-1s for guix-patches@gnu.org; Wed, 17 Oct 2018 16:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCsoQ-0006tR-V9 for guix-patches@gnu.org; Wed, 17 Oct 2018 16:53:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCsoQ-0006tH-Qh for guix-patches@gnu.org; Wed, 17 Oct 2018 16:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gCsoP-0007Nh-To for guix-patches@gnu.org; Wed, 17 Oct 2018 16:53:02 -0400 Subject: [bug#33079] [PATCH 32/34] gnu: Fix ocaml-topkg. Resent-Message-ID: From: Julien Lepiller Date: Wed, 17 Oct 2018 22:34:40 +0200 Message-Id: <20181017203442.7075-32-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-topkg)[native-inputs]: Add ocamlbuild. (ocaml4.02-topkg): 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 591a63aa1..fc5fbc3f2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1725,7 +1725,8 @@ defined in this library.") "18rrh6fmf708z7dd30amljmcgaypj3kk49jrmrj68r4wnw8004j8")))) (build-system ocaml-build-system) (native-inputs - `(("opam" ,opam))) + `(("opam" ,opam) + ("ocamlbuild" ,ocamlbuild))) (propagated-inputs `(("result" ,ocaml-result))) (arguments @@ -1741,6 +1742,9 @@ provides an API to describe the files a package installs in a given build configuration and to specify information about the package's distribution, creation and publication procedures.") (license license:isc))) + +(define-public ocaml4.02-topkg + (package-with-ocaml4.02 ocaml-topkg)) (define-public ocaml-rresult (package -- 2.18.0