Commit Graph

5634 Commits

Author SHA1 Message Date
Will Dietz
a1bf9b6094 llvm_39: disable sanitizers/xray bits when using musl
Don't have a fix for this handy and don't need it yet
so for now just disable.
2018-06-23 15:53:44 -05:00
Will Dietz
b39fb5525b llvm_39: set triples as well 2018-06-23 15:53:43 -05:00
Will Dietz
f0c154a109 llvm_39: apply llvm_4 compiler-rt patch for musl as well 2018-06-23 15:53:43 -05:00
Will Dietz
04fb628780 llvm_39: unconditionally apply sigaltstack fix
(as we do on other LLVM builds)
2018-06-23 15:53:43 -05:00
Will Dietz
96cfd14fd2 llvm-3.9: patches to fix w/musl
Mostly same as used with LLVM 4.0
2018-06-23 15:53:43 -05:00
R. RyanTM
771de50389 pony-stable: 0.1.3 -> 0.1.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pony-stable/versions.

These checks were done:

- built on NixOS
- /nix/store/lb8ipik1qmjzhjnj04iv92as8k763cpd-pony-stable-0.1.4/bin/stable passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.1.4 with grep in /nix/store/lb8ipik1qmjzhjnj04iv92as8k763cpd-pony-stable-0.1.4
- directory tree listing: https://gist.github.com/3550bd75a6690902598b047ba7dba1a9
- du listing: https://gist.github.com/3f202ed132af36d390ed59ab7da008a6
2018-06-23 13:11:44 -07:00
Will Dietz
0ac09be295 llvm4: unconditionally set triples, not just on musl.
Split off from #42454 as requested.
2018-06-23 14:07:49 -05:00
Will Dietz
7088489223 llvm-{5,6}: unconditionally set triples
Previously we only set these when using musl.

See https://github.com/NixOS/nixpkgs/pull/42452#discussion_r197618464

Same should be done for changes in #42452,
I'll add a follow-up commit doing so in the PR containing this
or wherever makes sense-- depending on how review/merging of that goes.

Sending similar changes for LLVM 4 to master, as suggested.
2018-06-23 14:06:55 -05:00
Will Dietz
3e49430922 ghc822: useLLVM when building against musl too 2018-06-23 12:53:45 -05:00
Will Dietz
ffdf8192b3 ghc843: apparently need LLVM when building against musl too 2018-06-23 12:20:02 -05:00
Ryan Mulligan
0d5eb901ad treewide: http -> https 2018-06-23 04:34:55 -07:00
Frederik Rietdijk
48110c1295 Merge staging into master 2018-06-22 13:20:37 +02:00
John Ericson
e050011aa3 Merge pull request #42311 from obsidiansystems/haskell-enable-shared-defaults
haskell: make generic builder follow compiler’s shared config
2018-06-21 18:07:11 -04:00
Chris Hodapp
3b880f55b5 appleseed: init at 1.9.0-beta, osl: init at 1.9.9, seexpr: init at 2.11 2018-06-21 16:18:13 -04:00
Matthew Bauer
9e4aebdd7b ghc8.4: add android triple
The triple is needed for armv7a-android-prebuilt to work (partly) with
GHC.

- also set EXTRA_CC_OPTS for ghc8.2
2018-06-20 22:03:59 -04:00
Matthew Bauer
fd7a6ea0af haskell: make generic builder follow compiler’s shared config
enableShared in generic-builder.nix should default to what the GHC
compiler was compiled with. Add a passthru to all of the GHC compilers
to hold the value of enableShared. If enableShared is not set in the
GHC we just use false as the default value for enableSharedLibraries.

