John Ericson
bc3a6e260a
Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix
2017-12-29 15:28:56 -05:00
John Ericson
5d336d36bb
Merge commit 'e82bd498d1a2a28fb20249569a6f49fcaab9aca8' into mingw32-w64-fix
2017-12-29 15:28:49 -05:00
John Ericson
169227bfd2
Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix
2017-12-29 14:24:10 -05:00
John Ericson
2365e2ffcd
Merge commit '51948eab9415fde1825dea5c7d31b99b2e1a0fdb' into mingw32-w64-fix
2017-12-29 14:23:05 -05:00
Bojan Nikolic
771bae04e8
gcc: Enable SSP and shared libs in the final stage for MinGW
...
Hardening on by default now that we don't use the cross wrapper. In
turn, hardening requires libssp in particular.
2017-12-29 13:27:02 -05:00
John Ericson
3afe325a3e
Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder
2017-12-07 02:19:04 -05:00
John Ericson
e82bd498d1
Merge commit '992bd2f6d34b2f560fc17df6fa3708fcade1abac' into gcc-modernize-builder
2017-12-07 02:13:24 -05:00
John Ericson
3a59cd87f2
Merge commit '93cd0685c5ac4d8f21d8586d3e5c45cd7394fab9' into gcc-modernize-builder
2017-12-07 01:49:31 -05:00
John Ericson
51948eab94
gcc: Fix after merge
...
- NIX_CC_CROSS is now completely gone!
- NIX_CC is defined reliably, so no manual def needed
- stdenv.ccCross -> stdenv.cc, also removing need for "or" fallback
2017-12-07 01:42:43 -05:00
John Ericson
974b9201a5
Merge commit 'c9ca54199409324101bdee38f5b16e7656a16a22' into gcc-modernize-builder
2017-12-07 01:42:35 -05:00
John Ericson
d96cf0f46c
gcc: Handle CPATH and LIBRARY_PATH purely in Nix
2017-12-06 19:12:51 -05:00
John Ericson
d4595b38e9
gcc: Modernize builder.sh for Cross
...
Instead of `NIX_CC` vs `NIX_CC_CROSS` spagetti, unconditionally use
`NIX_BUILD_CC` and `NIX_CC` in a consistent manner.
2017-12-06 19:12:50 -05:00
John Ericson
43d5c5d6db
Merge commit '703a9f93c1254f7bdf0350ca0462de0d78033c62' into gcc-simplify-flags
2017-12-05 17:58:16 -05:00
John Ericson
992bd2f6d3
Merge commit 'ab77a6bb1e7d2ff475210ad392f1a9bd1bb6ba3a' into gcc-simplify-flags
2017-12-05 17:41:15 -05:00
John Ericson
93cd0685c5
Merge commit '71186e73455a4e06e96a31da34b76f84e545ba1f' into gcc-simplify-flags
2017-12-05 17:09:41 -05:00
John Ericson
c9ca541994
Merge commit '198dceccbe5414a5fd72ca83624c0cc715db1aad' into gcc-simplify-flags
2017-12-05 16:55:11 -05:00
John Ericson
a3e35fbbe1
gcc: Use platformFlags in crossConfigureFlags
...
A nice code deduplication
2017-12-05 14:01:18 -05:00
John Ericson
1fe9798ac2
lib, gcc: No inherit (platform) gcc; in {host,build,target}Platform
2017-12-05 13:52:20 -05:00
John Ericson
74cbb5796e
gcc: Get rid of crossAttrs.configureFlags
2017-12-04 20:50:59 -05:00
John Ericson
cabfe1885f
gcc: Don't try to enable plugins with host != build
2017-12-04 16:27:18 -05:00
John Ericson
2fdca4db69
gcc: Lock down more tools for cross-builds
...
That is, build != host == target
2017-12-04 16:27:18 -05:00
Tuomas Tynkkynen
703a9f93c1
gcc6: Restore missing platform flags
...
This was missed in commit 1c1207220f
("gcc: Refactor treatment of configure flags"), all other GCC versions
have it right.
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
0f249a7354
gccSnapshot: Reduce diff to gcc7
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
d7a0695c43
gcc7: Reduce diff to gcc6
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
825b953bf5
gcc48: Reduce diff to gcc49
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
77b409b2cf
gcc49: Reduce diff to gcc5
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
aa3d195a30
gcc5: Reduce diff to gcc6
2017-11-29 23:09:16 +02:00
Orivej Desh
0c9ba0e149
Merge pull request #32173 from dtzWill/fix/qt48-parallel-patch-tabs
...
qt48: match whitespace in context of patch to better apply on @dtzWill's tree and maybe future nixpkgs too
2017-11-29 18:59:11 +00:00
Mateusz Kowalczyk
6f8601288b
bazel: 0.7.0 -> 0.8.0
2017-11-29 16:10:53 +00:00
Will Dietz
bfaf7ae5ae
qt48: use tabs in the Makefile patch
...
Fixes application of the patch to a differently configured Qt.
2017-11-29 15:29:31 +00:00
Tuomas Tynkkynen
fc26ff04b2
llvm: Include aarch64 patch in repo
...
The URL is already a dead link.
2017-11-29 17:01:17 +02:00
Jörg Thalheim
4654fb6aa5
Merge pull request #32157 from womfoo/init/yq-2.3.3
...
yq: init at 2.3.3
2017-11-29 13:05:48 +00:00
Orivej Desh
11520e812c
Merge pull request #32123 from kosta/master
...
brotli: 0.6.0 -> 1.0.1
2017-11-29 11:16:53 +00:00
Orivej Desh
6c82383370
libskk: fix build
2017-11-29 10:30:03 +00:00
Kranium Gikos Mendoza
131f48d0b1
yq: init at 2.3.3
2017-11-29 21:15:15 +11:00
Peter Simons
b58cb3fa28
ghc-8.2.2: drop obsolete gold linker patch
...
Pointed out by @basvandijk in b1a0f91afe .
2017-11-29 10:47:08 +01:00
Peter Simons
cf1e09013e
git-annex: update hash for new version 6.20171124
2017-11-29 10:47:07 +01:00
Peter Simons
f2dd899a67
hackage-packages.nix: automatic Haskell package set update
...
This update was generated by hackage2nix v2.7 from Hackage revision
7428a6b894 .
2017-11-29 10:47:03 +01:00
Peter Simons
98bf2860e4
hackage2nix: disable failing builds
2017-11-29 10:47:01 +01:00
Peter Simons
6610c3557d
hackage2nix: keep language-c-0.7.0 around in the package set for c2hs hack
2017-11-29 10:45:36 +01:00
Orivej Desh
a88146d308
qt4: fix parallel building of moc_qtgradientviewdialog.o
...
Previously the last of these commands:
```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```
failed with this error:
```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```
because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
2017-11-29 09:08:44 +00:00
Orivej Desh
8b0ef2a564
qt4: enable parallel building in the configure phase
2017-11-29 09:06:42 +00:00
Vladimír Čunát
5f020d5627
Merge branch 'staging'
...
There are security fixes in multiple packages /cc #32117 ,
so I'm merging a little earlier, with a few thousand jobs
still not finished on Hydra for x86_64-darwin and aarch64-linux.
2017-11-29 10:02:40 +01:00
Orivej Desh
00ced68a9e
lua5_1: provide version
2017-11-29 03:01:15 +00:00
Daiderd Jordan
d7039d5029
libmpack: fix darwin build
...
On darwin we need the correct prefix during the buildPhase, otherwise
the dynamic libraries have an incorrect install_name.
2017-11-29 02:38:16 +00:00
Mike Playle
3aecf95548
libamqpcpp: init at 2.7.4
2017-11-29 01:54:32 +00:00
Orivej Desh
db0c2be112
Merge pull request #32118 from crawford/ct
...
container-linux-config-transpiler: 0.4.1 -> 0.5.0
2017-11-29 01:04:26 +00:00
Orivej Desh
0238e5ca93
Merge pull request #32108 from yuriaisaka/pr-libskk-init
...
libskk: init at 1.0.2
2017-11-29 01:03:40 +00:00
Orivej Desh
e8b6a11aba
libbrotli: delete
...
Its functionality was incorporatad into brotli.
2017-11-29 00:59:46 +00:00
Orivej Desh
486625e0fe
libbrotli: 1.0 -> 1.0.1.2017-10-30
2017-11-29 00:59:46 +00:00