From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50844) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOs2T-0005gr-N0 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 1gOs2Q-00069K-Na for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57160) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gOs2Q-00069C-KK for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gOs2Q-0008K7-G8 for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:02 -0500 Subject: [bug#33437] [PATCH 02/10] gnu: ocaml-migrate-parsetree: Use dune-build-system. Resent-Message-ID: From: Julien Lepiller Date: Mon, 19 Nov 2018 23:28:13 +0100 Message-Id: <20181119222821.16789-2-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-migrate-parsetree): Use dune-build-system. --- gnu/packages/ocaml.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e1323582a..a1f6adc8b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -62,6 +62,7 @@ #:use-module (gnu packages web-browsers) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) + #:use-module (guix build-system dune) #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) @@ -1536,26 +1537,13 @@ following a very simple s-expression syntax.") (sha256 (base32 "01zjp1q4hryqaxv4apkjd868fycz2kf887r6lkb6x2a545h1lh7f")))) - (build-system ocaml-build-system) + (build-system dune-build-system) (arguments `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (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))))) + #:legacy? #t)) (propagated-inputs `(("ocamlbuild" ,ocamlbuild) ("ocaml-result" ,ocaml-result))) - (native-inputs - `(("dune" ,dune))) (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (synopsis "OCaml parsetree convertor") (description "This library converts between parsetrees of different OCaml -- 2.19.1