01/04: gnu: ghc-8: Patch ghc-pkg for reproducibility.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 5de93cdba77db3777f8f026c029acadd7b8bdde3
Author: Ricardo Wurmus <address@hidden>
Date:   Thu Jan 17 09:17:41 2019 +0100

    gnu: ghc-8: Patch ghc-pkg for reproducibility.
    
    Fixes <https://bugs.gnu.org/33922>.
    
    Co-authored-by: Timothy Sample <address@hidden>.
    
    * gnu/packages/haskell.scm (ghc-8)[arguments]: Add build phase
    "fix-ghc-pkg-nondeterminism".
---
 gnu/packages/haskell.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index b40a5d0..a3ce2a3 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2016, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
 ;;; Copyright © 2016 Efraim Flashner <address@hidden>
-;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016, 2017 David Craven <address@hidden>
 ;;; Copyright © 2017 Danny Milosavljevic <address@hidden>
 ;;; Copyright © 2017 Peter Mikkelsen <address@hidden>
@@ -14,7 +14,7 @@
 ;;; Copyright © 2017 rsiddharth <address@hidden>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2018 Tonton <address@hidden>
-;;; Copyright © 2018 Timothy Sample <address@hidden>
+;;; Copyright © 2018, 2019 Timothy Sample <address@hidden>
 ;;; Copyright © 2018 Arun Isaac <address@hidden>
 ;;; Copyright © 2018, 2019 Gabriel Hondet <address@hidden>
 ;;;
@@ -509,6 +509,14 @@ interactive environment for the functional language 
Haskell.")
                      (assoc-ref inputs "ghc-testsuite")
                      "--strip-components=1")
              #t))
+         ;; This phase patches the 'ghc-pkg' command so that it sorts the list
+         ;; of packages in the binary cache it generates.
+         (add-before 'build 'fix-ghc-pkg-nondeterminism
+           (lambda _
+             (substitute* "utils/ghc-pkg/Main.hs"
+               (("confs = map \\(path </>\\) \\$ filter \\(\".conf\" 
`isSuffixOf`\\) fs")
+                "confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) 
(sort fs)"))
+             #t))
          (add-after 'unpack-testsuite 'fix-shell-wrappers
            (lambda _
              (substitute* '("driver/ghci/ghc.mk"