Note: I may have missed some compilers. Only GHC & GHCJS are covered
by this commit but this shouldn’t break evaluation of anything else.
2018-06-20 18:40:53 -04:00
Vladimír Čunát
5039d6ed1f Merge branch 'master' into staging
~6k rebuilds per platform (mainly haskellPackages, I think).
2018-06-20 18:17:18 +02:00
Peter Simons
7283740218 Merge pull request #42123 from peti/drop-ghc-8.4.2
ghc: drop compiler version 8.4.2; we prefer 8.4.3
2018-06-19 22:35:55 +02:00
John Ericson
07ff2c27f1 Merge pull request #37598 from dtzWill/feature/ghc-cross-musl
ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl
2018-06-18 17:01:31 -04:00
Matthew Justin Bauer
30913cc998 ghcjs: remove phases
We can just disable each one we don't want manually.
2018-06-18 15:44:23 -04:00
Daiderd Jordan
a13286fcf0 Merge branch 'master' into staging 2018-06-18 17:35:00 +02:00
Jörg Thalheim
0eee2f746f Merge pull request #41834 from manveru/crystal-2.25.0
Crystal: 0.24.2 -> 0.25.0
2018-06-18 10:10:16 +01:00
Michael Fellinger
d9428ceaf5 Mint: 0.0.3 -> 0.0.4 2018-06-17 13:03:47 +02:00
Michael Fellinger
577d54bb16 Crystal: 0.24.2 -> 0.25.0 2018-06-17 13:03:32 +02:00
Peter Simons
b0909cc394 ghc: drop compiler version 8.4.2; we prefer 8.4.3 2018-06-17 10:37:06 +02:00
Graham Christensen
cbae3d171b vsenv, vs90wrapper: delete 2018-06-15 22:20:54 -04:00
Yegor Timoshenko
0cbb64a1e4 Merge pull request #42021 from r-ryantm/auto-update/closure-compiler
closurecompiler: 20180506 -> 20180610
2018-06-15 01:09:36 +00:00
Yegor Timoshenko
6d31412b58 Merge pull request #42018 from r-ryantm/auto-update/go
go: 1.10.2 -> 1.10.3
2018-06-15 01:07:35 +00:00
John Ericson
92cef7ad42 compiler-rt 5: Fix double space 2018-06-14 20:25:38 -04:00
John Ericson
763b0c83de Merge pull request #42048 from obsidiansystems/llvm-5-compiler-rt
llvm 5: split out compiler-rt and remove libcxxabi dep
2018-06-14 19:50:09 -04:00
John Ericson
0e1ae4b355 Merge remote-tracking branch 'upstream/master' into staging 2018-06-14 19:42:13 -04:00
John Ericson
b2cc99ea1b Merge pull request #42056 from obsidiansystems/llvm-6-darwin-sanitize
llvm 6: Fix libcxxabi impurity and darwin sanitizers
2018-06-14 19:39:44 -04:00
John Ericson
6e7e22da70 llvm 5: split out compiler-rt and remove libcxxabi dep
We already did them on non-mass-rebuild llvm 6. Also, this allows
simplifying the stdenv booting.

We were missing the libcxxabi dep in compile-rt in llvm 6, so fixed that
too.
2018-06-14 19:22:15 -04:00
John Ericson
fc9644d4c9 llvm 6: Fix libcxxabi impurity and darwin sanitizers 2018-06-14 19:19:54 -04:00
Matthew Justin Bauer
493ce3b2c4 Merge pull request #42050 from obsidiansystems/fix-ios-ghc
ghc8.4: build statically on prebuilt iOS
2018-06-14 17:37:06 -04:00
Matthew Bauer
3d811ff18b ghc8.4: build statically on prebuilt iOS
Otherwise we run into issues in stage 1 with libffi.dylib unable to be
built. It is probably a similar case to the prebuilt Android.

/cc @ericson2314
2018-06-14 17:31:06 -04:00
John Ericson
2c08c768ed Merge pull request #42037 from obsidiansystems/gmp-fixes
Fixes for GMP + prebuilt mobile
2018-06-14 16:13:47 -04:00
John Ericson
bdf750499e Merge remote-tracking branch 'upstream/master' into staging 2018-06-14 15:56:00 -04:00
Matthew Bauer
7bc2024fb7 ghc8.4.3: add gmp available check
This was left out in 812decd5c1 & should
be therer.
2018-06-14 15:54:25 -04:00
John Ericson
4ad049fba0 Merge pull request #42034 from obsidiansystems/darwin-booting-llvm
darwin bootstrapping: Avoid overriding aliases for LLVM
2018-06-14 15:53:51 -04:00
John Ericson
1eacf21bd4 darwin bootstrapping: Avoid overriding aliases for LLVM
Respect the fix points and aliases by overriding originals.
2018-06-14 15:05:18 -04:00
Matthew Bauer
a9400e64e7 ghcjs: add version to haskellCompilerName
This is needed for some cabal2nix stuff in getting the version.
Previously we had left out the version but apparently this can cause
problems in some scenarios.

