2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-13 17:23:08 +00:00
Commit Graph

49 Commits

Author SHA1 Message Date
John Ericson
b9bf90ca6c all-packages: Remove gccCrossStageFinal; any gcc will not work 2017-09-21 15:49:18 -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
a1a798f017 top-level: crossSystem is no longer exposed to packages. Use *Platform. 2017-01-24 11:37:56 -05:00
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
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from ) 2016-06-03 17:17:08 +03:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Eelco Dolstra
0645f5eab7 samba: Revert style changes and get rid of some dependencies
Packages like glusterfs are now optional dependencies. A bunch of
dependencies like subunit are gone: as far as I can tell, these are
only used by Samba's test suite, which we're not even running, so
they're pointless.

Fixes .
2015-06-01 15:35:59 +02:00
Petr Rockai
559f423417 gnu: Fix (evaluation of the) call to forceSystem. 2014-07-28 20:46:32 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
e2d505b24e More renames 2012-12-28 19:42:10 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
5be0a9acd7 Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms
"hostDrv" and "buildDrv" are not very intuitive, even if they're
consistent with GNU terminology).
2012-12-28 19:08:19 +01:00
Ludovic Courtès
40675e46bd GNU Hurd: Use preConfigure' to autoreconf' only.
svn path=/nixpkgs/trunk/; revision=33835
2012-04-18 18:42:44 +00:00
Ludovic Courtès
61bb81195f GNU Hurd: Restructure for easier overriding, and easier avoided rebuilds.
svn path=/nixpkgs/trunk/; revision=33834
2012-04-18 17:22:10 +00:00
Ludovic Courtès
e24eab9b87 GNU: Use `callPackage'.
svn path=/nixpkgs/trunk/; revision=33649
2012-04-06 13:18:58 +00:00
Ludovic Courtès
dd822c7ece GNU: Fix stale references.
svn path=/nixpkgs/trunk/; revision=33595
2012-04-04 21:24:09 +00:00
Ludovic Courtès
3226d8b91d GNU: Avoid `__overrides' altogether, by using a non-recursive attrset.
Thanks to Eelco for the suggestion.

