From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50838) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gOs2T-0005go-MZ 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 1gOs2R-00069k-8m for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:57161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gOs2R-00069b-5b for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gOs2R-0008KE-0j for guix-patches@gnu.org; Mon, 19 Nov 2018 17:29:03 -0500 Subject: [bug#33437] [PATCH 03/10] gnu: ocaml-ppx-tools-versioned: Use dune-build-system. Resent-Message-ID: From: Julien Lepiller Date: Mon, 19 Nov 2018 23:28:14 +0100 Message-Id: <20181119222821.16789-3-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-ppx-tools-versioned): Use dune-build-system. Remove duplicate definition. --- gnu/packages/ocaml.scm | 55 ++---------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a1f6adc8b..fe8871152 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1564,60 +1564,9 @@ functions to the next and/or previous version.") (sha256 (base32 "1x2xfjpkzbcz4rza1d7gh3ipliw6jqfcklbsln82v3561qgkqgmh")))) - (build-system ocaml-build-system) + (build-system dune-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (invoke "dune" "build" "@install") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "dune" "install" - "--prefix" (assoc-ref outputs "out")) - #t))))) - (native-inputs - `(("dune" ,dune))) - (propagated-inputs - `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) - (home-page "https://github.com/let-def/ppx_tools_versioned") - (synopsis "Variant of ppx_tools") - (description "This package is a variant of ppx_tools based on -ocaml-migrate-parsetree") - (license license:expat))) - -(define-public ocaml-ppx-tools-versioned - (package - (name "ocaml-ppx-tools-versioned") - (version "5.2.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ocaml-ppx/" - "ppx_tools_versioned/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1x2xfjpkzbcz4rza1d7gh3ipliw6jqfcklbsln82v3561qgkqgmh")))) - (build-system ocaml-build-system) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (invoke "dune" "build" "@install") - #t)) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "dune" "install" - "--prefix" (assoc-ref outputs "out")) - #t))))) - (native-inputs - `(("dune" ,dune))) + `(#:test-target ".")) (propagated-inputs `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree))) (home-page "https://github.com/let-def/ppx_tools_versioned") -- 2.19.1