diff options
author | Ricardo Wurmus <[email protected]> | 2019-01-17 09:17:41 +0100 |
---|---|---|
committer | Ricardo Wurmus <[email protected]> | 2019-01-17 17:56:50 +0100 |
commit | 5de93cdba77db3777f8f026c029acadd7b8bdde3 (patch) | |
tree | 17ce604d74b6e5070a4ad22d6a91fa2d64d94a1d /gnu/packages/haskell.scm | |
parent | 11b68c90cd89288906c595d5c31a0413ed8a496f (diff) |
gnu: ghc-8: Patch ghc-pkg for reproducibility.
Fixes <https://bugs.gnu.org/33922>.
Co-authored-by: Timothy Sample <[email protected]>.
* gnu/packages/haskell.scm (ghc-8)[arguments]: Add build phase
"fix-ghc-pkg-nondeterminism".
Diffstat (limited to 'gnu/packages/haskell.scm')
-rw-r--r-- | gnu/packages/haskell.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index b40a5d05da..a3ce2a3e4c 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2018 Ludovic Courtès <[email protected]> ;;; Copyright © 2016, 2017 Nils Gillmann <[email protected]> ;;; Copyright © 2016 Efraim Flashner <[email protected]> -;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <[email protected]> +;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus <[email protected]> ;;; Copyright © 2016, 2017 David Craven <[email protected]> ;;; Copyright © 2017 Danny Milosavljevic <[email protected]> ;;; Copyright © 2017 Peter Mikkelsen <[email protected]> @@ -14,7 +14,7 @@ ;;; Copyright © 2017 rsiddharth <[email protected]> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2018 Tonton <[email protected]> -;;; Copyright © 2018 Timothy Sample <[email protected]> +;;; Copyright © 2018, 2019 Timothy Sample <[email protected]> ;;; Copyright © 2018 Arun Isaac <[email protected]> ;;; Copyright © 2018, 2019 Gabriel Hondet <[email protected]> ;;; @@ -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" |