Commit Graph

116018 Commits

Author SHA1 Message Date
John Ericson
d349f9a340 cc-wrapper: Use stdenvNoCC to build
cc-wrapper may wrap a cc-compiler, but it doesn't need one to build
itself. (c.f. expand-response-params is a separate derivation.) This
helps avoid cycles on the cross stuff, in addition to removing a
useless dependency edge.

I could have been super careful with overrides in the stdenv to avoid
the mass rebuild, but I don't think it's worth it.
2017-09-26 14:08:21 -04:00
John Ericson
0d3d2a01d2 cc-wrapper: Add set -x tracing for NIX_DEBUG >= 7 2017-09-26 11:24:19 -04:00
John Ericson
f6fcb9bc0d stdenv: Turn on set -x if NIX_DEBUG >= 6
Why 6? It seems a decently high number, giving us room for more degrees
of debugging before the `set -x` sledgehammer without incurring a
mass-rebuild.
2017-09-26 11:24:19 -04:00
John Ericson
127a5f3357 treewide: Use (( "${NIX_DEBUG:-0}" >= 1) )) consistently 2017-09-26 11:24:19 -04:00
John Ericson
bc0aec5d97 doc: Document forthcomming NIX_DEBUG degredations 2017-09-26 11:24:19 -04:00
John Ericson
2d52156793 ghc prebuilt: Fix indentation
Doing this separately so the other commits are more readable
2017-09-23 12:58:07 -04:00
John Ericson
a8ef3f6742 ghc prebuilt: Clean up syntax, without changes hashes
If I'm going to make a bunch more of these, I think it's a good idea to
make them more uniform first.
2017-09-23 12:58:07 -04:00
John Ericson
17de435533 ghc prebuilt: Don't hardcode the version in a few more places
This removes noise in the diff, making creating new versions easier. No
hashes should be changed.
2017-09-22 19:53:29 -04:00
John Ericson
d72647bc05 ghc-6.10.2-binary: Remove dead Darwin code
This looks like a WIP attempt from 2008
2017-09-22 19:53:28 -04:00
John Ericson
b9bf90ca6c all-packages: Remove gccCrossStageFinal; any gcc will not work 2017-09-21 15:49:18 -04:00
John Ericson
88a0e55ce0 wrapCC: Alias now does the right thing for cross
Unfortunately this makes previously-barely-working overrides have
infinite recursion, so I had to reinstantiate gcc for gccCrossStageFinal
instead.
2017-09-21 15:49:18 -04:00
John Ericson
54282b9610 gcc: Change default of crossStageStatic param to false
This gets us one step closer to removing `gccCrossStageFinal`.

Care is taken to avoid a mass rebuild; will clean up with one later.
2017-09-21 15:49:18 -04:00
John Ericson
3af3d6efc2 stdenv cross adapater: Remove old extraBuildInputs
They, unlike their native counterparts, run on the wrong platform and
are therefore invalid.
2017-09-21 14:52:42 -04:00
John Ericson
05ef1034c7 stdenv cross adaptor: Add optional overrides parameter
By default, all previous overrides are discarded as before, as they
would only apply to the old host platform. But sometimes it is useful to
add some new ones, and this optional parameter allows that.
2017-09-21 14:52:07 -04:00
John Ericson
738bb4777c stdenv: Update autotools scripts on all Aarch64, not just Linux
This is needed when cross-compiling for iOS (Aarch64 + Darwin). I also
changed the syntax of the Linux stdenv for visual consistency, though
that has no effect on semantics as the os is already guaranteed to be
Linux.
2017-09-21 14:40:40 -04:00
John Ericson
8bfb247224 glibc: Grab the right linux headers when build != host
In #28519 / 791ce593ce I made linux
headers be intended to be used from the stage stage, as it would be if
it were a library containing headers and code. I forgot to update glibc,
however, so it was incorrectly using headers for the build platform, not
host platform.

This fixes that, basically reverting a small portion of changes I made a
few months ago in 25edc476fd and its
parent.

No native hashes are changed.
2017-09-20 20:57:41 -04:00
John Ericson
19e3c580ad Merge pull request #29584 from obsidiansystems/no-wrapCCCross
top-level: Remove useless abstractions
2017-09-20 01:25:02 -04:00
John Ericson
1fc12241ed all-packages: get rid of wrapCCCross
It's unneeded
2017-09-20 00:59:19 -04:00
John Ericson
e19bb868dc all-packages: Remove forcedNativePackages; we no longer need it
Its kept around in the Hurd package set, but all that code is
presumably broken.
2017-09-20 00:59:19 -04:00
John Ericson
100db4fa3b vim: Properly categorize pkgconfig dependency 2017-09-20 00:58:55 -04:00
Jörg Thalheim
c1de354a3d libwebsockets: revert making libuv a propagated build input
it is possible to use libwebsockets without libuv

