diff options
| author | Shea Levy <shea@shealevy.com> | 2018-03-26 10:09:00 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-03-26 10:09:00 -0400 |
| commit | 59a53aada0965bbbfa79349f4d7eed9ff50b4058 (patch) | |
| tree | ec47c0f3d63ef50ee6b9a7425da53f3b2e655c76 /pkgs/development/compilers/ghc | |
| parent | 9258cea7e0487174077a6951ee9bee39d7fd7572 (diff) | |
| download | nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.tar nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.tar.gz nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.tar.bz2 nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.tar.lz nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.tar.xz nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.tar.zst nixlib-59a53aada0965bbbfa79349f4d7eed9ff50b4058.zip | |
haskell.compiler.ghc8{22,41}: Fix abi-depends non-determinism.
See https://github.com/haskell/cabal/issues/4728 for symptoms, https://phabricator.haskell.org/D4159 for the base of the fix.
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.1.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/abi-depends-determinism.nix | 10 |
3 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 1c3f260da1c1..6520daa4d42c 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy, hscolour , autoconf, autoreconfHook, automake, coreutils, fetchurl, fetchpatch, perl, python3, sphinx +, runCommand , libffi, libiconv ? null, ncurses @@ -89,6 +90,7 @@ stdenv.mkDerivation rec { url = "https://git.haskell.org/ghc.git/commitdiff_plain/2fc8ce5f0c8c81771c26266ac0b150ca9b75c5f3"; sha256 = "03253ci40np1v6k0wmi4aypj3nmj3rdyvb1k6rwqipb30nfc719f"; }) + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch"; diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix index dd0e5e4b0572..df23f660147a 100644 --- a/pkgs/development/compilers/ghc/8.4.1.nix +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -4,6 +4,7 @@ # build-tools , bootPkgs, alex, happy , autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3 +, runCommand , libffi, libiconv ? null, ncurses @@ -85,7 +86,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; - patches = stdenv.lib.optional deterministicProfiling + patches = [ + (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; }) + ] ++ stdenv.lib.optional deterministicProfiling (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch"; sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m"; diff --git a/pkgs/development/compilers/ghc/abi-depends-determinism.nix b/pkgs/development/compilers/ghc/abi-depends-determinism.nix new file mode 100644 index 000000000000..afa272d03a8e --- /dev/null +++ b/pkgs/development/compilers/ghc/abi-depends-determinism.nix @@ -0,0 +1,10 @@ +# https://phabricator.haskell.org/D4159 to fix non-determinism in +# cached abi-depends fields in package databases, modified to only +# contain hunks that exist in distribution tarballs. +{ fetchpatch, runCommand }: let + base = fetchpatch { # Non-determinism in cached abi-depends fields + url = https://phabricator-files.haskell.org/file/data/4pqrbo5b62sifktfbrls/PHID-FILE-4g4zjiqlfxmmlaos7lz7/D4159.diff; + sha256 = "0b8a08sisf1swmarm6nh9rgw7cpzi2rwdzvrd6ny49c7wk0f7x4b"; + }; +in runCommand base.name {} + "sed -n '/utils\\/ghc-pkg/,$p' ${base} >$out" |