Commit Graph

69067 Commits

Author SHA1 Message Date
John Ericson ea9a2c5ec2 haskell genenric-builder: Make the C compiler optional
This is GHCJS, and perhaps other obscure targets.
2019-11-25 00:12:39 +00:00
John Ericson 63bd851e95 stdenv: Introduce hasCC attribute
Before, we'd always use `cc = null`, and check for that. The problem is
this breaks for cross compilation to platforms that don't support a C
compiler.

It's a very subtle issue. One might think there is no problem because we
have `stdenvNoCC`, and presumably one would only build derivations that
use that. The problem is that one still wants to use tools at build-time
that are themselves built with a C compiler, and those are gotten via
"splicing". The runtime version of those deps will explode, but the
build time / `buildPackages` versions of those deps will be fine, and
splicing attempts to work this by using `builtins.tryEval` to filter out
any broken "higher priority" packages (runtime is the default and
highest priority) so that both `foo` and `foo.nativeDrv` works.

However, `tryEval` only catches certain evaluation failures (e.g.
exceptions), and not arbitrary failures (such as `cc.attr` when `cc` is
null). This means `tryEval` fails to let us use our build time deps, and
everything comes apart.

The right solution is, as usually, to get rid of splicing. Or, baring
that, to make it so `foo` never works and one has to explicitly do
`foo.*`. But that is a much larger change, and certaily one unsuitable
to be backported to stable.

Given that, we instead make an exception-throwing `cc` attribute, and
create a `hasCC` attribute for those derivations which wish to
condtionally use a C compiler: instead of doing `stdenv.cc or null ==
null` or something similar, one does `stdenv.hasCC`. This allows quering
without "tripping" the exception, while also allowing `tryEval` to work.

No platform without a C compiler is yet wired up by default. That will
be done in a following commit.
2019-11-25 00:12:38 +00:00
John Ericson 5858d7229a ghcjs-ng: The GHC source should be configured with native build inputs
This matters once we start treating GHCJS as cross compilation, as we
should be.
2019-11-24 23:08:47 +00:00
John Ericson 9b090ccbca treewide: Get rid of most `parseDrvName` without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Craig Hall 62d6429793 gcc: Fix cross names
There was an issue with the dashes.

