Commit Graph

5513 Commits

Author SHA1 Message Date
Benjamin Saunders ee06f735a8 tests.cc-wrapper: verify building with sanitizers
(cherry picked from commit 46eeef1898)
2018-05-25 11:53:18 -04:00
Benjamin Saunders 158e550762 llvm and clang 6: factor out compiler-rt, fix libstdcxxStdenv sanitizer headers
Build compiler-rt separate from llvm and clang, and just add as an extra
library in the wrapper.

(cherry picked from commit 16da44b5c1)
2018-05-25 11:53:07 -04:00
John Ericson ce0180dfd5
Merge pull request #40996 from obsidiansystems/cross-ghc
ghc, haskell-infra: #40929 take 2
2018-05-25 11:09:07 -04:00
Gabriel Ebner 8033f52a12 fstar: 0.9.5.0 -> 0.9.6.0 2018-05-25 10:28:37 +02:00
Benjamin Saunders b0d0b1adfe clang_6: fix sanitizers under libstdc++ 2018-05-24 15:04:30 -07:00
Pascal Wittmann 99e0fb044f
colm: 0.13.0.5 -> 0.13.0.6 2018-05-24 22:10:58 +02:00
John Ericson 205fc55ea2 Merge remote-tracking branch 'upstream/staging' into compiler-rt 2018-05-24 02:58:00 -04:00
Benjamin Saunders 46eeef1898 tests.cc-wrapper: verify building with sanitizers 2018-05-24 02:57:44 -04:00
Benjamin Saunders 16da44b5c1 llvm and clang 6: factor out compiler-rt, fix libstdcxxStdenv sanitizer headers
Build compiler-rt separate from llvm and clang, and just add as an extra
library in the wrapper.
2018-05-24 02:57:43 -04:00
Robin Gloster 33b8830a85
ghc: disable format hardening 2018-05-24 03:42:43 +02:00
John Ericson e5175fbf20 Merge remote-tracking branch 'upstream/master' into ios-mini-staging 2018-05-23 16:01:05 -04:00
John Ericson d7144e708b Merge remote-tracking branch 'upstream/master' into staging 2018-05-23 16:00:04 -04:00
John Ericson 58fd684c76 llvm: Separate tools and libraries for clarity
Especially provides clarity with respect to cross.
2018-05-23 14:42:06 -04:00
Matthew Justin Bauer 895fef2b19 clang3.4: still needs libedit
https://hydra.nixos.org/build/72965931/nixlog/1
(cherry picked from commit 2d90138b3b)
2018-05-23 11:46:40 -04:00
Matthew Bauer 9416f29800 llvm: remove libedit from clang
clang should never need libedit. From what I understand this is only
needed by LLDB.

https://github.com/llvm-mirror/clang/search?q=libedit
(cherry picked from commit 9ee69c27c9)
2018-05-23 11:09:12 -04:00
Matthew Bauer d417ada9a6 clang: only link if LLVMgold exists
buildEnv now errors with broken symlinks. Lots of things like this
still exist.

Discussion in #39038.

