Commit graph

27454 commits

Author SHA1 Message Date
John Ericson bf17d6dacf top-level: Introduce buildPackages for resolving build-time deps
[N.B., this package also applies to the commits that follow it in the same
PR.]

In most cases, buildPackages = pkgs so things work just as before. For
cross compiling, however, buildPackages is resolved as the previous
bootstrapping stage. This allows us to avoid the mkDerivation hacks cross
compiling currently uses today.

To avoid a massive refactor, callPackage will splice together both package
sets. Again to avoid churn, it uses the old `nativeDrv` vs `crossDrv` to do
so. So now, whether cross compiling or not, packages with get a `nativeDrv`
and `crossDrv`---in the non-cross-compiling case they are simply the same
derivation. This is good because it reduces the divergence between the
cross and non-cross dataflow. See `pkgs/top-level/splice.nix` for a comment
along the lines of the preceding paragraph, and the code that does this
splicing.

Also, `forceNativeDrv` is replaced with `forceNativePackages`. The latter
resolves `pkgs` unless the host platform is different from the build
platform, in which case it resolves to `buildPackages`. Note that the
target platform is not important here---it will not prevent
`forcedNativePackages` from resolving to `pkgs`.

--------

Temporarily, we make preserve some dubious decisions in the name of preserving
hashes:

Most importantly, we don't distinguish between "host" and "target" in the
autoconf sense. This leads to the proliferation of *Cross derivations
currently used. What we ought to is resolve native deps of the cross "build
packages" (build = host != target) package set against the "vanilla
packages" (build = host = target) package set. Instead, "build packages"
uses itself, with (informally) target != build in all cases.

This is wrong because it violates the "sliding window" principle of
bootstrapping stages that shifting the platform triple of one stage to the
left coincides with the next stage's platform triple. Only because we don't
explicitly distinguish between "host" and "target" does it appear that the
"sliding window" principle is preserved--indeed it is over the reductionary
"platform double" of just "build" and "host/target".

Additionally, we build libc, libgcc, etc in the same stage as the compilers
themselves, which is wrong because they are used at runtime, not build
time. Fixing this is somewhat subtle, and the solution and problem will be
better explained in the commit that does fix it.

Commits after this will solve both these issues, at the expense of breaking
cross hashes. Native hashes won't be broken, thankfully.

--------

Did the temporary ugliness pan out? Of the packages that currently build in
`release-cross.nix`, the only ones that have their hash changed are
`*.gcc.crossDrv` and `bootstrapTools.*.coreutilsMinimal`. In both cases I
think it doesn't matter.

 1. GCC when doing a `build = host = target = foreign` build (maximally
    cross), still defines environment variables like `CPATH`[1] with
    packages.  This seems assuredly wrong because whether gcc dynamically
    links those, or the programs built by gcc dynamically link those---I
    have no idea which case is reality---they should be foreign. Therefore,
    in all likelihood, I just made the gcc less broken.

 2. Coreutils (ab)used the old cross-compiling infrastructure to depend on
    a native version of itself. When coreutils was overwritten to be built
    with fewer features, the native version it used would also be
    overwritten because the binding was tight. Now it uses the much looser
    `BuildPackages.coreutils` which is just fine as a richer build dep
    doesn't cause any problems and avoids a rebuild.

So, in conclusion I'd say the conservatism payed off. Onward to actually
raking the muck in the next PR!