cc @volth
2017-09-20 02:49:31 +01:00
Jörg Thalheim
87435a95f8 Merge pull request #29562 from LumiGuide/journalbeat-5.6.0
journalbeat: 5.5.0 -> 5.6.0
2017-09-20 02:44:40 +01:00
Jörg Thalheim
69224a2a8c Merge pull request #29582 from eqyiel/flow-0.55.0
flow: 0.54.0 -> 0.55.0
2017-09-20 02:33:19 +01:00
Peter Hoeg
f170dbe16f syncthing: 0.14.37 -> 0.14.38 2017-09-20 08:52:50 +08:00
Ruben Maher
1787043323 flow: 0.54.0 -> 0.55.0 2017-09-20 10:12:36 +09:30
Frank Doepper
28dd1158ff circumvent hdaps name clash 2017-09-19 23:57:28 +02:00
Frank Doepper
a3e806ef0f tp_smapi with hdaps 2017-09-19 23:57:28 +02:00
Jörg Thalheim
ad16a82b83 Merge pull request #29573 from disassembler/lenmus
lenmus: removing custom cmakeFlags
2017-09-19 22:24:02 +01:00
Jörg Thalheim
06de6d59b0 Merge pull request #29525 from aneeshusa/radicale_infcloud-init
radicale_infcloud: init
2017-09-19 22:22:16 +01:00
Thomas Tuegel
6e01011211 alacritty: respect pre- and post-hooks of overridden phases
Failing to `runHook` when overriding phases can have unpredictable results.

fixes #29572
2017-09-19 22:08:53 +01:00
Thomas Tuegel
a50d0b719f alacritty: install desktop icon 2017-09-19 22:08:52 +01:00
John Ericson
6c74ee68b9 cc-wrapper, cc-wrapper-old: Simplify shell logic
1. `crossDrv` is now the default so we don't need to worry about that in
   build != host builds.

2. shell is the build time shell, so `wrapCCCross` doesn't need to
   worry, as build == host.

3. `shell.shellPath` will always be appended where useful.

4. Complicated `shell == ""` logic served no purpose.
2017-09-19 16:45:24 -04:00
Jörg Thalheim
6d423da7cc libwebsockets: fix eval 2017-09-19 21:14:53 +01:00
Samuel Leathers
2c2252247c lenmus: removing custom cmakeFlags 2017-09-19 16:07:03 -04:00
Volth
6950da832d mosquitto: 1.4 -> 1.4.14
fixes #29567
2017-09-19 20:31:00 +01:00
volth
4916f64948 libwebsockets: 1.4 -> 2.3.0 2017-09-19 20:30:51 +01:00
Jörg Thalheim
28a53c8a08 Merge pull request #29570 from disassembler/libxmlxx
libxmlxx: move glibmm to propagatedBuildInputs
2017-09-19 20:16:59 +01:00
John Ericson
45e87854df Merge pull request #29571 from obsidiansystems/better-splice
stdenv: Also splice unlisted default "out" output
2017-09-19 15:11:53 -04:00
John Ericson
64aebc7679 stdenv: Also splice unlisted default "out" output
Otherwise, some cross builds will use the wrong type of dep.

This won't affect native builds, and perhaps no extant cross buids
either.
2017-09-19 14:48:23 -04:00
Samuel Leathers
367e30b8f3 libxmlxx: move glibmm to propagatedBuildInputs 2017-09-19 14:13:59 -04:00
Benjamin Staffin
7e6011083d slack: 2.7.1 -> 2.8.0 (#29339) 2017-09-19 12:26:58 -04:00
Aneesh Agrawal
a9f8207f9f radicale_infcloud: init 2017-09-19 08:20:39 -07:00
John Ericson
bc9f471997 Merge pull request #27797 from grahamc/fixed-lib
Convert libs to a fixed-point
2017-09-19 10:52:15 -04:00
Peter Simons
2439a83072 haskell.lib: strip trailing whitespace 2017-09-19 15:55:50 +02:00
Peter Simons
a8b69958cf haskell.lib: add doBenchmark helper function 2017-09-19 15:55:16 +02:00
Peter Simons
eab41cb7be hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.5-8-ga66a429 from Hackage revision
511efbfbe7.
2017-09-19 15:48:00 +02:00
Peter Simons
8231045fb4 LTS Haskell 9.5 2017-09-19 15:47:58 +02:00
Peter Simons
33e34aa95b haskell-generic-builder: rename withBenchmarkDepends argument to doBenchmark
This partially undoes the change from 8788bfe762.
The 'doBenchmark' name is more consistent with the naming scheme used for
other phases, like 'doCheck', 'doHaddock', etc.
2017-09-19 15:42:51 +02:00
Jörg Thalheim
11a4e90fbe Merge pull request #29563 from vdemeester/update-runc
runc: 1.0.0-rc3 -> 1.0.0-rc4
2017-09-19 12:59:06 +01:00
Robin Gloster
5c18c55062
dmtcp: fix buffer overflow due to too long ld-linux.so path
fixes #29565
2017-09-19 13:41:12 +02:00