From patchwork Fri Aug 20 12:48:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32215 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7376627BC78; Fri, 20 Aug 2021 13:54:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D4BD27BC6B for ; Fri, 20 Aug 2021 13:54:21 +0100 (BST) Received: from localhost ([::1]:35778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH42O-0004jk-Bu for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:54:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yL-0000Si-Mq for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49926) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yI-0001MS-Ki for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yI-0002ft-Jf for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 12/12] gnu: dedukti: Fix reference to output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:50:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50134 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50134@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50134-submit@debbugs.gnu.org id=B50134.162946375910139 (code B ref 50134); Fri, 20 Aug 2021 12:50:06 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:19 +0000 Received: from localhost ([127.0.0.1]:33228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xW-0002dO-NH for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:18 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51638) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xI-0002bC-MG for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:12 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406op3H6; Fri, 20 Aug 2021 14:49:04 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:48 +0200 Message-Id: <20210820124848.13293-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210820124848.13293-1-maximedevos@telenet.be> References: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> <20210820124848.13293-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629463744; bh=pT9CRK3RAKrYMRkBRgEvCy5RVPzVKN164iU/LMSuDBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pkmb7sw60yklEZqNWjm39rFA6eK5iW+Brv/ij3rIUz7SO/bi5oMsW9XDWhGxeEolz mfMwSxJGT3HFMK8WTGE5BmiDA1X0QQ88NSkhI87JMMAjFlOMc9aH2F/TyY5osDHMRK FbqbgEplY753apO0nw4rsl/CCQx4YcIVhtRDIBqoY7xqkkSSc7Z9leezdbIrJwnStd pvuHnGxkgYxI+9RdB5ksEdiVk5c8TP9FIaq5GtOou5eLpfBeegvYf++ZnZRIjCcELc 6XAOjmUA/4mabMDPMFHvWEQ4AqV/IbbRzdU2A8jo9Dlbss1S1Zl4wUWTME+7a2BN5x BnIDl+gCbNAIA== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (dedukti)[arguments]<#:phases>: Use #$output. Remove trailing #t. --- gnu/packages/ocaml.scm | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e89c1adbb9..82ee34c542 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4137,28 +4137,23 @@ cross-platform SDL C library.") (build-system ocaml-build-system) (arguments `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda _ - (invoke "make") - #t)) - (replace 'check - (lambda _ - (invoke "make" "tests") - #t)) - (add-before 'install 'set-binpath - ;; Change binary path in the makefile - (lambda _ - (let ((out (assoc-ref %outputs "out"))) - (substitute* "GNUmakefile" - (("BINDIR = (.*)$") - (string-append "BINDIR = " out "/bin")))) - #t)) - (replace 'install - (lambda _ - (invoke "make" "install") - #t))))) + ,#~(modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (invoke "make"))) + (replace 'check + (lambda _ + (invoke "make" "tests"))) + (add-before 'install 'set-binpath + ;; Change binary path in the makefile + (lambda _ + (substitute* "GNUmakefile" + (("BINDIR = (.*)$") + (string-append "BINDIR = " #$output "/bin"))))) + (replace 'install + (lambda _ + (invoke "make" "install")))))) (synopsis "Proof-checker for the λΠ-calculus modulo theory, an extension of the λ-calculus") (description "Dedukti is a proof-checker for the λΠ-calculus modulo