svn path=/nixpkgs/trunk/; revision=33587
2012-04-04 20:25:51 +00:00
Ludovic Courtès
1663ca3344 GNU: Use overrides' instead of __overrides' for the argument itself.
svn path=/nixpkgs/trunk/; revision=33585
2012-04-04 20:05:48 +00:00
Ludovic Courtès
e0ca8e74ff GNU: Add an `__overrides' parameter.
svn path=/nixpkgs/trunk/; revision=33584
2012-04-04 19:50:15 +00:00
Ludovic Courtès
90b8995e04 GNU MIG: Add a raw' version, without forceSystem'.
svn path=/nixpkgs/trunk/; revision=33124
2012-03-15 20:28:07 +00:00
Ludovic Courtès
2e0ae13f68 GNU MIG: When cross-compiling, patch shebang correctly.
svn path=/nixpkgs/trunk/; revision=33123
2012-03-15 20:28:03 +00:00
Ludovic Courtès
9e2e08ba47 unionfs: Mark MIG as a native build input.
svn path=/nixpkgs/trunk/; revision=33122
2012-03-15 20:27:58 +00:00
Ludovic Courtès
97bd4b7b00 GNU MIG: Use `forceSystem' instead of the custom hack.
svn path=/nixpkgs/trunk/; revision=33121
2012-03-15 20:27:53 +00:00
Ludovic Courtès
e4f5ebb348 GNU MIG: Make it clear that the inputs are native.
svn path=/nixpkgs/trunk/; revision=33120
2012-03-15 20:27:49 +00:00
Ludovic Courtès
5d066bdbce GNU: SMBFS: Update.
svn path=/nixpkgs/trunk/; revision=33118
2012-03-15 20:27:35 +00:00
Ludovic Courtès
30c215a83a GNU: Add unionfs.
svn path=/nixpkgs/trunk/; revision=33054
2012-03-13 23:19:02 +00:00
Ludovic Courtès
313191412d GNU: SMBFS: Update.
svn path=/nixpkgs/trunk/; revision=32968
2012-03-10 10:51:21 +00:00
Ludovic Courtès
191fbf40bd GNU Mach: Update.
svn path=/nixpkgs/trunk/; revision=32861
2012-03-07 21:53:37 +00:00
Ludovic Courtès
bb08271aa6 SMBFS: Disable byte-range locking in Samba's TDB.
svn path=/nixpkgs/trunk/; revision=32732
2012-03-01 23:07:56 +00:00
Ludovic Courtès
3f523771bc Add SMBFS for GNU/Hurd.
svn path=/nixpkgs/trunk/; revision=32499
2012-02-23 00:01:29 +00:00
Ludovic Courtès
2d99f951be GNU Hurd: Update.
svn path=/nixpkgs/trunk/; revision=30478
2011-11-19 14:27:46 +00:00
Ludovic Courtès
0f6979f5b9 Move GNU/Hurd package attributes under `os-specific/gnu/default.nix'.
svn path=/nixpkgs/trunk/; revision=30173
2011-11-01 22:10:51 +00:00
Ludovic Courtès
08b5baee9a glibc/hurd: Update to latest Git; add dependency on pthread headers.
svn path=/nixpkgs/trunk/; revision=30172
2011-11-01 22:10:45 +00:00
Ludovic Courtès
9055a9b803 GNU MIG: Add the `noyywrap' option for Flex.
svn path=/nixpkgs/trunk/; revision=27494
2011-06-18 16:36:17 +00:00
Ludovic Courtès
730539086d GNU Hurd: Update.
svn path=/nixpkgs/trunk/; revision=27423
2011-06-11 22:23:22 +00:00
Ludovic Courtès
65e0e4dd68 GNU Hurd: Add dependency on Parted.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25089
2010-12-12 23:21:42 +00:00
Ludovic Courtès
d88cd100c9 GCC 4.5: Fix libpthread-related `LIB_SPEC' on GNU.
svn path=/nixpkgs/trunk/; revision=22610
2010-07-15 14:06:09 +00:00
Ludovic Courtès
9991b4f4c6 Cross-GNU: Fix Git revision names.
svn path=/nixpkgs/trunk/; revision=22278
2010-06-15 15:01:15 +00:00
Ludovic Courtès
4d2a82ab85 GNU Mach: Fix full build.
svn path=/nixpkgs/trunk/; revision=21994
2010-05-26 20:39:53 +00:00
Ludovic Courtès
883ab19eb4 GNU Mach: Add full build.
svn path=/nixpkgs/trunk/; revision=21986
2010-05-26 08:55:55 +00:00
Ludovic Courtès
620870eb0d GNU Hurd: Don't try to install files as `root'.
svn path=/nixpkgs/trunk/; revision=21915
2010-05-20 11:54:37 +00:00
Ludovic Courtès
e5571e9cd4 GNU Hurd: Add libpthread.
svn path=/nixpkgs/trunk/; revision=21900
2010-05-19 21:28:57 +00:00
Ludovic Courtès
2534ea88b1 GNU Hurd: Allow partial builds.
svn path=/nixpkgs/trunk/; revision=21899
2010-05-19 21:28:34 +00:00
Ludovic Courtès
89b9d2af52 GNU Mach, GNU Hurd: Add `-headers' in the name when asking for headers only.
svn path=/nixpkgs/trunk/; revision=21898
2010-05-19 21:28:28 +00:00
Ludovic Courtès
b9e28b8a8e GNU Hurd: Use the date as the version number.
svn path=/nixpkgs/trunk/; revision=21897
2010-05-19 21:28:14 +00:00
Ludovic Courtès
5cb28c179c GNU Mach: Use the date as the version number.
svn path=/nixpkgs/trunk/; revision=21896
2010-05-19 21:28:09 +00:00
Ludovic Courtès
5ecaa9ab32 GNU MIG: Move to `os-specific/gnu'.
svn path=/nixpkgs/trunk/; revision=21894
2010-05-19 21:27:53 +00:00
Ludovic Courtès
2d4fa8897e Add GNU Hurd (headers).
svn path=/nixpkgs/trunk/; revision=21751
2010-05-12 15:46:47 +00:00
Ludovic Courtès
5738f20c83 Add GNU Mach (headers).
svn path=/nixpkgs/trunk/; revision=21749
2010-05-12 15:46:38 +00:00