(cherry picked from commit 7b73c7f49a)
2018-05-23 11:09:05 -04:00
Moritz Angermann fe1eec9e24 ghc 8.4.2, head: Drop `libiconv` on windows.
nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
2018-05-23 10:41:17 -04:00
John Ericson c7458ded5c ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows 2018-05-23 10:41:17 -04:00
Moritz Angermann 10b76a4cab ghc: paxmark all unwraped executables across the board
Shell glob works even as the exact set of executable (filenames) varries
beween configuations. Need to skip non ELFs (e.g. shell scripts),
however.
2018-05-23 10:41:15 -04:00
John Ericson 1978115c3b ghc: Handle flavors better 2018-05-23 10:27:42 -04:00
John Ericson 9ce15ea60c ghc: Normalize derivations 2018-05-23 10:27:42 -04:00
John Ericson c641a74bd6 Merge remote-tracking branch 'upstream/master' into ios-mini-staging 2018-05-23 09:45:25 -04:00
John Ericson 18742471af Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
John Ericson 5f1ec8e6d9
Merge pull request #40961 from obsidiansystems/hash-preserving-llvm-cleanup
llvm, top-level: Baby steps towards cross support
2018-05-23 09:15:00 -04:00
xeji 4aa04d185c
Merge pull request #40228 from ThomasMader/dlang-update
dmd,dtools,dub: 2.079.0 -> 2.079.1 and wrap ldc2 binary with $CC
2018-05-23 10:25:39 +02:00
Peter Simons 5db3a9df5e
Revert "ghc, haskell infra: #40642 direct to master" 2018-05-23 09:36:16 +02:00
John Ericson acc9843691 llvm: Starting to fix Clang wrapping and stdenv building for cross 2018-05-23 00:42:47 -04:00
John Ericson 25e866a7fe treewide: Less {cc,bintools}-wrapper eta expansion
Also makes the LLVM ones more correct
2018-05-23 00:27:30 -04:00
John Ericson 07d73c4ab0 clangSelf, clangWrapSelf, llvmPackagesSelf: Remove this unused thing
It's old old LLVM built with new LLVM. How useless.
2018-05-23 00:27:30 -04:00
Peter Simons 0e35858252
Merge pull request #40929 from obsidiansystems/cross-ghc-for-master
ghc, haskell infra: #40642 direct to master
2018-05-22 20:37:45 +02:00
John Ericson 7ee4dc3b13 Merge remote-tracking branch 'obsidian/cross-ghc-for-master' into ios-mini-staging 2018-05-22 14:08:42 -04:00
John Ericson 2e903444d0 Merge branch 'binutils-always-patch' into ios-mini-staging 2018-05-22 13:37:32 -04:00
Tuomas Tynkkynen f9feacfc7c Merge remote-tracking branch 'upstream/master' into staging 2018-05-22 17:48:29 +03:00
xeji c29d2fde74
Merge pull request #40873 from peterhoeg/u/vala
vala: 0.36, 0.38 and 0.40 update point releases
2018-05-22 12:54:04 +02:00
Moritz Angermann 4b2eceaa35 ghc: fix dylib load command limits in compiler version 8.x
See https://phabricator.haskell.org/D4714 for the full details.
This will be part of ghc 8.6.

