From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YAOAOvmlH2GuIQAAgWs5BA (envelope-from ) for ; Fri, 20 Aug 2021 14:54:17 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id MIxENvmlH2FsdgAA1q6Kng (envelope-from ) for ; Fri, 20 Aug 2021 12:54:17 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0D189E31B for ; Fri, 20 Aug 2021 14:54:17 +0200 (CEST) Received: from localhost ([::1]:35778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH42K-0004jk-7G for larch@yhetil.org; Fri, 20 Aug 2021 08:54:16 -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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629464057; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=pT9CRK3RAKrYMRkBRgEvCy5RVPzVKN164iU/LMSuDBk=; b=rC4gCaA58PxH1onuU+7fBs8sXpMmO7PKyWeGbx6dfmqmcqf4+Sa3OAKOQRFZ52DRSxyU8S jOXx4TYNS7yEhYGxrDcOSdPEKkr20i2h88JjY9D7vHJgkbrzChP92SQwRstfWb2tBWLcdF x5uqv+eNTYZl9IiobGiER7JDDaAQDBO5j5gO0HXny8B/y00Vtz6vrXQK1ACfHl/6/oBiMV JwmArAfjcAcmf0Ij3aXOKEf7Uiq4OaWeGfa+KNIRWVSR6+gLdfpmSypOzUzY+Hj2+2QPYx 3V5nyTrqswzdXOhMfKss04JdXLveBidBFIBQxrHtI3j3x/ir3+BmOAFO6Tq1+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629464057; a=rsa-sha256; cv=none; b=U+s+vTSDSiHY1SMK+6tRvVX2L9n960Y/v0alsq1hCu2QRMt0et4kmNzcPIid2d428raw5w wSmviHijbZTEzJQRyO+obRpNCjTmbQWltG9OcrBnZXaTosPkLZvmK5m2gx/D58RgtsQUt1 2gzrgFWgs2O8Ltew6yxi9EIa18wMssa1s7MdUFJO3TND57n5U0wHISoNSy3iaMHVus02Qv fKBQMTesTbtcEke4TIXy6Q7aAY0ktC/FbFGAOz33iUf9u4w8FfRYd36iGGwOvUhVkY+wP/ o7iUBd2fFxqzsLfZpWunYXnYllvi9t350k3kXa3FAeDYjBiZYeyNmzP4aZcE8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Pkmb7sw6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=Pkmb7sw6; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 0D189E31B X-Spam-Score: -0.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: cn+3/qXx7RZI * 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 -- 2.33.0