From patchwork Fri Aug 20 12:48:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32208 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 2D05727BC78; Fri, 20 Aug 2021 13:51:17 +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 8786A27BC6B for ; Fri, 20 Aug 2021 13:51:16 +0100 (BST) Received: from localhost ([::1]:58696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3zP-00017r-LJ for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yF-0000Lo-LQ for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yF-0001JJ-D3 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yF-0002es-Aw for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 04/12] gnu: ocaml-dose3: Fix reference to inputs and output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 20 Aug 2021 12:50:03 +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.162946375210078 (code B ref 50134); Fri, 20 Aug 2021 12:50:03 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:12 +0000 Received: from localhost ([127.0.0.1]:33212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xQ-0002cN-Dn for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:12 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xC-0002aV-Ob for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406ooyGA; Fri, 20 Aug 2021 14:48:58 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:40 +0200 Message-Id: <20210820124848.13293-4-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=1629463738; bh=epcFm23kpztEA3Pt0HPIhmCopVFNt0ZZ6MwYHHpUFQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XYfoNfxYfnmj+HiRWKsIkjPrS523UE+o8g8x3bJ4eFJ6iYQsDHUlf+2olF45YeJIg atLfR7yPkN6c95HzA7Qq1o15+qc5jxpm0TylPDHb+91/xWbadUeq8k94+acJCEJYLG FToNPhICeNgPHZE7QuOmiwSyQlJs67ZcKao0tnM01jgVzchHWtXZ2QiBa6MFOjGX6C yN+FnX3KblNpCQWRbPe3boYPqANKmYxYkGydh9zRXrd1KWJtJBKfWpoYgCUSoR9nKF G+h3Pppght3bQmkoM7IUkfCjo8GHKcmKloAGbZwh7B/2WVpVNZpVdvgT0Wyhy6TIie krt9csDTc3XMg== 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 The package 'lablgtk@2.8.10' (indirect dependency of ocaml-dose3) fails to build so this patch could not be tested. * gnu/packages/ocaml.scm (ocaml-dose3)[arguments]<#:make-flags>: Use #$output. (ocaml-dose3)[arguments]<#:configure-flags>: Don't use %build-inputs. --- gnu/packages/ocaml.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c97f633cbe..0043e9fbee 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages compression) @@ -644,13 +645,11 @@ underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.") (build-system ocaml-build-system) (arguments `(#:configure-flags - (list (string-append "SHELL=" - (assoc-ref %build-inputs "bash") - "/bin/sh")) + ,#~(list (string-append "SHELL=" + #+(file-append (canonical-package bash-minimal) + "/bin/sh"))) #:make-flags - (list (string-append "LIBDIR=" - (assoc-ref %outputs "out") - "/lib/ocaml/site-lib")) + ,#~(list (string-append "LIBDIR=" #$output "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-test-script