Closes https://github.com/NixOS/nixpkgs/pull/40877.
2018-05-22 10:32:17 +02:00
Peter Hoeg 015052f484 vala: drop 0.23 2018-05-22 12:02:12 +08:00
Peter Hoeg 9689754805 vala: 0.36, 0.38 and 0.40 point upgrades 2018-05-22 12:01:57 +08:00
John Ericson db4d77779c Merge remote-tracking branch 'upstream/master' into staging 2018-05-21 20:21:48 -04:00
John Ericson d6ecbbe921
Merge branch 'staging' into feature/clean-ghc 2018-05-21 17:43:30 -04:00
Moritz Angermann 4b48094285 ghc 8.4.2, head: Drop `libiconv` on windows.
nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
2018-05-21 15:11:12 -04:00
John Ericson 03602f8162 ghc 8.4.2, head: Adjust enableShared enableTerminfo for windows 2018-05-21 15:11:12 -04:00
Moritz Angermann 6af0c192d1 ghc: paxmark all unwraped executables across the board
Shell glob works even as the exact set of executable (filenames) varries
beween configuations.
2018-05-21 15:11:12 -04:00
John Ericson 8d2ce113d5 ghc: Handle flavors better 2018-05-21 15:11:12 -04:00
John Ericson 6f2f081b90 ghc: Normalize derivations 2018-05-21 15:11:12 -04:00
Euan T 95b1827682 nim: 0.17.2 -> 0.18.0 (#40556)
* Nim 0.17.2 -> 0.18.0

* Add missing dependencies for Nim 0.18.0

Solved GC and SFML-related test failures.
Attempting to download nimble packages.

* Fix tzdata test

* Fix tworkingdir test

* Replace outdated nodejs

* Disable non-runnable tests
2018-05-20 14:33:22 +01:00
Vladimír Čunát 392e6de7d0
Merge branch 'master' into staging 2018-05-20 13:20:53 +02:00
Thomas Mader e762dca831 dmd,dtools,dub: 2.079.0 -> 2.079.1 2018-05-19 23:17:30 +02:00
Thomas Mader 893ba5d1b8 ldc: wrap ldc2 binary with C compiler because it's needed for linking 2018-05-19 23:16:55 +02:00
Jack Cummings 2fe842a200 fix ghc bootstrap on non-nixos nonstd-storepath
Something goes amiss in the configurePhase and binaries start picking up
system binaries and everything falls apart. Patch the configure script
to use a bourne shell out of the store, and things are happier.

Closes https://github.com/NixOS/nixpkgs/pull/40691.
2018-05-19 22:24:31 +02:00
Matthew Justin Bauer 2c7c9cbbac
gcc5: delete unused patch 2018-05-19 12:06:16 -05:00
Robert Schütz 90c0100139 Merge branch 'master' into staging 2018-05-19 11:12:19 +02:00
Uli Baum bd6a3b2160 Revert "iasl: 20180313 -> 20180508 (#40613)"
Broke xen and virtualbox.
This reverts commit 5e49920d41.
2018-05-19 10:39:32 +02:00
Matthew Justin Bauer bd078c1a31
gcc5: remove patch
The patch fails to apply & may not be necessary any more. Trying to remove it for now just to see.

Hydra log: https://hydra.nixos.org/build/72726891/nixlog/1

Also see #33722

/cc @copumpkin
2018-05-18 17:03:35 -05:00
John Ericson 5ccb99e372 Merge remote-tracking branch 'upstream/master' into staging 2018-05-18 17:48:37 -04:00
Patrick Hilhorst 5e49920d41 iasl: 20180313 -> 20180508 (#40613) 2018-05-18 20:35:26 +02:00
Tuomas Tynkkynen 003473613a Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
Peter Simons b5cef2ea66
Merge pull request #40392 from ElvishJerricco/ghcjs-8.2
Ghcjs 8.2 & 8.4
2018-05-17 17:55:59 +02:00
Will Fancher 2dd3789d47 Bump GHCJS 8.4 2018-05-17 05:35:07 -04:00
Will Fancher 4eb49533cb Work around GHCJS bug with ghcjs-boot -j1 2018-05-17 05:27:38 -04:00
Will Fancher 7b405d3564 Remove -dcore-lint from GHCJS wrapper 2018-05-17 05:27:19 -04:00
Will Fancher 9c6e63ffda Expose bootGhcjs for convenience's sake 2018-05-17 05:27:03 -04:00
Will Fancher 2f6c9947fe Add pkgconfig to ghcjs boot 2018-05-17 05:26:48 -04:00
Will Fancher 2a32834ad9 Factor out bootGhcjs for justStaticExecutables sake 2018-05-16 03:11:33 -04:00
Will Fancher 9326126fdd Add gcc to configured-ghcjs-src for macos 2018-05-16 03:11:33 -04:00
Will Fancher 0f85049961 bump ghcjs 8.4 2018-05-16 03:11:33 -04:00
Will Fancher d86edd5161 Dont haddock ghcjs in either version 2018-05-16 03:11:32 -04:00
Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
Bastian Köcher 780592ca6e gcc7: Enable arm erratum 843419 on aarch64
This fix is required for the raspherry pi 3 with glibc 2.27,
otherwise the kernel panics in initrd with:
```
<<< NixOS Stage 1 >>>

loading module dm_mod...
running udev...
kbd_mode: KDSKBMODE: Inappropriate ioctl for device
Gstarting device mapper and LVM...
[    1.969164] Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b
[    1.969164]
[    1.978476] CPU: 0 PID: 1 Comm: init Not tainted 4.16.8 #1-NixOS
[    1.984580] Hardware name: Raspberry Pi 3 Model B (DT)
[    1.989801] Call trace:
[    1.992301]  dump_backtrace+0x0/0x1c8
[    1.996025]  show_stack+0x24/0x30
[    1.999396]  dump_stack+0x9c/0xc0
[    2.002766]  panic+0x124/0x294
[    2.005872]  complete_and_exit+0x0/0x30
[    2.009771]  do_group_exit+0x40/0xa8
[    2.013406]  get_signal+0x280/0x5b0
[    2.016954]  do_signal+0x88/0x240
[    2.020325]  do_notify_resume+0xd8/0x130
[    2.024311]  work_pending+0x8/0x10
[    2.027774] SMP: stopping secondary CPUs
[    2.031763] Kernel Offset: disabled
[    2.035308] CPU features: 0x0802004
[    2.038850] Memory Limit: none
[    2.041963] ---[ end Kernel panic - not syncing: Attempted to kill
init! exitcode=0x0000000b
[    2.041963]
[    2.865264] random: crng init done
```
Suse has done the same to circumvent crashes with hostname resolving in
glibc 2.27 on aarch64.
2018-05-16 03:04:29 +03:00
John Ericson 5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson 330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson de169a5950 Merge commit '3a9654bfe29ebd987b7426faa25f00af1fab02c5' into HEAD 2018-05-14 14:20:40 -04:00
John Ericson 01a525b84e Merge remote-tracking branch 'upstream/master' into staging 2018-05-14 13:31:20 -04:00
John Ericson bf7d1bae20 Merge remote-tracking branch 'upstream/master' into gcc-hurd-condition 2018-05-14 13:15:06 -04:00
John Ericson 3a9654bfe2 gcc: Simplify this old Hurd condition
Steps towards getting rid of crossConfig.
2018-05-14 13:13:11 -04:00
John Ericson d00cc1242f
Merge pull request #40040 from obsidiansystems/gnu-config-arm
gnu-config: Update, allowing hacks to be removed
2018-05-14 11:20:09 -04:00
John Ericson f2b575bd7b Merge remote-tracking branch 'upstream/master' into gnu-config-arm 2018-05-14 10:58:15 -04:00
John Ericson f472dd7652 Revert "Revert "gcc, binutils: Get rid of 32-bit ARM configure flag exception""
And there's more reverts too. The previous commmit
d838afbc9376bdadb8c690eb00b425f3eeccdf2d to gnu-config finally solves
it!

This reverts commit 3ed545ab31.
2018-05-14 10:55:32 -04:00
John Ericson 2c5d915200 Merge commit '92b7a814f26ee1d37e989431c18518c67285a332' into staging 2018-05-13 01:02:09 -04:00
Will Fancher 64df9b6b89 GHCJS 8.4 2018-05-12 17:48:30 -04:00
John Ericson 92b7a814f2 Merge branch 'fix-gcc-with-float' 2018-05-12 15:21:30 -04:00
John Ericson f2004e6287 lib: Fix float handling for Aarch32
Forgot to adjust default so abi with explicit float attr would be used.
2018-05-12 15:18:31 -04:00
R. RyanTM 9cf4d541de closurecompiler: 20180402 -> 20180506
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
- ran ‘/nix/store/qh5lv1f6c84mvndiivba30y3n3whw82j-closure-compiler-20180506/bin/closure-compiler --help’ got 0 exit code
- found 20180506 with grep in /nix/store/qh5lv1f6c84mvndiivba30y3n3whw82j-closure-compiler-20180506
- directory tree listing: https://gist.github.com/9013b4a27653c964fee876223f0b579b
2018-05-12 15:16:17 +02:00
Will Fancher c41675bce0 GHCJS 8.2 2018-05-12 01:54:42 -04:00
John Ericson ee4b56edd3 Merge remote-tracking branch 'upstream/master' into staging 2018-05-11 14:36:08 -04:00
John Ericson f18ddabee7 Merge remote-tracking branch 'upstream/master' into lib-float 2018-05-10 18:13:00 -04:00
John Ericson 1fe81a4bcd lib: Clean up float/fpu options
ARM ABIs now have a float field. This is used as a fallback to lessen
our use of `platform.gcc.float`. I didn't know what the MIPs convention
is so I kept using `platform.gcc.float` in that case.
2018-05-10 18:02:00 -04:00
John Ericson c9f6a82b61 gcc: Factor out "platform flags" 2018-05-10 18:00:57 -04:00
John Ericson 1d90ea9194
Merge pull request #40294 from obsidiansystems/no-crossAttrs
misc packages: Fewer crossAttrs
2018-05-10 14:38:58 -04:00
John Ericson c42118bb82 gcc: Get rid of crossAttrs
Only a little bit was left
2018-05-10 14:19:38 -04:00
John Ericson 42f6e7c4e4 Merge remote-tracking branch 'upstream/master' into staging 2018-05-10 12:04:17 -04:00
Peter Hoeg 468841cea4 owl-lisp: 0.1.14 -> 0.1.15 2018-05-10 22:28:09 +08:00
Frederik Rietdijk 64c8c6dcb3 Merge master into staging 2018-05-10 09:30:56 +02:00
Will Fancher 9dadb9e3cb Fix hsc2hs cross compiler build 2018-05-09 23:53:30 -04:00
Matthew Bauer 6748534d83 Merge remote-tracking branch 'upstream/master' into staging 2018-05-08 09:36:00 -05:00
Will Fancher 8012aee0a7 Don't enableShared in GHC when using android prebuilt 2018-05-07 23:57:31 -04:00
Will Fancher 0afb45d574 Set the C standard when building GHC
Should this be in cc-wrapper?
2018-05-07 23:57:31 -04:00
John Ericson 4f7cdd35d5
Merge pull request #40139 from obsidiansystems/modular-setup-hooks
treewide: Modular setup hooks
2018-05-07 15:32:10 -04:00
John Ericson 2110c0bd30 treewide: Use pkgs/build-support/roles.bash to remove copy pasta
Also fix some setup hooks that unnecessarily used environment hooks,
which revolted in the same variable being modified too many times.
2018-05-07 15:10:37 -04:00
Matthew Bauer e973188bcc souffle: fix on darwin
Fixes #39854
2018-05-07 00:17:49 -05:00
Matthew Justin Bauer c0a15d855e
Merge pull request #39894 from r-ryantm/auto-update/go
go: 1.10.1 -> 1.10.2
2018-05-07 04:24:29 +00:00