Vladimír Čunát
98c7e70a3f
linux stdenv bootstrap: avoid building grep twice
...
It's perfectly enough when we use the bootstrapped grep everywhere
except the one put into the final stdenv and final pkgs.
2016-01-25 09:55:00 +01:00
Anthony Cowley
5986aecc4c
Linux stdenv update: pass gnugrep to cc-wrapper
2016-01-24 00:18:32 -05:00
Anthony Cowley
d96893647d
cc-wrapper: fix on darwin
...
The ld-wrapper.sh script calls `readlink` in some circumstances. We need
to ensure that this is the `readlink` from the `coreutils` package so
that flag support is as expected.
This is accomplished by explicitly setting PATH at the top of each shell
script.
Without doing this, the following happens with a trivial `main.c`:
```
nix-env -f "<nixpkgs>" -iA pkgs.clang
$ clang main.c -L /nix/../nix/store/2ankvagznq062x1gifpxwkk7fp3xwy63-xnu-2422.115.4/Library -o a.out
readlink: illegal option -- f
usage: readlink [-n] [file ...]
```
The key element is the `..` in the path supplied to the linker via a
`-L` flag. With this patch, the above invocation works correctly on
darwin, whose native `/usr/bin/readlink` does not support the `-f` flag.
The explicit path also ensures that the `grep` called by `cc-wrapper.sh`
is the one from Nix.
Fixes #6447
2016-01-19 17:47:11 -05:00
Vladimír Čunát
620c147cce
Merge branch 'master' into staging
2016-01-18 09:48:49 +01:00
Dan Peebles
edaf46fb64
stdenv-darwin: add parent attribute to bootstrap
...
This makes it far easier than before to hit/test early stages of the
stdenv bootstrap.
2016-01-16 14:54:11 -05:00
Eelco Dolstra
81e530a749
Set SOURCE_DATE_EPOCH to latest source file
...
This provides a timestamp that's more useful than 1970-01-01 yet still
deterministic.
2016-01-05 17:21:48 +01:00
Eelco Dolstra
f31fbadac3
Set a fallback default value for SOURCE_DATE_EPOCH
...
This is used by some build tools to provide reproducible builds. See
https://reproducible-builds.org/specs/source-date-epoch/
for more info.
Later, we'll want to set this to a more intelligent value (such as the
most recent mtime of any source file).
2016-01-05 17:21:48 +01:00
Vladimír Čunát
b1acaffe67
Merge branch 'master' into staging
2016-01-05 10:28:58 +01:00
Vladimír Čunát
7c879d342d
Merge #10816 : improve FreeBSD support
2016-01-05 09:50:10 +01:00
Vladimír Čunát
1ebff73b88
stdenv/setup.sh: don't skip post-hooks ( close #12032 )
...
So far if no configure script is found or no makefile,
the rest of the phase is skipped, *including* post-hooks.
I find that behavior unexpected/unintuitive.
Earlier version of this patch had problems due to me assuming
that $configureScript is always a simple path, but that turned out
to be false in many cases, e.g. perl.
2016-01-05 09:34:02 +01:00
Dan Peebles
0313b2e09c
stdenv-darwin: allow easier testing of bootstrap tools
...
This un-hardcodes the bootstrap tools passed into the Darwin stdenv and
thus allows us to quickly iterate on improving the design of the full
bootstrap process. We can easily change the contents of the bootstrap
tools and evaluate an entire bootstrap all the way up to real packages.
2016-01-03 21:47:09 -05:00
Dan Peebles
88c41e1f95
stdenv-darwin: rename folder and associated attribute
...
No point in calling it pure-darwin anymore. It's the only stdenv we have
2016-01-03 21:08:40 -05:00
Dan Peebles
01b0b3cec0
stdenv-darwin: kill old impure Darwin stdenv
...
I'll be moving the other one over it next commit (I split it into two to
improve git's rename detection)
2016-01-03 21:06:24 -05:00
janus
072da541de
FreeBSD: undo removal of Solaris and remove changes to native stdenv now that FreeBSD has its own
2016-01-01 17:01:13 +00:00
janus
3c8f0a92d3
FreeBSD: improve bootstrapping, re-enable bdb for heimdal
2016-01-01 17:01:13 +00:00
janus
55aa9163cc
FreeBSD: minor fixes, add notes and make stdenv more robust
2016-01-01 17:01:13 +00:00
janus
a472d836f6
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
2016-01-01 17:01:13 +00:00
janus
9897b35661
FreeBSD: patch expat, kerberos, libedit, ossp-uuid, lz4, sharutils, add libelf-freebsd
2016-01-01 17:01:13 +00:00
janus
f351aaaf85
FreeBSD: use own stdenv, do not run libtiff tests, use PIC for zlib
2016-01-01 17:01:13 +00:00
janus
2d00f27230
FreeBSD: use clang37
2016-01-01 17:01:13 +00:00
janus
c01dbc4932
FreeBSD patches for GNU m4, stdenv, miniupnpc
2016-01-01 17:01:13 +00:00
Dan Peebles
527f3574b7
stdenvBootstrapTools.x86_64-darwin: unbreak
...
This is blocking Hydra from updating the nixpkgs-unstable channel. Also
add myself as a maintainer so Hydra can notify me if it breaks again
2015-12-28 16:59:37 -05:00
Domen Kožar
781b9eab61
allow{reason}: a bit more explicit error message
2015-12-09 17:01:46 +01:00
Vladimír Čunát
263fd55d4b
Merge recent staging built on Hydra
...
http://hydra.nixos.org/eval/1231884
Only Darwin jobs seem to be queued now,
but we can't afford to wait for that single build slave.
2015-12-05 11:11:51 +01:00
Profpatsch
ee07543ccd
stdenv: licenseAllowed
-> checkValidity
...
Rename and make it a true function (that can be re-used and could be
moved to the library).
2015-11-27 21:56:28 +01:00
Jude Taylor
f5609a4d2a
reintroduce impure host deps to all derivations
2015-11-21 15:51:48 -08:00
Jude Taylor
69e7f3bb74
switch to zero underscores for sandbox profiles; remove generateFrameworkProfile
2015-11-21 12:10:33 -08:00
Jude Taylor
a63346e33c
use single underscore for sandboxProfile
2015-11-21 11:17:30 -08:00
Jude Taylor
131e831cb9
allow networking by default and remove it from derivations
2015-11-19 11:31:06 -08:00
Jude Taylor
163acc0efa
remove useless muting lines; they interfere with debugging
2015-11-19 11:31:06 -08:00
Jude Taylor
df80090d09
use per-derivation sandbox profiles
2015-11-19 11:31:06 -08:00
Jude Taylor
914e9baefe
start on sandbox stuff
2015-11-19 11:31:06 -08:00
Wout Mertens
774f74b875
Don't fail if env-vars cannot be written to
...
env-vars is a debugging aid, see
3e5dbb2433
for a rationale for this change.
2015-11-04 16:32:59 +01:00
William A. Kennington III
dd2de66d61
Merge branch 'master.upstream' into staging.upstream
2015-10-30 17:16:07 -07:00
Eelco Dolstra
971430f623
Move stdenv-darwin bootstrap binaries to nixos.org
...
These are taken from http://hydra.nixos.org/build/27002702 .
2015-10-29 22:16:06 +01:00
Jude Taylor
85ba0035bd
rebase on eelco's bootstrap-tools changes
2015-10-23 10:27:34 -07:00
Jude Taylor
1ddc52a782
update pure-darwin make-bootstrap-tools
2015-10-23 10:05:19 -07:00
Eelco Dolstra
45c7dd7d98
Add stdenv bootstrap tools generation to release.nix
2015-10-23 13:05:36 +02:00
Vladimír Čunát
4917a4f8b3
Merge master into staging
2015-10-23 01:57:14 +02:00
Eelco Dolstra
764a523cf9
Drop unnecessary __impureHostDeps
...
<nix/fetchurl.nix> is a builtin derivation so it shouldn't need any
host dependencies.
2015-10-21 15:16:45 +02:00
Jude Taylor
c7cc743b52
inherit system for builtin fetchurl in PD
2015-10-15 18:08:53 -07:00
Jude Taylor
c70ec3ec63
re-fix evaluation of libSystemClosure
2015-10-15 17:19:10 -07:00
Jude Taylor
9685b08db7
fix libSystemClosure on non-darwin machines
2015-10-15 14:09:30 -07:00
William A. Kennington III
8a44a36ca4
Merge branch 'master.upstream' into staging.upstream
2015-10-15 10:22:28 -07:00
Jude Taylor
f4dbf6d7c8
Merge pull request #10187 from NixOS/switch-to-pd
...
Switch stdenvs to pure-darwin
2015-10-14 16:13:25 -07:00
Eelco Dolstra
741bf840da
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
...
This reverts commit f61176c539
, reversing
changes made to a27ca029ee
.
Conflicts:
pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Jude Taylor
7283bb7466
introduce separate cf-private package to account for no CLT
2015-10-06 00:11:10 -07:00
Jude Taylor
0a32eab91e
fix LLVM packages to work in darwin stdenv
2015-10-05 08:46:56 -07:00
William A. Kennington III
ed71860928
Merge branch 'staging.upstream' into staging.post-15.06
2015-10-02 12:41:04 -07:00
Jude Taylor
df3d54e3bb
switch stdenvs
2015-10-02 12:26:33 -07:00