Re: staging freeze

[zimoun]

Hi Marius,

On Tue, 13 Oct 2020 at 23:54, Marius Bakke <marius@gnu.org> wrote:

> I've pushed a set of updates to the long-overdue "staging" branch.
>
> Let's get it merged once Cuirass is done building for the various
> architectures.  Not sure how long that takes now that we no longer use
> transparent QEMU emulation for AArch64 and armhf.

If it is possible –– not too late and not used with “guix refresh” ––,
could the attached patch go to “staging” and so all the Haskell packages
of v1.2 should be reproducible?  Otherwise, it should go to core-updates
and then wait the next round. :-)

Well, I could send the patch via guix-patches too. :-)
Let me know.


All the best,
simon

-- >8 --

>From 06eff8c02e22f583c252976f44db41554805293b Mon Sep 17 00:00:00 2001
From: zimoun <zimon.toutoune@gmail.com>
Date: Thu, 15 Oct 2020 14:02:09 +0200
Subject: [PATCH] build-system/haskell: Disable parallel builds.

Parallel builds introduced by commit 67cb9fa2357026ee42ec5bb0923ec4dc4a43abe2
leads to unreproducibility.  Instead of reverting, default is set to #false
which allows user to locally build with parallelism.

* guix/build-system/haskell.scm (haskell-build): Turn off PARALLEL-BUILD? by
default.
---
 guix/build-system/haskell.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm
index 8304e3b222..328d1139b0 100644
--- a/guix/build-system/haskell.scm
+++ b/guix/build-system/haskell.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -121,7 +122,7 @@ version REVISION."
                         (haddock-flags ''())
                         (tests? #t)
                         (test-target "test")
-                        (parallel-build? #t)
+                        (parallel-build? #f)
                         (configure-flags ''())
                         (extra-directories ''())
                         (phases '(@ (guix build haskell-build-system)

base-commit: 7269a591361138ac6fc122d465e45e2b8c4944be
-- 
2.28.0