Commit Graph

124498 Commits

Author SHA1 Message Date
John Ericson
133b4658df treewide: Simplify some doCheck calls
In anticipation of what I outline in #33599, I only simplify exactly those
`doCheck`s which are equal to `hostPlatform != buildPlatform`. I also stick a
comment next to them so I can grep for them later.
2018-01-09 12:37:38 -05:00
John Ericson
4e907dbca1 stdenv: Force doCheck and doInstallCheck to be false when we are cross compiling
I hope this will be a temporary measure. If there is consensus around
issue #33599, then we can follow an explicit `dontCheck`, but default to
not checking during cross builds when none is given.
2018-01-09 12:37:12 -05:00
Ben Gamari
b2cbffae64 nixos/security-wrapper: Fix cross-compilation 2018-01-09 11:25:19 -05:00
Ben Gamari
6f8cb301a9 ms-sys: Fix cross-compilation 2018-01-09 11:25:19 -05:00
Ben Gamari
7ed923f9d8 mdadm: Fix cross-compilation 2018-01-09 11:25:19 -05:00
Ben Gamari
ac19f60c93 ddrescue: Enable cross-compilation 2018-01-09 11:25:19 -05:00
Ben Gamari
a2215da9a1 make-ext4-fs: Dependencies are nativeBuildInputs 2018-01-09 11:25:19 -05:00
Ben Gamari
d680678d0a makeSquashfs: Inputs are nativeBuildInputs 2018-01-09 11:25:19 -05:00
Ben Gamari
6db707fe7e pkgconfig: Enable cross-compilation
(cherry picked from commit 91fdb2f9caf5ce14acb87f3b877216aeb2590e7e)
2018-01-09 11:23:56 -05:00
Ben Gamari
bef09dcca1 krb5: Allow cross-compilation 2018-01-09 11:23:56 -05:00
Will Dietz
681555c11c lua-5: isMingw -> isMinGW 2018-01-09 11:23:56 -05:00
Will Dietz
7c992cb7af bsdiff: fix 'cc' usage 2018-01-09 11:23:56 -05:00
Will Dietz
a23be78ef2 at: cross-compilation fixes
* move bison/flex to nativeBuildInputs
* add patch to avoid use of undocumented glibc macro
* fix use of 'install -s' to avoid invoking 'strip' directly
2018-01-09 11:23:56 -05:00
Ben Gamari
dc8bd43249 readline: Don't attempt to check for broken wcwidth
The test requires running code on the target.
2018-01-08 02:55:08 -05:00
John Ericson
bb414f4851 Merge commit '0e3be42' into ericson2314-cross-master 2018-01-08 02:36:34 -05:00
John Ericson
ec2f121bed ghcWithPackages: Fix comment URL 2018-01-04 14:49:52 -05:00
John Ericson
dea9fceb0b ghcWithPackages: Get rid of unused passthrough
If you want the whole packages set...don't use ghcWithPackages.
2018-01-04 14:49:50 -05:00
John Ericson
6bdf9a7f6d ghcWithPackages: Don't bother with ignoreCollisions cause we don't use buildEnv
SymlinkJoin doesn't know or care about this.
2018-01-04 11:45:36 -05:00
John Ericson
0e23478a7e Merge commit '9361b7eb85045c7e7dd20d2ddd716a9d10bf4bd4' into ericson2314-cross-base 2018-01-03 17:20:40 -05:00
John Ericson
3fb5fd0060 ghc: Normalize derivations in hash-preserving ways 2018-01-03 17:04:19 -05:00
John Ericson
0df29e1259 ghc: Noramlized source URLs 2018-01-03 17:04:19 -05:00
Bojan Nikolic
35462db2e3 Correct boost configure phase when enablePython is false
The bootstrap script does not seem to have --without-python; instead
just omit --with-python option
2018-01-03 16:57:49 -05:00
John Ericson
5e31e828f8 ghcWithPackages: Fix cross, and avoid needless C compiler 2018-01-03 01:24:57 -05:00
John Ericson
bc066466fb haskell generic-builder: Don't use absolute path to tools, and also track strip 2018-01-02 21:04:14 -05:00
John Ericson
faa4b45a1e ghc 8.2.2, head: Inline common* bindings
Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
2018-01-02 21:00:23 -05:00
John Ericson
a224dfc253 haskell infra: Fix cross as much as possible without changing hashes 2018-01-02 21:00:13 -05:00
John Ericson
a5cc983c45 ghc: Clean up, and add passthru.targetPrefix, in preparation for cross
No hashes should be changed.
2018-01-02 19:50:38 -05:00
John Ericson
e3993464d9 Merge commit 'db475df127f8c82853181c46501c142ff020c3d8' into ericson2314-cross-base 2018-01-02 19:50:28 -05:00
Bojan Nikolic
00b038a3f8 boost: Do not force numpy support from 1.65
The reason is that if cross compiling (or for other reasons) python
bindings as a whole are turned off. Those two lines then trigger
assertion errors unless manually overridden for cross compilation.

