git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Change LLVM versions for ghc-8.6 to LLVM 6 (#385)

The LLVM versions specified for the ghc-8.6 series compilers in overlays/bootstrap.nix was LLVM 5, but these compilers state on the download page that they require LLVM 6. This resulted in a warning about a wrong LLVM version for every module compiled with the LLVM backend (e,g, when cross-compiling.) This PR updates the LLVM versions for these compilers to LLVM 6. Note: ghc-8.8.1 (and presumably future ghcs in the 8.8 series) requires LLVM 7. However it appears haskell.nix does not yet support ghc-8.8.1.

commita1432c1f4903f214790e3063ca132a8e77913f4f authorEdward Amsden <edward@blackriversoft.com> dateTue 7 Jan 2020, 01:12 (7 years ago) parent43fdc4d
2 files changed+13−10
compare with iko/ghcjs-patch-master
unifiedsplit
changelog.md+3 overlays/bootstrap.nix+10−10
changelog.md+3
@@ -1,6 +1,9 @@
11This file contains a summary of changes to Haskell.nix and `nix-tools`
22that will impact users.
33
4+## December 27, 2019
5+* Fix overlays/bootstrap.nix to provide LLVM 6, not LLVM 5, to ghc-8.6.X compilers.
6+
47## November 18, 2019
58 * Changed the `cleanSourceHaskell` to accept an attrset of `src` and
69 (optional) `name` parameters. This allows you to keep the source
overlays/bootstrap.nix+10−10
@@ -124,8 +124,8 @@ in {
124124
125125 inherit bootPkgs sphinx installDeps;
126126
127− buildLlvmPackages = self.buildPackages.llvmPackages_5;
128− llvmPackages = self.llvmPackages_5;
127+ buildLlvmPackages = self.buildPackages.llvmPackages_6;
128+ llvmPackages = self.llvmPackages_6;
129129
130130 src-spec = rec {
131131 version = "8.6.1";
@@ -140,8 +140,8 @@ in {
140140
141141 inherit bootPkgs sphinx installDeps;
142142
143− buildLlvmPackages = self.buildPackages.llvmPackages_5;
144− llvmPackages = self.llvmPackages_5;
143+ buildLlvmPackages = self.buildPackages.llvmPackages_6;
144+ llvmPackages = self.llvmPackages_6;
145145
146146 src-spec = rec {
147147 version = "8.6.2";
@@ -157,8 +157,8 @@ in {
157157
158158 inherit bootPkgs sphinx installDeps;
159159
160− buildLlvmPackages = self.buildPackages.llvmPackages_5;
161− llvmPackages = self.llvmPackages_5;
160+ buildLlvmPackages = self.buildPackages.llvmPackages_6;
161+ llvmPackages = self.llvmPackages_6;
162162
163163 src-spec = rec {
164164 version = "8.6.3";
@@ -174,8 +174,8 @@ in {
174174
175175 inherit bootPkgs sphinx installDeps;
176176
177− buildLlvmPackages = self.buildPackages.llvmPackages_5;
178− llvmPackages = self.llvmPackages_5;
177+ buildLlvmPackages = self.buildPackages.llvmPackages_6;
178+ llvmPackages = self.llvmPackages_6;
179179
180180 src-spec = rec {
181181 version = "8.6.4";
@@ -191,8 +191,8 @@ in {
191191
192192 inherit bootPkgs sphinx installDeps;
193193
194− buildLlvmPackages = self.buildPackages.llvmPackages_5;
195− llvmPackages = self.llvmPackages_5;
194+ buildLlvmPackages = self.buildPackages.llvmPackages_6;
195+ llvmPackages = self.llvmPackages_6;
196196
197197 src-spec = rec {
198198 version = "8.6.5";