From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOs2T-0005gp-Mr for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gOs2S-0006AX-9W for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57163) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gOs2S-0006AH-5Z for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gOs2S-0008KU-0Y for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:04 -0500 Subject: [bug#33437] [PATCH 05/10] gnu: ocaml-lwt: Use dune-build-system. Resent-Message-ID: From: Julien Lepiller Date: Mon, 19 Nov 2018 23:28:16 +0100 Message-Id: <20181119222821.16789-5-julien@lepiller.eu> In-Reply-To: <20181119222821.16789-1-julien@lepiller.eu> References: <20181119222821.16789-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 33437@debbugs.gnu.org * gnu/packages/ocaml.scm (ocaml-lwt): Use dune-build-system. --- gnu/packages/ocaml.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bf4fcc47f..c6ae4e78f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2133,26 +2133,18 @@ through Transport Layer Security (@dfn{TLS}) encrypted connections.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0mhh019bjkg5xfvpy1pxs4xdxb759fyydmgb6l4j0qww1qgr8klp")))) - (build-system ocaml-build-system) + (build-system dune-build-system) (arguments `(#:tests? #f; require lwt_ppx + #:legacy? #t #:phases (modify-phases %standard-phases - (replace 'configure + (add-before 'build 'configure (lambda _ (invoke "ocaml" "src/util/configure.ml" "-use-libev" "true") - #t)) - (replace 'build - (lambda _ - (invoke "jbuilder" "build" "@install") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "jbuilder" "install" "--prefix" (assoc-ref outputs "out")) #t))))) (native-inputs - `(("dune" ,dune) - ("ocaml-cppo" ,ocaml-cppo) + `(("ocaml-cppo" ,ocaml-cppo) ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) ("pkg-config" ,pkg-config) ("ppx-tools-versioned" ,ocaml-ppx-tools-versioned))) -- 2.19.1