This way:

 1. The `enableNumpy` default respects the `enablePython deafult.
 2. Cross works by default
 3. Absurd manual overrides still break as they should
 4. The `>= 1.65` logic is direct and not a maintaince gotcha.
2018-01-02 19:31:25 -05:00
John Ericson
0e3be421e3
Merge pull request #33357 from bnikolic/mingw64-pthreads
Correct derivation of pthreads on mingw64
2018-01-02 19:10:59 -05:00
Bojan Nikolic
db475df127 mingw-w64-pthreads: The C compiler is needed
It was a copy and paste error from the headers derivation. Also test in
release-cross.
2018-01-02 19:01:18 -05:00
John Ericson
cb8349f59f Merge branch 'pharo' into ericson2314-cross-base 2018-01-02 18:59:21 -05:00
John Ericson
2b4502c78e Merge @LnL7's pharo-vm darwin eval fix from staging
Not a mass-rebuild
2018-01-02 18:54:35 -05:00
John Ericson
0bc1642fb8
Merge pull request #26883 from obsidiansystems/linux-make-bootstrap-tools
linux bootstrap tools: Use same derivation whether cross compiling or not
2018-01-02 18:31:37 -05:00
adisbladis
74ac6b5fe6
Merge pull request #33351 from jluttine/update-rssguard-3.5.5
rssguard: 3.4.2 -> 3.5.5
2018-01-02 23:52:05 +01:00
José Romildo Malaquias
b33b4a76de xkbmon: init at 0.1 2018-01-02 23:42:02 +01:00
Will Dietz
d8141bc059 irker: cleanup manual setting of XML_CATALOG_FILES, no longer needed 2018-01-02 22:40:39 +01:00
Jörg Thalheim
cb92075daf
Merge pull request #33339 from romildo/upd.pnmixer
pnmixer: 0.7.1 -> 0.7.2
2018-01-02 21:40:21 +01:00
Jaakko Luttinen
b68156006a
rssguard: 3.4.2 -> 3.5.5 2018-01-02 22:16:22 +02:00
Drew Hess
9361b7eb85
ghc: bootstrap 8.2.2 with 8.2.1-binary. 2018-01-02 12:15:16 -08:00
Ryan Trinkle
f1a6fa6eec
Merge pull request #32258 from ryantrinkle/add-nat-extraCommands
nat: add extraCommands option
2018-01-02 14:32:42 -05:00
John Ericson
ab651d2c9b linux bootstrap tools: Use same derivation whether cross compiling or not 2018-01-02 13:52:41 -05:00
José Romildo Malaquias
e80b27f383 pnmixer: 0.7.1 -> 0.7.2 2018-01-02 16:29:16 -02:00
Daiderd Jordan
1531fd7351
pharo: disable on darwin 2018-01-02 19:19:37 +01:00
Frederik Rietdijk
58f9fd64ef
Merge pull request #33338 from matthiasbeyer/update-toot
toot: 0.15.0 -> 0.16.2
2018-01-02 19:19:16 +01:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Matthias Beyer
b222e44f0a toot: 0.15.0 -> 0.16.2 2018-01-02 19:06:21 +01:00
Yegor Timoshenko
63c1a54257
Merge pull request #33213 from wchresta/master
steam: add wrapper testing for libGL
2018-01-02 21:03:28 +03:00
Uli Schlachter
5465d6f7de awesome: Use --search instead of $LUA_PATH/$LUA_CPATH
Instead of polluting the environment with environment variables which
are inherited by processes spawned from awesome, use the command line
argument "--search" to add things to the search path.

cc #33169
2018-01-02 17:24:56 +00:00
Peter Simons
c98eb9e9b9
Merge pull request #33333 from shlevy/haskell-internal-libs-darwin
haskell: Fix depending on libs with internal libs on darwin.
2018-01-02 17:41:39 +01:00