Commit Graph

41308 Commits

Author SHA1 Message Date
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
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
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
John Ericson
ab77a6bb1e gcc: Misc indentation and whitespace-in-string fixes 2017-11-14 18:32:50 -05:00
Ben Gamari
1c1207220f gcc: Refactor treatment of configure flags
Previously configureFlags was defined as one giant interpolated string.
Here we refactor this definition to instead use the usual stdenv string
combinators. This seems more in-line with the average nixpkgs expression
and it seems a bit more natural to things of these as lists of flags
rather than monolithic strings.
2017-11-14 16:23:46 -05:00
John Ericson
eaacf47ff4 binutils: Make myself a maintainer 2017-11-14 10:51:01 -05:00
John Ericson
f8741c38cd binutils, gdb: Do not expose libbfd or libopcodes, and be multitarget
There are separate derivations for these libraries and we don't want
conflict. Multitarget is generally more useful, and will eventually
speed up cross builds, so why not?!
2017-11-13 08:46:15 -05:00
John Ericson
e65259f00c LLVM: Get binutils plugin header from libbfd 2017-11-13 08:46:13 -05:00
John Ericson
d7bddc27b2 treewide: Try to avoid depending on binutils directly
One should depend on

 - `stdenv.cc.bintools`: for executables at build time
 - `libbfd` or `libiberty`: for those libraries
 - `targetPackages.cc.bintools`: for exectuables at *run* time
 - `binutils`: only for specifically GNU Binutils's executables, regardless of
   the host platform, at run time.
2017-11-13 00:47:48 -05:00
John Ericson
f72bffb4c4 eztrace: Misc cleanups
- Use nativeBuildInputs
  - Use libraries opcodes and bfd, rather than all of binutils
2017-11-13 00:47:48 -05:00
John Ericson
de28bd4832 bfd, opcodes: Init separate derivations for binutils libraries
On most distros, these are just built and distributed as part of
binutils. We don't use binutils across the board, however, but rather
switch between binutils and a cctools-binutils mashup, and change the
outputs on binutils too. This creates a combinatorial conditional soup
which is hard to maintain.

My hope is to lower the the state space. While my patch isn't the most
maintainable, they make downstream packages become more maintainable to
compensate. The additional derivations themselves are completely
platform-agnostic, always they always supports all possible target
platforms, and always yield "out" and "dev" outputs. That, in turn,
allows downstream packages to not worry about a dependency
shape-shifting under them.

In fact, the actual binutils package can avoid needing multiple outputs
now that these serve the requisite libraries, so that also can become
simpler on all platforms, too, removing the original wart this PR
circumnavigates for now. Actually changing the binutils package to
leverage is a mass rebuild, however, so I'll leave that for a separate
PR.

I do hope to upstream something like my patch too, but until then I'll
make myself maintainer of these derivations
2017-11-13 00:47:37 -05:00
John Ericson
c0a04ec2f5 libiberty: Add dev output 2017-11-13 00:30:53 -05:00
John Wiegley
9ea242c617
coqPackages.interval: Add bignums, now a required dependency 2017-11-12 10:21:56 -08:00
Vladimír Čunát
ab1859e027
Merge branch 'staging'
Hydra looks very good: https://hydra.nixos.org/eval/1409475?compare=1409440
There's mainly some fallout from aarch64-linux not building `go`
on the first attempt.
2017-11-12 19:08:05 +01:00
John Wiegley
a41478cebb
coqPackages.CoLoR: 1.3.0 -> 1.4.0, which now supports Coq 8.7 2017-11-12 10:03:32 -08:00
Vincent Laporte
16eef54eee
ocamlPackages.fileutils: 0.5.2 -> 0.5.3 2017-11-12 17:48:33 +00:00
John Wiegley
bb038283c4
coqPackages.metalib: New expression 2017-11-12 09:34:06 -08:00
John Wiegley
7d6d4af1d1
Add missing default.nix for coqPackages.equations 2017-11-12 09:33:40 -08:00
John Wiegley
dcab51c6f4
coqPackages.QuickChick: Update build for Coq 8.6 and 8.7 2017-11-12 09:17:48 -08:00
John Wiegley
f1fc74359f
coqPackages.ssreflect: Build version 0.6.4 for Coq 8.6 and 8.7 2017-11-12 08:50:37 -08:00
John Wiegley
b2418ca598
coqPackages.dpdgraph: Build version 0.6.2 for Coq 8.7 2017-11-12 08:50:36 -08:00
Orivej Desh
228dd9defb
Merge pull request #31550 from orivej/dbus-1
make-dbus-conf: prefer local build
2017-11-12 16:44:14 +00:00
Vincent Laporte
dd1a9fa915
ocamlPackages.nocrypto: remove spurious dependency on oasis 2017-11-12 10:19:56 +00:00
Vincent Laporte
d9dd5425b0
ocamlPackages.angstrom: remove spurious dependency on oasis 2017-11-12 10:14:51 +00:00
Vincent Laporte
45431bed57
ocamlPackages.ocaml_gettext: 0.3.5 -> 0.3.7 2017-11-12 10:14:50 +00:00
Frederik Rietdijk
74c92a341d
Merge pull request #31554 from xvapx/libnacl
pythonPackages.libnacl: 1.6.0 -> 1.6.1
2017-11-12 10:43:29 +01:00
Vincent Laporte
27d2eef21a
ocamlPackages.gen: 0.4.0.1 -> 0.5 2017-11-12 09:10:01 +00:00
Vincent Laporte
88389f43f7
ocamlPackages.containers: remove spurious dependency on oasis 2017-11-12 09:09:53 +00:00
Marti Serra
86ffe92e96 pythonPackages.libnacl: 1.6.0 -> 1.6.1 2017-11-12 09:49:14 +01:00
Orivej Desh
fb8d552026 make-dbus-conf: prefer local build 2017-11-12 03:52:21 +00:00
John Wiegley
462b5e0d21
coqPackages.mathcomp: 1.6.1 -> 1.6.4, for Coq versions 8.6 and 8.7 2017-11-11 09:44:55 -08:00
Renaud
3b647d7bbd
Merge pull request #31376 from c0bw3b/pkg/libtom
libtom{crypt,math}: update to 1.18.0 and 1.0.1 resp.
2017-11-11 18:11:14 +01:00
c0bw3b
a92dc4eae1 libtomcrypt: 1.17 -> 1.18.0 2017-11-11 17:57:49 +01:00
Renaud
ddd9ed949b libtommath: 1.0 -> 1.0.1 2017-11-11 17:57:49 +01:00
Vincent Laporte
0f144feb31
libtorrent-rasterbar: set meta.platforms to Unix 2017-11-11 16:56:15 +00:00