/cc @elvishjerricco @peti @ericson2314
2018-06-14 11:38:13 -04:00
R. RyanTM
2b9e2f5ade closurecompiler: 20180506 -> 20180610
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/closure-compiler/versions.

These checks were done:

- built on NixOS
- /nix/store/7mbi0qnqknb3z96a4af1p8wyyi0jf2q5-closure-compiler-20180610/bin/closure-compiler passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 20180610 with grep in /nix/store/7mbi0qnqknb3z96a4af1p8wyyi0jf2q5-closure-compiler-20180610
- directory tree listing: https://gist.github.com/2841b8a1c31feea2745c98e5234d70c3
- du listing: https://gist.github.com/e36999cb96d2e1b1366f7bd1c3804cad
2018-06-14 08:30:32 -07:00
R. RyanTM
fce5759f24 go: 1.10.2 -> 1.10.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/go/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3/bin/gofmt had a zero exit code or showed the expected version
- /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3/bin/.go-wrapped passed the binary check.
- /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3/bin/go passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 1.10.3 with grep in /nix/store/sz746n0jm0n8dnv47d7cqvwny8ncfbi4-go-1.10.3
- directory tree listing: https://gist.github.com/499abd38cfb9318ba6bbcd885951c6b8
- du listing: https://gist.github.com/04fbe15eac23c814fa6b313c8e543e4c
2018-06-14 07:59:05 -07:00
R. RyanTM
96e2be5084 pony-stable: 0.1.2 -> 0.1.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pony-stable/versions.

These checks were done:

- built on NixOS
- /nix/store/d6b9yh4mbc6g4ysgzzdj4xbi49cy228m-pony-stable-0.1.3/bin/stable passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.1.3 with grep in /nix/store/d6b9yh4mbc6g4ysgzzdj4xbi49cy228m-pony-stable-0.1.3
- directory tree listing: https://gist.github.com/b5577bbf57ef8fa733c1e1aee8ab8908
- du listing: https://gist.github.com/c69c238d1ab5c35fba5ade17f912bed5
2018-06-13 23:06:40 -07:00
John Ericson
cebda2ffd0 Merge remote-tracking branch 'upstream/master' into staging 2018-06-13 21:18:24 -04:00
John Ericson
7156f46949 llvm 3.8+: Remove unneeded libcxxabi dependency
Evidentally this hasn't been needed for a while
2018-06-13 21:06:00 -04:00
John Ericson
e358fff0d6 llvm: use native cmake for libc++abi
Finish what 1cb1b9193b started.
2018-06-13 21:02:04 -04:00
Matthew Justin Bauer
45c70e496f ghcjs-ng: add haskellCompilerName attribute
This is needed by some old code in Nixpkgs. Adding it here will fix some eval errors.

/cc @ElvishJerricco

Fixes #41943
2018-06-13 16:34:50 -04:00
Will Dietz
6cc5483b5e ghc-{8.2.2,8.4.1}: fixups mostly for 2-stage cross, musl
* grab patches from gentoo to fix various 2-stage cross build system
  bugs
* explicitly set CrossCompilePrefix to the expected targetPrefix
  -- ensures everything has expected name and location
  -- fixes lack of prefix'ing when doing glibc -> musl "cross"
* Stage1Only: only set if doing "true" cross
* don't try to specify include/lib dirs for ncurses on cross
  -- only used by terminfo which actually removed the include option,
  and the lib option doesn't seem to do anything other than
  confuse the situation re:cross.

Fixes #37522
2018-06-13 14:41:12 -04:00