From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2GGHDJRTN2H+IwEAgWs5BA (envelope-from ) for ; Tue, 07 Sep 2021 13:57:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sK1OCJRTN2HoWgAAbx9fmQ (envelope-from ) for ; Tue, 07 Sep 2021 11:57:08 +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 A09512C8FC for ; Tue, 7 Sep 2021 13:57:07 +0200 (CEST) Received: from localhost ([::1]:51072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNZis-00066t-MU for larch@yhetil.org; Tue, 07 Sep 2021 07:57:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNZio-00066l-IY for guix-patches@gnu.org; Tue, 07 Sep 2021 07:57:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43955) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNZio-0001mk-Al for guix-patches@gnu.org; Tue, 07 Sep 2021 07:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNZio-0000qA-9M for guix-patches@gnu.org; Tue, 07 Sep 2021 07:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49868] [PATCH 0/2] guix: dune-build-system: Add a profile parameter. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Sep 2021 11:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49868 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Julien Lepiller Cc: 49868@debbugs.gnu.org Received: via spool by 49868-submit@debbugs.gnu.org id=B49868.16310157813167 (code B ref 49868); Tue, 07 Sep 2021 11:57:02 +0000 Received: (at 49868) by debbugs.gnu.org; 7 Sep 2021 11:56:21 +0000 Received: from localhost ([127.0.0.1]:55501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNZi9-0000p1-9k for submit@debbugs.gnu.org; Tue, 07 Sep 2021 07:56:21 -0400 Received: from mout01.posteo.de ([185.67.36.65]:40273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNZi6-0000oj-En for 49868@debbugs.gnu.org; Tue, 07 Sep 2021 07:56:19 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id EB991240026 for <49868@debbugs.gnu.org>; Tue, 7 Sep 2021 13:56:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1631015772; bh=6hqQeAxlEXd2PDwxnLaesCZsBthJ8sszftECTFw3VgI=; h=From:To:Cc:Subject:Date:From; b=osvy9PNwOCkn526uLxyhQxLcBub/7F2KWStsTS4eiv8KqbOirWBJwldRPU/xqkXHQ Uh9S9ktpXg0G9ZSlFCYpNiB7qhKsG80Kb3/91b25roT7C/Q0yp5MO9InGYfCkfXl30 axfigzXz2ix++5/788Z7sR+ewFsR0TNrGKJ1rCKlATdBrhtLHR3eg7cP46tSyFSymw blTAFWY1dRSydigkHEmMsiUQpj2GrqClIkWTpeC3vlFmNmDysiGLXlaI5hJP0VJziF kd3dZ2ylmPdXhegWgIo5C1hel8vyhU4pIPAnoMHaj+SP3M58KYcGQHeQU6GTbW/12N fosManEhwfH+A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H3kHv07sbz9rxX; Tue, 7 Sep 2021 13:56:10 +0200 (CEST) References: <20210804080423.3533-1-pukkamustard@posteo.net> <20210821000926.00deacf3@tachikoma.lepiller.eu> <868s0r72rb.fsf@posteo.net> <865yvv71sw.fsf@posteo.net> <86zgt75lhe.fsf@posteo.net> <86y288yavn.fsf@posteo.net> <36A316B4-720C-4753-AFFC-DBC68DBE5EF4@lepiller.eu> From: pukkamustard Date: Tue, 07 Sep 2021 11:46:01 +0000 In-reply-to: <36A316B4-720C-4753-AFFC-DBC68DBE5EF4@lepiller.eu> Message-ID: <86pmtky4yu.fsf@posteo.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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=1631015828; 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: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=wQYg2+KxhQdJCWmua5ZpZTFXveeZIpMt55477qFis5M=; b=akDNvt8pN4j1f3ccLWR2NUxZ6yGQfTzeukDZzyiQ9R/J8TZoNrbV3uMmHVf6iaIMZmWPEJ fGet7l4Kn2xqgrXylejy69QC5k7/N9T85rL3hKftvb/qjzuWIzUqdeIcJ+birtPuGB37rc NL6/8leTqiyq/SqYVy/GsYC0i55vQbV7GHu+v4IjWVAKgli9X+iYh7zOO09J7nYxgUJ/5J bczO8GHD+ybefMhg1wzDCD7dwLhOXM5kH6/uB81xjyVOn5q7fDbqNMo5rYcyfzwlcDhN5Q ldhzRlvM2mna3/HqPE4ZamGgb2AevgOfCKokWwsBeqhm56Vz094DLKBhOoOEhA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631015828; a=rsa-sha256; cv=none; b=i5SEXpdl5dsUgRY+ZcSY54jvP4hQnSAxMcRi9FWbYNiusnwtdHIn5B+ddKql5117yJe7aI jWDRgrrfhN2yxPRrk6nT0xuhRG8PURFybVb8qx8rZjVKr8C2zDgWpiodekeodgCfyOHIWp S78hoqt7LShu9d1ISXRrM1LzHOOCWHZapC/K8FnYRsCA2Q2xqFuTV19f0dh4+Lq5nDOgDe O2KSTCfN2tt3IxQ+ks83IXIN4cHb6hzGUPVc1+4MRO7t4Zcv8TMfHHKJ4v/mYRAP1OFwEQ aIGJ8U1xtX+6++Cy8vWVLnY6J7h/imWKt2QOHv7cZTdwvOrUwyhgu7UHPsdmPg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=osvy9PNw; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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.19 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=osvy9PNw; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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: A09512C8FC X-Spam-Score: 0.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: LWJM0r5giuBD --=-=-= Content-Type: text/plain Attached a patch on top of master that replaces the profile parameter with the release flag. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-guix-dune-build-system-Put-dune-into-a-reproducible-.patch >From 8616439f8331d7d8fc089a83bc91e3c2ebc25935 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Tue, 7 Sep 2021 13:41:12 +0200 Subject: [PATCH] guix: dune-build-system: Put dune into a reproducible release mode. * guix/build/dune-build-system.scm (build,check): Remove the profile parameter and use the release flag. * guix/build-system/dune.scm: Remove the profile parameter. * doc/guix.texi: Remove paragraph on profile parameter. --- doc/guix.texi | 5 ----- guix/build-system/dune.scm | 2 -- guix/build/dune-build-system.scm | 9 ++++----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 36a0c7f5ec..a056edc192 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7735,11 +7735,6 @@ is useful when a package contains multiple packages and you want to build only one of them. This is equivalent to passing the @code{-p} argument to @code{dune}. -The @code{#:profile} parameter can be passed to specify the -@uref{https://dune.readthedocs.io/en/stable/dune-files.html#profile, -dune build profile}. This is equivalent to passing the @code{--profile} -argument to @code{dune}. Its default value is @code{"release"}. - @end defvr @defvr {Scheme Variable} go-build-system diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index 1a64cf9b75..8f17519c2f 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -89,7 +89,6 @@ (out-of-source? #t) (jbuild? #f) (package #f) - (profile "release") (tests? #t) (test-flags ''()) (test-target "test") @@ -129,7 +128,6 @@ provides a 'setup.ml' file as its build system." #:out-of-source? ,out-of-source? #:jbuild? ,jbuild? #:package ,package - #:profile ,profile #:tests? ,tests? #:test-target ,test-target #:install-target ,install-target diff --git a/guix/build/dune-build-system.scm b/guix/build/dune-build-system.scm index 6a0c2593ac..70094d2544 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -32,13 +32,11 @@ ;; Code: (define* (build #:key (build-flags '()) (jbuild? #f) - (use-make? #f) (package #f) - (profile "release") #:allow-other-keys) + (use-make? #f) (package #f) #:allow-other-keys) "Build the given package." (let ((program (if jbuild? "jbuilder" "dune"))) (apply invoke program "build" "@install" - (append (if package (list "-p" package) '()) - `("--profile" ,profile) + (append (if package (list "-p" package) '("--release")) build-flags))) #t) @@ -48,7 +46,8 @@ (when tests? (let ((program (if jbuild? "jbuilder" "dune"))) (apply invoke program "runtest" test-target - (append (if package (list "-p" package) '()) test-flags)))) + (append (if package (list "-p" package) '("--release")) + test-flags)))) #t) (define* (install #:key outputs (install-target "install") (jbuild? #f) -- 2.33.0 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Julien Lepiller writes: > Instead of reverting, coull you senl a patch on top of master, that simpl= y replaces the flag? > > Le 7 septembre 2021 05:33:39 GMT-04:00, pukkamustard a =C3=A9crit : > > I suggest reverting commit 33a1ec29fa0ad72c61cef13c8af08c847eb399c1 > ('guix: dune-build-system: Add a profile parameter.') and instead > applying attached patch. > > The attached patch sets the '--release' flag instead of '--profile > release'. From 'dune --help': > > --8<---------------cut here---------------start------------->8--- > --release > Put dune into a reproducible release mode. This is in fact a > shorthand for --root . --ignore-promoted-rules --no-config > --profile release --always-show-command-line > --promote-install-files --default-target @install. You should use > this option for release builds. For instance, you must use this > option in your .opam files. Except if you already use -p, > as -p implies this option. > --8<---------------cut here---------------end--------------->8--- > > I think this is what we want. > > Setting '--profile release' was not enough and was causing > inconsistencies with packages that were building with the '-p' flag. > > -pukkamustard --=-=-=--