Commit Graph

192698 Commits

Author SHA1 Message Date
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
4a0a297861 bintools-wrapper: Fix version 2019-11-24 17:57:06 +00:00
John Ericson
97baa2e21b doc: Fix and clarify allowInsecurePredicate example
I had made inbalanced parens. Remove unneeded parens for legibility too.
2019-11-24 17:36:17 +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
99537e994f {cc,bintools}-wrapper: use cc pname/version if set 2019-11-24 16:33:21 +00:00
John Ericson
84a105254d lib: Add getName to mirror getVersion 2019-11-24 16:24:50 +00:00
Craig Hall
62d6429793 gcc: Fix cross names
There was an issue with the dashes.

(taken from commit e158e113a6)
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
ca76436298 zstd: Fix MinGW build 2019-11-15 23:21:47 +00:00
John Ericson
774e88cd86 lz4: Fix MinGW build 2019-11-13 20:40:15 +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
dec8d2c5da openssl: Switch deafult for MinGW
Working around broken build 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
06c5e811e6 mcfgthreads: Init from git 2019-11-11 00:25:24 -05:00
John Ericson
0a63190c31 windows top-level: Clean up with makeScope 2019-11-11 00:25:24 -05:00
John Ericson
91718534f1 lib: Switch to w64 vendor for MinGW
It is needed for the `-municode` flag, supposedly.
2019-11-11 00:25:24 -05:00
John Ericson
38ebb8ff82 fetchurl: Eliminate pointless cross differences 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
John Ericson
3098d65210 lib: Add armv7a-linux to doubles.nix
This is needed for android.
2019-10-01 12:51:57 -04:00
Tim Steinbach
8a18c9f261
docker: 19.03.1 -> 19.03.2 2019-09-09 09:11:41 -04:00
Tim Steinbach
69796183b3
docker: 18.09.8 -> 18.09.9 2019-09-09 08:59:03 -04:00
Tim Steinbach
c51eaf4398
slack-theme-black: 2019-07-26 -> 2019-09-07 2019-09-09 08:46:37 -04:00
Tim Steinbach
5e3faee99f
oh-my-zsh: 2019-08-07 -> 2019-09-08 2019-09-09 08:46:35 -04: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
16203d6a8b
gnome-hexgl: unstable-2019-08-21 → 0.2.0
https://github.com/alexlarsson/gnome-hexgl/releases/tag/0.2.0
2019-09-09 14:02:09 +02: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
862e91dc6b
helm: 2.14.2 -> 2.14.3 2019-09-09 13:28:41 +02:00
worldofpeace
0428567444
Merge pull request #68345 from spacekookie/railcar-fixes
ociTools: fixing outdated documentation
2019-09-09 07:27:50 -04:00
zimbatm
bcc8db0298
kind: 0.3.0 -> 0.5.1 (#68319) 2019-09-09 13:12:59 +02:00
worldofpeace
137a90c691
Merge pull request #68336 from xrelkd/update/parity
parity, parity-beta: update cargoSha256 hashes
2019-09-09 07:08:46 -04:00
worldofpeace
e2b638df5f
Merge pull request #68330 from lilyball/ffsend-installShellFiles
ffsend: adopt installShellFiles
2019-09-09 06:53:50 -04:00
Elis Hirwing
eae0eb0892
Merge pull request #68344 from Izorkin/gixy
gixy: fix error - no module named pkg_resources
2019-09-09 11:27:08 +02:00
Maximilian Bosch
9fd9768c74
Merge pull request #68329 from lilyball/exa-installShellFiles
exa: adopt installShellFiles
2019-09-09 11:24:45 +02:00
worldofpeace
787eabd7c1
Merge pull request #68218 from worldofpeace/cups-pk/no-auth-wheel
nixos/cupsd: passwordless admin for wheel with polkit
2019-09-09 04:42:19 -04:00
Linus Heckemann
c8c04bc96c
Merge pull request #68310 from rnhmjoj/xkb
services.xserver.extraLayouts fixes
2019-09-09 10:19:58 +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