[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html
2017-01-24 11:37:56 -05:00
Shea Levy 4f9f00fcc9 Add function to build a ghc standalone archive (OSX/iOS only) 2017-01-23 18:35:03 -05:00
Robert Helgesson df89b9b9e9
perl-MooX-Types-MooseLike-Numeric: 1.02 -> 1.03
Also remove myself from maintainers.
2017-01-23 21:22:53 +01:00
Robert Helgesson 653a7d97cb
perl-MooseX-Types-Common: 0.001013 -> 0.001014
Also remove myself from maintainers.
2017-01-23 21:22:53 +01:00
Tim Cuthbertson ca38ef79e9 add nix-prefetch-source (#21734) 2017-01-23 17:44:43 +00:00
Matthew Daiter cce6f35463 scotch: specify flex version 2017-01-23 13:58:08 +02:00
Franz Pletz e10cd27269
Merge branch 'staging' 2017-01-23 11:06:41 +01:00
Graham Christensen 13d6681ce7 release.nix: Only build Only build bootstrap tools when their system is supported 2017-01-23 00:08:21 +01:00
Alistair Bill 6a87904296 msgpack-tools: init at 0.6 2017-01-22 21:11:06 +00:00
Alistair Bill 15b4a37027 neofetch: init at 2.0.2 2017-01-22 21:46:31 +01:00
Franz Pletz 4d8dbb63d7
pythonPackages.libvirt: 2.5.0 -> 3.0.0 2017-01-22 13:01:03 +01:00
Franz Pletz 210f894c12
iptables: split out dev output 2017-01-22 13:01:01 +01:00
Charles Strahan d298a961f1 Merge pull request #21416 from cstrahan/mesos-1.1.0
mesos: 1.0.1 -> 1.1.0
2017-01-21 19:05:18 -05:00
Franz Pletz 3c49d9788c
signing-party: 2.2 -> 2.5, install all tools 2017-01-21 20:46:04 +01:00
Franz Pletz 61caacbf47
linux: 4.1.36 -> 4.1.38 2017-01-21 20:41:38 +01:00
Franz Pletz ce3b98d08b
linux: 3.18.45 -> 3.18.47 2017-01-21 20:41:36 +01:00
vbgl 664d1d6dc9 Merge pull request #21261 from vbgl/uutf-1.0.0
Eliom 6 and various OCaml package updates
2017-01-21 20:23:28 +01:00
Michael Raskin 46eecaf0d4 Merge pull request #21726 from rnhmjoj/palemoon
[WIP] palemoon: init at 27.0.3
2017-01-21 18:46:09 +00:00
Peter Simons 843de20898 Fix evaluation presumably broken in 754a9cf698 by @globin. 2017-01-21 18:28:13 +01:00
Robin Gloster 189f64d8e7
gnome3.20: fixup removal, mark termite as broken 2017-01-21 17:42:12 +01:00
Vincent Laporte 86b74fb76b alt-ergo: 0.99.1 -> 1.30 2017-01-21 13:44:41 +00:00
Ollie Charles 72a002f9d6 golden-cheetah: Switch to 3.4 stable 2017-01-21 12:26:30 +00:00
Jaka Hudoklin 4884fa4502 Merge pull request #20656 from vdemeester/docker_1_13
Update to docker 1.13.x
2017-01-21 12:19:06 +01:00
Vladimír Čunát 81d9893bcd
rpm-ostree: fix build by using older gperf for now 2017-01-21 09:20:02 +01:00
Daiderd Jordan 78c68f23d0 Merge pull request #21815 from deepfire/irony-server
irony-server:  init at irony version
2017-01-21 01:55:22 +01:00
Kosyrev Serge 7ceca3dbbc irony-server: init at 'same-version-irony-of-chosen-elpa` 2017-01-21 03:43:20 +03:00
Daiderd Jordan 66c0b9d292 Merge pull request #19361 from schneefux/gogs
gogs: init at v0.9.97
2017-01-20 20:47:38 +01:00
Carles Pagès 305e3e27b6 yafc: remove
Some things are broken and it's no longer maintained.
2017-01-20 16:55:30 +01:00
Vladimír Čunát 6b6553c768
Merge branch 'staging'
It contains security updates.  I somehow forgot to push this yesterday.
2017-01-20 16:33:59 +01:00
Franz Pletz 9b92a07843
treewide: use lib.maintainers for meta.maintainers 2017-01-20 15:44:28 +01:00
Robin Gloster ea7dadcaf6
pythonPackages.Pweave: disable broken tests 2017-01-20 15:39:14 +01:00
Shea Levy 0fdef7d2f1 4.9 is the latest longterm kernel.
https://lkml.org/lkml/2017/1/19/339
2017-01-20 09:34:19 -05:00
Michael Raskin c50361b91a Merge pull request #21997 from peterhoeg/f/diag
blockdiag: use version as part of name
2017-01-20 09:34:18 +00:00
Nikolay Amiantov d75a3cfb29 Merge pull request #21995 from abbradar/opencl
Fix OpenCL support
2017-01-20 12:09:17 +03:00
Graham Christensen cda11c958e
pythonPackages.pysaml2: patch against external XML entities (CVE-2016-10127) 2017-01-19 22:53:40 -05:00
Robin Gloster 7acadd6f9b
ardour{3,4}: remove due to build failures 2017-01-20 02:52:16 +01:00
Peter Hoeg 30597dd656 blockdiag: use version as part of name
All the other "diags" have the version as part of the name.
2017-01-20 09:15:34 +08:00
Nikolay Amiantov 1db8ab66e3 opencl-info: init at 2014-02-21 2017-01-20 03:37:51 +03:00
Nikolay Amiantov 5c65546725 opencl-clhpp: init at 2.0.10 2017-01-20 03:37:51 +03:00
Nikolay Amiantov 45c8c077ad beignet: 1.1.2 -> 1.2.1
Split unit tests to a separate package.
2017-01-20 03:37:51 +03:00
Nikolay Amiantov 10bae1a207 opencl-icd: remove, point to ocl-icd 2017-01-20 03:37:51 +03:00
schneefux a7f25fe167 php: add embedded package 2017-01-19 22:47:10 +01:00
Graham Christensen 003ae42ae6 packet: init at 20161215-2b8f07a
Signed-off-by: Robin Gloster <mail@glob.in>
2017-01-19 22:17:30 +01:00
Bjørn Forsman 1b5d5e3913 nmap-graphical: rename from nmap_graphical
Align attrpath and pkgname. Add backwards compatibility alias.
2017-01-19 20:12:28 +01:00
Jörg Thalheim 6762884a9a
python27Packages.jabberbot: init at 0.16 2017-01-19 19:10:23 +01:00
Jörg Thalheim 1708d4da13
python27Packages.xmpppy: fix ssl socket api 2017-01-19 19:10:16 +01:00
Robin Gloster 24038e6385
mysql-workbench: rename from mysqlWorkbench, add alias
fixes #21226
2017-01-19 16:41:30 +01:00
Jörg Thalheim 805e6804b1 Merge pull request #21873 from Mic92/python-packages
Dependencies for realms-wiki
2017-01-19 12:23:30 +01:00
Michael Raskin 7f2769ff62 Merge pull request #21983 from jonmeredith/master
Add yubioath-desktop application and required pyscard module
2017-01-19 09:35:52 +00:00
Michael Raskin 553ef5d3aa Merge pull request #21975 from lsix/update_python_celery
Update python celery
2017-01-19 09:34:34 +00:00