From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KOtyH5c1N2GQ7gAAgWs5BA (envelope-from ) for ; Tue, 07 Sep 2021 11:49:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 2BokG5c1N2EebQAAB5/wlQ (envelope-from ) for ; Tue, 07 Sep 2021 09:49:11 +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 CB8DE2A1A4 for ; Tue, 7 Sep 2021 11:49:10 +0200 (CEST) Received: from localhost ([::1]:39154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mNXj3-0007vZ-UB for larch@yhetil.org; Tue, 07 Sep 2021 05:49:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mNXiw-0007vR-NS for guix-patches@gnu.org; Tue, 07 Sep 2021 05:49:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43882) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mNXiw-0008TZ-F0 for guix-patches@gnu.org; Tue, 07 Sep 2021 05:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mNXiw-0003kG-9y for guix-patches@gnu.org; Tue, 07 Sep 2021 05:49: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 09:49: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: 49868@debbugs.gnu.org Cc: Julien Lepiller Received: via spool by 49868-submit@debbugs.gnu.org id=B49868.163100812014363 (code B ref 49868); Tue, 07 Sep 2021 09:49:02 +0000 Received: (at 49868) by debbugs.gnu.org; 7 Sep 2021 09:48:40 +0000 Received: from localhost ([127.0.0.1]:55428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNXiZ-0003jb-VO for submit@debbugs.gnu.org; Tue, 07 Sep 2021 05:48:40 -0400 Received: from mout02.posteo.de ([185.67.36.66]:53903) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mNXiX-0003jK-JZ for 49868@debbugs.gnu.org; Tue, 07 Sep 2021 05:48:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id D6513240105 for <49868@debbugs.gnu.org>; Tue, 7 Sep 2021 11:48:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1631008110; bh=kQaD8UEklz+lHJ+ISR/7P41VfAP+AIrqDGIxkSmOOGc=; h=From:To:Cc:Subject:Date:From; b=WA3dt/sjlbeu/Lo41UjEIOdXUfrBIUAQ6aoiwBKFMU1pYYara/n5gNf30LNg6wEkt Hk0BA5fSuPG08YyYmKMuPYzY2JboxDbnwYW1QdE+bMbgJBnvnO4JSmbrlljKMznRAR sYOOzRiTRIm2n+1gJuGIsfGYPq5PD19bFff25WXRWVWI59ReKpTMjxwHFFhmiYXhXu AHeOh5ZW5m3h7PAVgpDdFTzbU7h0KhRR9LVQgJGTerCj1qs+bHXZ5wxdeFxH2VxTB7 gk96TpOMmG4jp4sDqEl53x0G70CgqCWdsXMilkQ7XOfsOpzR7JyEGbNKMy8DcEG09u pyXGfKTguQ5GQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4H3gSY4S6Hz9rxL; Tue, 7 Sep 2021 11:48:29 +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> From: pukkamustard Date: Tue, 07 Sep 2021 09:33:39 +0000 In-reply-to: <86zgt75lhe.fsf@posteo.net> Message-ID: <86y288yavn.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=1631008151; 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=sCvuw/n0NJT1+DAXB8/v44m3vZCE7Y3PFbFmxAuyb34=; b=IsfrpDWbiLuWWWMC5RB5m9XImkE77dCGBPWcvROFNHXCdf0YbvzDYtf98ktSAklNPvPe7j guMbBvWfghf98mblpNa//qUKn9ZDc+OF+928CSYdGm9vxksgVIfNNlut35BVjJds+JYHrF FFywboKX6V2bzZPKfs2hDn6xd1XrdSzZqB+BrHS32E/E+Nt1nl2kLFo07lzUesQyMBKzBE wI/MlTwNSMElhhwc2rFZqg6590ngvYRBsvdbu71IahbdaFMOJTBCvSJM3IJx7C0hQfS6/2 4RnvG0YPRa1DZBmrekHMKhF7+klhziObwcFY1/1oTb3AwO9v06fdRzUDO3lung== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631008151; a=rsa-sha256; cv=none; b=Axo+hooDzd+O8Jlvai7PgoVgOU6fUnDMLD7yCCoYrFStNnLF0rkoI3piLfwp8rFGWXsnYt VT84URUngwGQ1B11c8WbE5tZ6Ciywh8I8ahj+iRWGKyUNG7szx1e1pRrJ1SWQycRbTfPAB 2Mlh8knWM9JzE3yabg10FcG8SFHSjZ3qtXBVCe31+PbJZdFXkY/CJy33ml9IFDdZnZB5/k uPwNdxIkGTmwy8YfDuR6sX2xoOtvTQfK6zosi5XX1CHPvCfHRFNtkqQHCFDLfPuexmzjS/ QgQTvw4YiXUjxfqNlCzyTAfFSRtxLeMHLQbe6KzslTTnD6KLf6E6GEULjxoqkA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="WA3dt/sj"; 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="WA3dt/sj"; 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: CB8DE2A1A4 X-Spam-Score: 0.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: BVLKBIc9DZOu --=-=-= Content-Type: text/plain 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 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-guix-dune-build-system-Put-dune-into-a-reproducible-.patch Content-Transfer-Encoding: quoted-printable >From 31bf546f87e90d108003b6ddef4756bf2ef04db7 Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Tue, 7 Sep 2021 11:24:41 +0200 Subject: [PATCH 1/2] guix: dune-build-system: Put dune into a reproducible release mode. * guix/build/dune-build-system.scm (build,check): Use the release flag. * gnu/packages/ocaml.scm: Remove profile being set to release from build fl= ags. --- gnu/packages/ocaml.scm | 15 +++++---------- guix/build/dune-build-system.scm | 5 +++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bdd52d2940..657eed2e62 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2876,8 +2876,7 @@ without a complete in-memory representation of the da= ta.") "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3")))) (build-system dune-build-system) (arguments - `(#:test-target "tests" - #:build-flags (list "--profile=3Drelease"))) + `(#:test-target "tests")) (propagated-inputs `(("ocaml-cmdliner" ,ocaml-cmdliner))) (home-page "https://www.typerex.org/ocp-indent.html") @@ -3295,8 +3294,7 @@ build system and allows external tools to analyse you= r project easily.") "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs"))= )) (build-system dune-build-system) (arguments - `(#:tests? #f - #:build-flags (list "--profile" "release"))) + `(#:tests? #f)) (native-inputs `(("ocamlbuild" ,ocamlbuild))) (home-page "https://github.com/mjambon/cppo") @@ -3364,8 +3362,7 @@ standard iterator type starting from 4.07.") (base32 "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss")))) (build-system dune-build-system) (arguments - `(#:tests? #f - #:build-flags (list "--profile" "release"))) + `(#:tests? #f)) (propagated-inputs `(("ocaml-seq" ,ocaml-seq))) (native-inputs @@ -3842,8 +3839,7 @@ the plugins facilitate extensibility, and the fronten= ds serve as entry points.") "0chn7ldqb3wyf95yhmsxxq65cif56smgz1mhhc7m0dpwmyq1k97h")))) (build-system dune-build-system) (arguments - `(#:build-flags (list "--profile" "release") - #:test-target "camomile-test" + `(#:test-target "camomile-test" #:tests? #f; Tests fail, see https://github.com/yoriyuki/Camomile/i= ssues/82 #:phases (modify-phases %standard-phases @@ -3935,8 +3931,7 @@ connect an engine to your inputs and rendering functi= ons to get an editor.") (base32 "0zcjy6fvf0d3i2ssz96asl889n3r6bplyzk7xvb2s3dkxbgcisyy")))) (build-system dune-build-system) (arguments - `(#:build-flags (list "--profile" "release") - #:tests? #f + `(#:tests? #f #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) diff --git a/guix/build/dune-build-system.scm b/guix/build/dune-build-syste= m.scm index 7e2ec1e3e1..da93899e7f 100644 --- a/guix/build/dune-build-system.scm +++ b/guix/build/dune-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2018 Julien Lepiller ;;; Copyright =C2=A9 2019 Gabriel Hondet +;;; Copyright =C2=A9 2021 pukkamustard ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +36,7 @@ "Build the given package." (let ((program (if jbuild? "jbuilder" "dune"))) (apply invoke program "build" "@install" - (append (if package (list "-p" package) '()) build-flags))) + (append (if package (list "-p" package) '("--release")) build-f= lags))) #t) =20 (define* (check #:key (test-flags '()) (test-target "test") tests? @@ -44,7 +45,7 @@ (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) =20 (define* (install #:key outputs (install-target "install") (jbuild? #f) --=20 2.33.0 --=-=-= Content-Type: text/plain pukkamustard writes: > I submitted #50180 to fix builds of ocaml-ppx-hash. > > The impact of this seems to be smaller than I feared. Maybe reverting is not necessary. > > Still I don't really understand what's going on. I will try and find a concise example and ask the Dune people. > > pukkamustard writes: > >> pukkamustard writes: >> >>> For example ocaml-ppxlib builds properly but seems to be broken. Anything depending on ocaml-ppxlib fails with the errors: >> >> This is not true. ocaml-ppx-hash fails to build. But other things depending on ocaml-ppxlib seem to build fine (e.g. ocaml-ppx-optional, ocaml-ppx-assert). --=-=-=--