From patchwork Fri Aug 20 12:48:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 32204 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 001FB27BC78; Fri, 20 Aug 2021 13:50:48 +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 52A0027BC6B for ; Fri, 20 Aug 2021 13:50:48 +0100 (BST) Received: from localhost ([::1]:57758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3yx-0000LL-Ac for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:50:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0000JV-Dt for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0001IA-6m for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yE-0002eW-57 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 01/12] gnu: ocaml: 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:02 +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.162946375010050 (code B ref 50134); Fri, 20 Aug 2021 12:50:02 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:10 +0000 Received: from localhost ([127.0.0.1]:33200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xF-0002as-HY for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:10 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xA-0002aP-5l for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:00 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406oouFk; Fri, 20 Aug 2021 14:48:55 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:37 +0200 Message-Id: <20210820124848.13293-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> References: <215b0088e542b2fb9bcf3be9ff74c5874770f878.camel@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629463735; bh=UIKRw10Wr3sgrJESReW/JjE/r5Rf8tD7+fR5sMoaw2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oLqbAELJLWDXxSTp+QZnAo4lJgF/+f0GkSz2xGYHIm5F14VaU0aRleYbN02C1cSUM 4GjfurU3qfst5fp/b8MiH5vELloZW69BZsDJXL7NGwyKiRmDLN6JkXsainbWywMwOH izTJwU+0jSUAZkj0IIGG/vBNrdOjNKcK0jSljwyvzWqJGp1Z8ZvhkvpfoVqt0a3IvK BNuLMlIkKTTz+Y6Dh2jzgppLdZhWlWx8rCdKG+ugcXGfiAX0pRCGWQIuyJjJFTXGtb Dvu0xKJ6fBWXp505d9eF2s6bpIj7BEZ1pVSOtxz67IQY4XJqtUf5QTmriZ9K1/mz7y gF2qUha4rrYdg== 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 (dune-boot)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 183f88dd01..b8d52bb283 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Ivan Gankevich +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -87,6 +88,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ocaml) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -1620,10 +1622,10 @@ full_split, cut, rcut, etc..") (build-system ocaml-build-system) (arguments `(#:tests? #f; require odoc - #:make-flags (list "release" - (string-append "PREFIX=" (assoc-ref %outputs "out")) - (string-append "LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib")) + #:make-flags ,#~(list "release" + (string-append "PREFIX=" #$output) + (string-append "LIBDIR=" #$output + "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (replace 'configure From patchwork Fri Aug 20 12:48:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32212 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 69D3027BC78; Fri, 20 Aug 2021 13:53:58 +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 35EE027BC6B for ; Fri, 20 Aug 2021 13:53:58 +0100 (BST) Received: from localhost ([::1]:34506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH421-0003u0-9q for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:53:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0000Jz-Qk for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0001IW-Ja for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yE-0002ed-Hs for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 02/12] gnu: ocamlbuild: 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:02 +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.162946375210063 (code B ref 50134); Fri, 20 Aug 2021 12:50:02 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:12 +0000 Received: from localhost ([127.0.0.1]:33208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xO-0002c3-LK for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:12 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xB-0002aS-T4 for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:01 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406ooxG0; Fri, 20 Aug 2021 14:48:57 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:38 +0200 Message-Id: <20210820124848.13293-2-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=1629463737; bh=HJn0WxEIU9EfesMv2W1c7J5wJk3kwixOZQZH3QHP/Ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aEm5WnGqdLxlAiEifyrlwyJxoCLiX5RHdEQH3/37cc4+LO/yRud7Fuu6Q8PmZ/tAu Kbk2oGKa0qg2QPfiXPKDDrfjBh0V2rPncAp+EUrY5w0tcTZqh1NjAMNJM3LSFULp03 AzwIvdUFEqL8CMaj4nmY66tfgQjnnYpiSxFZZegzo5+g63fre6Wxsmqi/LsPtFK9PH ZP0zbWj+Wbkzs5l+1ymReIbv2MSsWNkx9tf7JrbDGQwKexeRALGqPKpuTJMLAYEhpK IV4QmwkX5xjZBRcAcHQnkZp+1IAvkMg/oFxtSK8X6PTHNuFlMc8h4YrsFpYuinyBpn KNMQT7E3y0iCw== 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 (ocamlbuild)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b8d52bb283..1624823394 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -456,13 +456,11 @@ depend: $(STDLIB_MLIS) $(STDLIB_DEPS)")) (build-system ocaml-build-system) (arguments `(#:make-flags - (list (string-append "OCAMLBUILD_PREFIX=" (assoc-ref %outputs "out")) - (string-append "OCAMLBUILD_BINDIR=" (assoc-ref %outputs "out") - "/bin") - (string-append "OCAMLBUILD_LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib") - (string-append "OCAMLBUILD_MANDIR=" (assoc-ref %outputs "out") - "/share/man")) + ,#~(list (string-append "OCAMLBUILD_PREFIX=" #$output) + (string-append "OCAMLBUILD_BINDIR=" #$output "/bin") + (string-append "OCAMLBUILD_LIBDIR=" #$output + "/lib/ocaml/site-lib") + (string-append "OCAMLBUILD_MANDIR=" #$output "/share/man")) #:phases (modify-phases %standard-phases (delete 'configure)) From patchwork Fri Aug 20 12:48:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32205 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 1555727BC78; Fri, 20 Aug 2021 13:50:50 +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 DC83E27BC6B for ; Fri, 20 Aug 2021 13:50:49 +0100 (BST) Received: from localhost ([::1]:57830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3yy-0000OX-Un for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yF-0000Ku-6E for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yE-0001Ih-VO for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yE-0002el-UI for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 03/12] gnu: ocamlcudf: 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:02 +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.162946375210071 (code B ref 50134); Fri, 20 Aug 2021 12:50:02 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:12 +0000 Received: from localhost ([127.0.0.1]:33210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xQ-0002cC-3Z for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:12 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xC-0002aT-Ab for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:04 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406ooxG4; Fri, 20 Aug 2021 14:48:57 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:39 +0200 Message-Id: <20210820124848.13293-3-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=1629463737; bh=osoh2EuYTInReY9mqJP4ocW7LP415DbCKMu1aWxBe+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gjPKsm6TTKr8/Py3zVXOJHgF81l2PIXC5h/B66N8PCvZMRvBOhSpUEfK2+KjTVkhR M7XXoIL0Dc5HFIMRTkreCH2yCzFhqIw0UtVt4o/F3Wy/YER5GOfuTmF6wGXG2C0z6V I/+KE6qL7kl1dxd+gX/9t5J9xD0Tm9LKPOHOsklsQiTjINjKNaU6iDYuVSg++v8U2t BGHXURRHAXCfC/gw38dho6X1ntl5Y4ZsxazaFLDPdUT9Z1+tz3d/D8xLsCsF/vS7l5 ylfgLhtVq966p2AV3XRMTTgs0ogN9Ugz1iuPLmH8jpVyf6uMwImHrPzFgx2S0KkgYg XGowelhxYpKKg== 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 (ocamlcudf)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1624823394..c97f633cbe 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -583,10 +583,9 @@ for day to day programming.") ("ocaml-ounit" ,ocaml-ounit))) (arguments `(#:make-flags - (list - "all" "opt" - (string-append "BINDIR=" (assoc-ref %outputs "out") - "/bin")) + ,#~(list + "all" "opt" + (string-append "BINDIR=" #$output "/bin")) #:phases (modify-phases %standard-phases (delete 'configure)))) 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 From patchwork Fri Aug 20 12:48:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32207 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 90A6527BC6B; Fri, 20 Aug 2021 13:51:09 +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 11EBA27BC78 for ; Fri, 20 Aug 2021 13:51:09 +0100 (BST) Received: from localhost ([::1]:58544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3zI-000114-4a for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yG-0000Ml-31 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49919) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yF-0001JS-Pk 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-0002f0-O1 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 05/12] gnu: ocaml-cmdliner: 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: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.162946375310085 (code B ref 50134); Fri, 20 Aug 2021 12:50:03 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:13 +0000 Received: from localhost ([127.0.0.1]:33214 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xQ-0002cV-Mc for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:12 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51480) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xD-0002aW-5x 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 joou250050mfAB406ooyGC; Fri, 20 Aug 2021 14:48:58 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:41 +0200 Message-Id: <20210820124848.13293-5-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=JKQ/Ze3d8aZQhkO72qjQWc2OX5BleH9E0XsfuNdDwnY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MSZz+DbNj1Mw512DjEYVGpSL7ZSdC4QJhjIjpfciiMv6zNw0kJ1DCfKgbQbo8hX2l 6XdJm0Tf47T0CdVgmdkaXLY1sVz5xytmLLYRb/Ipab5ibXV8q7sTW/EzyTi0yD+EDM lRKmCZNUS4nsxDq/1qGUvbyIEeABD2b8PP2oEZJQ9xLR2DM27M5WK14+sBwC3Q32ri UZvGNIVO7SBPSU0V+kVJ6maqp/pz1QeTswOviUXLlIbPoWBQgpQ7BjOcuObSQe6WSl fH1ajVZkS8LQjbopVKD6RgCcJ5QD4li9KRLMmoDuy36JSaTKdomHpm/DzWU0/FOlT0 4fqWyFB8uFsgQ== 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 (ocaml-cmdliner)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0043e9fbee..48950589c5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2141,8 +2141,8 @@ dates and times.") `(("ocamlbuild" ,ocamlbuild))) (arguments `(#:tests? #f - #:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib/cmdliner")) + #:make-flags ,#~(list (string-append "LIBDIR=" #$output + "/lib/ocaml/site-lib/cmdliner")) #:phases (modify-phases %standard-phases (delete 'configure) From patchwork Fri Aug 20 12:48:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32213 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 D95FF27BC78; Fri, 20 Aug 2021 13:54:04 +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 ADE0727BC6B for ; Fri, 20 Aug 2021 13:54:04 +0100 (BST) Received: from localhost ([::1]:34924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH427-0004Az-Pa for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:54:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yG-0000O0-Gt for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yG-0001JX-82 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yG-0002f8-5x for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 06/12] gnu: ocaml-opam-file-format: 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:04 +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.162946375310092 (code B ref 50134); Fri, 20 Aug 2021 12:50:04 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:13 +0000 Received: from localhost ([127.0.0.1]:33216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xQ-0002cc-Vz for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:13 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xD-0002aY-Jb 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 joou250050mfAB406ooyGF; Fri, 20 Aug 2021 14:48:58 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:42 +0200 Message-Id: <20210820124848.13293-6-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=FAcOmXEI6HPaboIq/JojTrPdshbpknoBJDJofnq2ECs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tS4y2ujh3AHHdpmy9hftzq+sXSP1Ps6wQIiCWJVPMvrKhp5ShQDT1MvT+97hjEAQi 7vfQPxM/w8MPpwaASLkovvjHPJ7cFApfRb5GirEUmaW1LZV6hQqiC6fXN9doaYTtE2 hVlKi5KgRiw13enPc3PnYbr8K/+3KFfHzjJyFSh2gVJ25H4evMDlNjbkMMJg54goGg hB557U3lkqYbNGOxvilebPz7fECRzGOd9ZjZrN6NGyIWJXyZWlAFlk3c0gS9HZ9YsB mPkS29LuC8FdyipLvlR1LJoFN8l9tV48d3VaS8+yLTEa8a1MrRd/4OPJnhHllPRnKv lqaUifUdWLZyA== 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 (ocaml-opam-file-format)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 48950589c5..1e32ebee60 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -761,8 +761,8 @@ let () = String.split_on_char ':' (Sys.getenv \"OCAMLPATH\") (build-system ocaml-build-system) (arguments `(#:tests? #f; No tests - #:make-flags (list (string-append "LIBDIR=" (assoc-ref %outputs "out") - "/lib/ocaml/site-lib")) + #:make-flags ,#~(list (string-append "LIBDIR=" #$output + "/lib/ocaml/site-lib")) #:phases (modify-phases %standard-phases (delete 'configure)))) From patchwork Fri Aug 20 12:48:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32209 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 BA57D27BC78; Fri, 20 Aug 2021 13:51:48 +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 3B6FE27BC6B for ; Fri, 20 Aug 2021 13:51:48 +0100 (BST) Received: from localhost ([::1]:59370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3zv-0001ak-74 for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:51:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yG-0000PI-UC for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yG-0001K4-LS for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yG-0002fF-Jv for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 07/12] gnu: camlzip: 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:04 +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.162946375310099 (code B ref 50134); Fri, 20 Aug 2021 12:50:04 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:13 +0000 Received: from localhost ([127.0.0.1]:33218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xR-0002cj-8U for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:13 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xE-0002aZ-2p 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 joou250050mfAB406oozGK; Fri, 20 Aug 2021 14:48:59 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:43 +0200 Message-Id: <20210820124848.13293-7-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=1629463739; bh=NEPyLu/xSDofSnm5z4i9K/bCvqFVuddb2UvV2tGFuj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d0vckZqRI2M+AYaX/eiZA7pnj1Oa3Pk4bAS/ZqfZh2ngpSgGduu+SIA4sf7XP+0qH qSE/7zmxL+SIvONoECti9L+mTO7/YeExi4chDXEUgsLhPmbBP5JXtcou21jnzFJvVS yjjGyXExHNWl2KKM9aq9Zp070eit+gg2j82O/mcDFa3vpw+iafZdQZr/BmecTUJDTG iERwk0u8bFOYuyxb+MuGc6QwsKgqcX3eEqFrG66LSubPY5UIWQbjcUNXLiUV4JyGOl Hi5e+SPXXVCaba4kEgfny1/EmkEhvAvHEgU5YPxsMpdqdGoU8izqYar4taA3iSdJR8 ohIkk+gPvseyw== 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 (camlzip)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1e32ebee60..66d4460446 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1392,9 +1392,8 @@ other XUnit testing frameworks.") (format port "directory=\"../zip\"\n"))))))) #:install-target "install-findlib" #:make-flags - (list "all" "allopt" - (string-append "INSTALLDIR=" (assoc-ref %outputs "out") - "/lib/ocaml")))) + ,#~(list "all" "allopt" + (string-append "INSTALLDIR=" #$output "/lib/ocaml")))) (home-page "https://github.com/xavierleroy/camlzip") (synopsis "Provides easy access to compressed files") (description "Provides easy access to compressed files in ZIP, GZIP and From patchwork Fri Aug 20 12:48:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32206 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 8A49B27BC78; Fri, 20 Aug 2021 13:50:51 +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 512AE27BC6B for ; Fri, 20 Aug 2021 13:50:51 +0100 (BST) Received: from localhost ([::1]:57970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH3z0-0000V6-Be for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:50:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yH-0000QS-DE for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yH-0001Kz-2s for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mH3yH-0002fN-0w for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 08/12] gnu: ocaml-down: 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:04 +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.162946375710111 (code B ref 50134); Fri, 20 Aug 2021 12:50:04 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:17 +0000 Received: from localhost ([127.0.0.1]:33220 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xV-0002d0-IB for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:17 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xE-0002aa-Gh for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:08 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406oozGM; Fri, 20 Aug 2021 14:48:59 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:44 +0200 Message-Id: <20210820124848.13293-8-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=1629463739; bh=cmUJV5NczJNFkTK8yHMZvY0Ew8Hseb12eB7q2RhJKfA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ntsvCh2DNdbXlli3ZV4snrJt1PsF4NxAvv69fK3NBIr6V60w2CRLCaV3cLXEw9Jua wrtKu1EBIL7mUMSThilKKVggLDO1Bg0p1siOMFjJX0bTn2wzPrfwv3S8vBjUnOQm7Q LL8AoHkowTwn9s1Djuo4UqOaBBKRwdRH14iXZ4sS3+eNGF/xauX1SOaCuTuSubcu88 KBplznU7yMAq897slR9xkQdT3RC87MfNsTjyCFycRkAXss9nv5/UHRbI9BbPd0oeiQ fhBWZNPIxDDIo+UerrWJKYraLYQ7DLVEzQMsD/XXySGQvRlrHcz76FjdvCmbrJuMp4 2z/jksPPvDCZg== 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-down) fails to build so this patch could not be tested. * gnu/packages/ocaml.scm (ocaml-down)[arguments]<#:build-flags>: Use #$output. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 66d4460446..81e967cd34 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -701,8 +701,8 @@ repository-wide uninstallability checks.") (modify-phases %standard-phases (delete 'configure)) #:build-flags - (list "build" "--lib-dir" - (string-append (assoc-ref %outputs "out") "/lib/ocaml/site-lib")))) + ,#~(list "build" "--lib-dir" + (string-append #$output "/lib/ocaml/site-lib")))) (native-inputs `(("ocaml-findlib" ,ocaml-findlib) ("ocamlbuild" ,ocamlbuild) From patchwork Fri Aug 20 12:48:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32211 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 61B8027BC78; Fri, 20 Aug 2021 13:52: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 EB0CD27BC6B for ; Fri, 20 Aug 2021 13:52:20 +0100 (BST) Received: from localhost ([::1]:60244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH40S-0002Bq-0f for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:52:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yL-0000Sl-N0 for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49925) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yI-0001Lt-7y 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-0002fm-74 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 09/12] gnu: ocaml-frontc: 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.162946375810133 (code B ref 50134); Fri, 20 Aug 2021 12:50:06 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:18 +0000 Received: from localhost ([127.0.0.1]:33226 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xW-0002dH-9T for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:18 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51528) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xE-0002ac-TN for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406op0GR; Fri, 20 Aug 2021 14:49:00 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:45 +0200 Message-Id: <20210820124848.13293-9-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=1629463740; bh=0xSRSFIlk6SzvtJ+IlN8WOmfpRD6SfY2ZPkyx2/Dczc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Bnhu9vfdPC2kw5ka6v3lWEDytQJctdnTI3GpfnmTvO/lhPin+1cpuUiDJDQ44jN3n r0cFu4T3i8FamDvr+3AKtbjRVwUoqRienOVjyKjEA0zuMtJgRS0O5MQ3B7CdCUVI1G 2bEcu2HlZKnC5ashX1D906aHVD34UjQO3Hsv4sS9vap9Nasn1DhmOuW6wwkqVAfi9q pNGDuG1oKke7ddrpdGulqZ/7Mowzy+XF9Kob87Ft+RvJ6fc6QSpS6dw61X/52M4zVs eYdUButQ4UJGe3am2pZSxHEyxtR4me1gKSuOh1Mw6cB370ZgCpPQn90BExq6JPjd8m IqSPPUqIjjoPw== 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 (ocaml-frontc)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 81e967cd34..6fe8cb46f9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1498,9 +1498,8 @@ archive(byte) = \"frontc.cma\" archive(native) = \"frontc.cmxa\"")))) (symlink (string-append out "/lib/ocaml/frontc") (string-append out "/lib/ocaml/FrontC")))))) - #:make-flags (list (string-append "PREFIX=" - (assoc-ref %outputs "out")) - "OCAML_SITE=$(LIB_DIR)/ocaml/"))) + #:make-flags ,#~(list (string-append "PREFIX=" #$output) + "OCAML_SITE=$(LIB_DIR)/ocaml/"))) (properties `((upstream-name . "FrontC"))) (home-page "https://www.irit.fr/FrontC") (synopsis "C parser and lexer library") From patchwork Fri Aug 20 12:48:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32210 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 84F3827BC78; Fri, 20 Aug 2021 13:52:09 +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 5E48727BC6B for ; Fri, 20 Aug 2021 13:52:09 +0100 (BST) Received: from localhost ([::1]:59822 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH40G-0001uj-6z for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:52:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yL-0000Sh-MT for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yH-0001Le-EV 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 1mH3yH-0002fV-Da for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 10/12] gnu: omake: 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:05 +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.162946375810118 (code B ref 50134); Fri, 20 Aug 2021 12:50:05 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:18 +0000 Received: from localhost ([127.0.0.1]:33222 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xV-0002d2-R4 for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:17 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xH-0002aP-8D for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406op2Gu; Fri, 20 Aug 2021 14:49:02 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:46 +0200 Message-Id: <20210820124848.13293-10-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=1629463742; bh=Q/FA1Wk2Moas1YCVxEXjcu5Az3dAVGxUBnpUYJS0FTk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IGzCVRs1pFMDAheFsG/ArIy7rPSMc3NbqiaGCsocm6VtvmwMX4nmLDCrHCrWyeqRh WZhGiFN4ERgj6ECuOO78AXoeIwvdn+4mCiKvBEHElNBdS0RfCXSIsxMZLrfTZwEqL5 Y+XYIlGNDUDXAZxnDVNIl/FBJGY5+/p4xVJ0S36CHzYUVjQlQEB4ypaVgqhghOUIUf EW5UP5NdpNLbAVYMPRkTmJeTmA4ubagln+vuqyMYwWhEGEAlZBadZDbNUQVpxhwGIt WmwT+yEWDIZTKaHoxWmW7iyXXNr+l79jjh1rr7iYmSRYeOTo/udMh0/BrfZuo6fvQj mP2E+wqFADnXw== 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 (omake)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6fe8cb46f9..7385d6e413 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3029,7 +3029,7 @@ OCaml code.") (build-system ocaml-build-system) (arguments `(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + ,#~(list (string-append "PREFIX=" #$output)) #:tests? #f ; no test target #:phases (modify-phases %standard-phases From patchwork Fri Aug 20 12:48:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32214 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 19F0027BC78; Fri, 20 Aug 2021 13:54:12 +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 DEF7B27BC6B for ; Fri, 20 Aug 2021 13:54:11 +0100 (BST) Received: from localhost ([::1]:35354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mH42F-0004SH-2F for patchwork@mira.cbaines.net; Fri, 20 Aug 2021 08:54:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mH3yL-0000SN-MZ for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49924) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mH3yH-0001Lp-Rc 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 1mH3yH-0002fc-QW for guix-patches@gnu.org; Fri, 20 Aug 2021 08:50:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50134] [PATCH core-updates-frozen 11/12] gnu: ocaml4.07-piqi: 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:05 +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.162946375810126 (code B ref 50134); Fri, 20 Aug 2021 12:50:05 +0000 Received: (at 50134) by debbugs.gnu.org; 20 Aug 2021 12:49:18 +0000 Received: from localhost ([127.0.0.1]:33224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xW-0002d9-0x for submit@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:18 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mH3xH-0002aS-T3 for 50134@debbugs.gnu.org; Fri, 20 Aug 2021 08:49:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id joou250050mfAB406op3H3; Fri, 20 Aug 2021 14:49:03 +0200 From: Maxime Devos Date: Fri, 20 Aug 2021 14:48:47 +0200 Message-Id: <20210820124848.13293-11-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=1629463743; bh=b4yk15kPihj7+HrMxPspeofrfxEYgzpF/ap2ULepdw4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VPxTAC1yuuL5kAQpJ6IuDBwqqD/5wkg0OZ6kgFkIdjkJ2HmayqV0tgCpgVkeXOUJF 1A8T2dvy8jWpuXrv+AEYPs1Gf71RL9LVI4MzfiR3S5PWvvifC8nt2cI0IhjvUIUwBc SxenAMd2ttI8p1zzYMgr6Sw0qcVdBsxF55eO9wCn8ZGBXtXoXB1DNSr9Ey96OdVlMz heKG86XUKmmzXlkpfXyM/+FwFCa8u9Zz8IZT6VDt0T6jsZMmf2h1p2VFCH+VdR6Iyd D1WZM8n/BvZD1mvZhTn6jNE5hkgV0XB+SuZo41n+eqsGNlHmFzBGpBeoZt6UdMW6rn X5x6LIOLr4F9A== 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 ocaml4.07-piqi) fails to build so this patch could not be tested. * gnu/packages/ocaml.scm (ocaml4.07-piqi)[arguments]<#:make-flags>: Use #$output. --- gnu/packages/ocaml.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7385d6e413..e89c1adbb9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3704,9 +3704,10 @@ and 4 (random based) according to RFC 4122.") (build-system ocaml-build-system) (arguments `(#:make-flags - (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) - (string-append "SHELL=" (assoc-ref %build-inputs "bash") - "/bin/sh")) + ,#~(list (string-append "DESTDIR=" #$output) + (string-append "SHELL=" + #+(file-append (canonical-package bash-minimal) + "/bin/sh"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'make-files-writable 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