From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Lepiller Subject: Re: [PATCH 09/10] gnu: Add ocaml-js-build-tools. Date: Mon, 30 Jan 2017 22:08:50 +0100 Message-ID: <20170130220850.77b8e4a4@lepiller.eu> References: <20170127221228.4370-1-julien@lepiller.eu> <20170127221228.4370-10-julien@lepiller.eu> <87inowgawq.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/RxrNKF/QJTbMspqTc8dR+wF" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYKK2-0006JT-9G for guix-devel@gnu.org; Mon, 30 Jan 2017 17:21:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cYKJy-0000ef-BR for guix-devel@gnu.org; Mon, 30 Jan 2017 17:21:14 -0500 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:36997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cYKJy-0000eb-7t for guix-devel@gnu.org; Mon, 30 Jan 2017 17:21:10 -0500 Received: from reverse-83.fdn.fr ([80.67.176.83]:49422 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cYKJx-0000Fm-2t for guix-devel@gnu.org; Mon, 30 Jan 2017 17:21:09 -0500 Resent-To: guix-devel@gnu.org Resent-Message-ID: <87mve8kx4c.fsf@gnu.org> In-Reply-To: <87inowgawq.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?UTF-8?B?Q291cnTDqHM=?= --MP_/RxrNKF/QJTbMspqTc8dR+wF Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Mon, 30 Jan 2017 10:22:13 +0100 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Julien Lepiller skribis: >=20 > > +++ b/gnu/packages/patches/ocaml-janestreet-fix-libdir.patch > > @@ -0,0 +1,39 @@ > > +This patch adds a --libdir option to opam-installer so it installs > > the plugin +in the specified directory rather than in the default > > one (ocaml's directory in +the store, which is forbidden). > > +diff -aur package.pristine/Makefile package.new/Makefile > > +--- package.pristine/Makefile 2016-02-06 01:55:14.650150309 > > +0100 ++++ package.new/Makefile 2016-02-06 > > 01:57:56.012174364 +0100 +@@ -29,26 +29,26 @@ > > + ocaml -I js-utils js-utils/gen_install.ml > > + > > + install: $(NAME).install > > +- opam-installer -i --prefix $(PREFIX) $(NAME).install > > ++ opam-installer -i --prefix $(PREFIX) --libdir $(LIBDIR) > > $(NAME).install + > > + uninstall: $(NAME).install > > +- opam-installer -u --prefix $(PREFIX) $(NAME).install > > ++ opam-installer -u --prefix $(PREFIX) --libdir $(LIBDIR) > > $(NAME).install =20 >=20 > On second thought, I think it=E2=80=99d be simpler and more maintainable = to do > this as a substitution in the snippet. >=20 > WDYT? >=20 > (It will also avoid =E2=80=98guix lint=E2=80=99 complaints about the patc= h file name > not matching the package name. :-)) >=20 > Ludo=E2=80=99. Sure, here it is :) --MP_/RxrNKF/QJTbMspqTc8dR+wF Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=gnu-Add-ocaml-bin-prot.patch >From 8cd3ba3a3f9702a89f8f52c75c33d3d02f20f60b Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 30 Dec 2016 16:27:27 +0100 Subject: [PATCH 2/2] gnu: Add ocaml-bin-prot. * gnu/packages/ocaml.scm (ocaml-bin-prot): New variable. --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6e1e745fe..9d2e02f7f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2004,3 +2004,24 @@ from the oasis build log @item a @code{js_build_tools} ocamlbuild plugin with various goodies. @end enumerate") (license license:asl2.0))) + +(define-public ocaml-bin-prot + (package + (name "ocaml-bin-prot") + (version "113.33.03") + (source (janestreet-origin "bin_prot" version + "1ws8c017z8nbj3vw92ndvjk9011f71rmp3llncbv8r5fc76wqv3l")) + (native-inputs + `(("js-build-tools" ,ocaml-js-build-tools) + ("opam" ,opam))) + (build-system ocaml-build-system) + (arguments janestreet-arguments) + (home-page "https://github.com/janestreet/bin_prot/") + (synopsis "Binary protocol generator") + (description "This library contains functionality for reading and writing +OCaml-values in a type-safe binary protocol. It is extremely efficient, +typically supporting type-safe marshalling and unmarshalling of even highly +structured values at speeds sufficient to saturate a gigabit connection. The +protocol is also heavily optimized for size, making it ideal for long-term +storage of large amounts of data.") + (license license:asl2.0))) -- 2.11.0 --MP_/RxrNKF/QJTbMspqTc8dR+wF--