(taken from commit e158e113a6b74f6cd0e1de9e976b882a03714bf8)
2019-11-24 05:18:50 +00:00
John Ericson 069e9fd449 rocksdb: Fix MinGW Build 2019-11-23 01:25:03 +00:00
mb c9453387da rocksdb: 6.2.2 -> 6.2.4
(cherry picked from commit 0cd88820b3)
2019-11-23 01:25:03 +00:00
John Ericson ed56d04c8e snappy: Builds with MinGW just fine! 2019-11-13 00:28:59 +00:00
John Ericson c8cf55215a rocksdb: Improve condition 2019-11-13 00:28:59 +00:00
John Ericson 903bdf1709 GCC 6: Fix java support
Major version upper bound was one too low.
2019-11-12 09:56:43 -05:00
John Ericson 63eac67319 nghttp2: Fix MinGW build by skipping some optional deps
I think those deps could be made to build, but I didn't want to get
bogged down investigating further. "Use flags" are always a good thing,
so this is fine for now.
2019-11-11 14:10:02 -05:00
John Ericson e00237e790 boehm-gc: Fix build on MinGW with mcfgthreads
CC @lhmouse
2019-11-11 14:10:01 -05:00
John Ericson 89ec69e25e pcre: Skip winpthread dep
Seems to build just fine without it, maybe it was just using C++ threads
which mcfgthread provides?
2019-11-11 11:02:39 -05:00
John Ericson 04cb05d20c gcc: Build MinGW stage two with threading library
Currently this is set up to be mcfgthreads, but it could be something
else instead.
2019-11-11 11:02:38 -05:00
John Ericson 999ef20129 mingw-w64 libc: Multiple outputs and parallel builds
Also deduplicate more of the GCC derivations.
2019-11-11 00:25:24 -05:00
John Ericson 3f74a4d066 gcc: Fix cross after I accidentally changed build target
I deleted "bootstrap", but forgot to make the condition
build = host = target.
2019-11-10 17:06:22 -05:00
John Ericson 5c5ca018c8 gcc: Deduplicate `configureFlags`
Thanks again to @bgamari who in 1c1207220f
did the cleanup to make this possible. It's been a long time coming!
2019-11-10 15:58:35 -05:00
John Ericson f666c61d20 gcc: Deduplicate preConfigure 2019-11-10 15:15:04 -05:00
John Ericson ca341c2d5b gcc: Clean up cross configure flags and name prefix 2019-11-10 14:29:11 -05:00
Jörg Thalheim 779cde20bd
python.pkgs.MySQL_python: remove (#68354)
python.pkgs.MySQL_python: remove
2019-09-09 13:39:45 +01:00
worldofpeace d7f1f19f2c
Merge pull request #68352 from jtojnar/gthree-0.2.0
gthree: unstable-2019-08-21 → 0.2.0
2019-09-09 08:25:01 -04:00
Jörg Thalheim 4a53284bc0
python.pkgs.MySQL_python: remove
Reasons:

- No release since 2014
- deprecated by upstream
- no longer compatible with newer libmysql versions
2019-09-09 13:18:07 +01:00
Jan Tojnar 5fe42dde52
gthree: unstable-2019-08-21 → 0.2.0
https://blogs.gnome.org/alexl/2019/09/09/gthree-ready-to-play/
https://github.com/alexlarsson/gthree/releases/tag/0.2.0
2019-09-09 14:02:08 +02:00
Jan Tojnar bf96e6da6d
graphene: 1.9.6 → 1.10.0 2019-09-09 14:01:22 +02:00
zimbatm bcc8db0298
kind: 0.3.0 -> 0.5.1 (#68319) 2019-09-09 13:12:59 +02:00
Frederik Rietdijk 0107ee8c32
Merge pull request #68339 from NixOS/staging-next
Staging next with systemd 243
2019-09-09 10:02:20 +02:00
Domen Kožar 98c17a68e7
cachix: fix build 2019-09-09 09:52:29 +02:00
Marek Mahut c55ff13fea
Merge pull request #68245 from jonringer/bump-grabserial
grabserial: 1.9.3 -> 1.9.8
2019-09-09 09:02:43 +02:00
Marek Mahut b7d6a11159
Merge pull request #68252 from jluttine/eth-typing-2.1.0
eth-typing: 2.0.0 -> 2.1.0 and eth-utils: 1.4.1 -> 1.7.0
2019-09-09 09:02:24 +02:00
Peter Hoeg 65fb1a053f
Merge pull request #67498 from peterhoeg/f/xxdiff
xxdiff: drop the old qt4 version in favour of qt5
2019-09-09 14:44:19 +08:00
Frederik Rietdijk e3f25191c4 Merge staging-next into staging 2019-09-09 08:11:34 +02:00
Frederik Rietdijk 731c82a447
Merge pull request #68244 from NixOS/staging-next
Staging next that includes gcc8
2019-09-09 08:09:36 +02:00
Peter Hoeg c78216067b xxdiff: drop the old qt4 version in favour of qt5 2019-09-09 13:13:54 +08:00
Jörg Thalheim 21f61dde0d
nemiver: clean up (#68333)
nemiver: clean up
2019-09-09 06:03:39 +01:00
Jörg Thalheim 4d6a6fe8af
Merge pull request #68335 from lopsided98/jemalloc450-disable-thp
jemalloc450: disable transparent huge pages on ARM
2019-09-09 05:45:20 +01:00
Matthieu Coudron 59d65e23e1
Merge pull request #68258 from teto/luarocks-nix_bump
Moved luarocks-nix to community and leverage luarocks mirrors when possible.
2019-09-09 12:41:54 +09:00
Ben Wolsieffer adf5ca2ce0 jemalloc450: disable transparent huge pages on ARM 2019-09-08 22:57:32 -04:00
Orivej Desh e19054ab3c python3Packages.django_2_2: 2.2.4 -> 2.2.5 2019-09-09 01:18:55 +00:00
Jan Tojnar 3cdc583dd1
nemiver: rename from gnome3.nemiver 2019-09-09 02:06:57 +02:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Florian Klink 652448f25b python.pkgs.scikits-odes: init at 2.4.0-9-g93075ae 2019-09-08 16:03:23 -07:00
Florian Klink a5de10b0af sundials: include patch to remove flakiness
The provided patch doesn't apply cleanly on sundials_3 (no
SundialsTesting.cmake, SundialsAddTest.cmake containing trailing
whitespaces inside context), so for now we just disable tests for
sundials_3 - scikits-odes plans to move to sundials 4 anyways - see
https://github.com/bmcage/odes/pull/106.
2019-09-08 16:03:07 -07:00
Dominic Steinitz ac12bdfc96 sundials: relax tolerance for test_sunmatrix_sparse
This test fails on MacOS otherwise, due to slightly different math.

Only add for sundials 4, it's not in sundials_3 yet.
2019-09-08 16:03:07 -07:00
Florian Klink 7e9e22f4d5 sundials_3: init at 3.2.1
That's needed for scikits.odes.
Upstream bug to migrate to sundials 4:
https://github.com/bmcage/odes/issues/98
2019-09-08 15:15:09 -07:00
Florian Klink 5f48e89f37 sundials: add lapack support 2019-09-08 15:15:08 -07:00
Florian Klink ad3023e5f7 sundials: enable tests 2019-09-08 15:15:08 -07:00
Florian Klink d9ce716ccc sundials: use cmakeFlags 2019-09-08 15:15:08 -07:00
Frederik Rietdijk b5284a56d9 asn2quickder: fix build 2019-09-08 22:48:47 +02:00
Frederik Rietdijk 4b929acf67 Merge staging-next into staging 2019-09-08 22:33:17 +02:00
Frederik Rietdijk ee1b8e4c7b python2.pkgs.wxPython: fix build 2019-09-08 22:09:42 +02:00