Eelco Dolstra
7495c61d49
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
...
Conflicts:
pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Wout Mertens
c04e492898
stdenv: Prevent issues like #4266
...
Don't preserve hardlinks, and instead use reflinks if they're available.
2014-10-31 11:13:03 +01:00
Eelco Dolstra
3a0db27b90
Fix indent
2014-10-26 01:59:05 +02:00
Nikolay Amiantov
66d89ef2a4
stdenv: Use "pipefail" in setup.sh
2014-10-10 14:02:15 +04:00
Nikolay Amiantov
ca3ecb56ae
stdenv: change 'echo -n' to 'printf "%s"'
...
[Bjørn: rationale is portability, "echo -n" isn't in POSIX]
2014-10-09 22:15:07 +02:00
Nikolay Amiantov
2ec4704961
stdenv: Fix handling spaces in 'substitute'
2014-10-09 22:15:07 +02:00
Nikolay Amiantov
d59327b938
stdenv: added escaping for patches
2014-10-09 22:15:05 +02:00
Nikolay Amiantov
d15e52f25f
stdenv: fail if the patch does not exist
2014-10-09 22:14:38 +02:00
Eelco Dolstra
811de3bfaa
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
...
Conflicts:
pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Eelco Dolstra
51f1b4ec48
Automatically move stuff in lib64 to lib
2014-10-07 15:04:13 +02:00
Eelco Dolstra
ab04b7d0bb
Automatically move programs in sbin to bin
...
This should fix the OpenJDK build, which was failing because paxctl is
in sbin and therefore not automatically added to $PATH.
http://hydra.nixos.org/build/15658346
2014-10-07 14:43:56 +02:00
Eelco Dolstra
a85dcf4a00
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/libav/default.nix
pkgs/shells/bash/bash-4.2-patches.nix
pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra
ce61353a9f
Eliminate some optionals/optionalAttrs calls on the hot path
2014-10-05 01:59:24 +02:00
Eelco Dolstra
cd71f7a2e6
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
...
Conflicts:
pkgs/development/interpreters/ruby/ruby-19.nix
pkgs/development/libraries/libc++/default.nix
pkgs/development/libraries/libc++abi/default.nix
pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Gergely Risko
efcb00d002
Do allowed requisites check in stdenv/linux
...
Use the new allowedRequisites feature in stdenvLinux.
This way we properly check that the end-result stdenv of the quite
complicated multi-stage stdenvLinux building procedure is sane, and only
depends on the stuff that we know about.
Alternative would be to just disallowRequisites bootstrapTools, which is
the most common offender, but we have had other offenders in the past.
For these checks to actually fire, you currently have to use nixUnstable,
as the necessary feature will be released in Nix 1.8.
2014-09-14 21:14:41 +02:00
Joel Taylor
3e8344d334
suitable clang stdenv
2014-09-09 13:54:24 -07:00
Vladimír Čunát
1e389c976c
merge 'staging' into modular-stdenv
...
In 2c62a36b77
the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.
Conflicts:
pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
Eelco Dolstra
3360fa1afb
Revert "stdenv/setup.sh: unbreak *.lz sources on darwin"
...
This reverts commit fcafdd2761
. We're
trying to modularise stdenv, not add more ad-hoc compression support.
2014-08-30 22:41:56 +02:00
Vladimír Čunát
fcafdd2761
stdenv/setup.sh: unbreak *.lz sources on darwin
2014-08-30 13:28:44 +02:00
Luca Bruno
b83aceaecb
Merge branch 'master' into staging
2014-08-14 23:09:59 +02:00
Vladimír Čunát
d1ed0f44cd
Merge #2823 : better cygwin support, also add x86_64
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
Vladimír Čunát
e80f41f35e
Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval
...
More helpful message when refusing to evaluate "broken" package
2014-08-12 20:18:10 +02:00
Eelco Dolstra
9e31c66d1b
stdenv: Put moving docs to $out/share in a separate setup hook
2014-08-09 12:47:05 +02:00
Eelco Dolstra
2db867eec9
fixupPhase: Fix making the outputs writable
2014-08-09 12:47:05 +02:00
Eelco Dolstra
11dc9036d0
Allow passing arguments to hooks
...
This allows envHooks and crossEnvHooks to be handled using the regular
hook mechanism.
2014-08-09 12:47:05 +02:00
Eelco Dolstra
2def8e7499
Remove addHook
...
Just use bash arrays directly. I.e.
addHook preConfigure myPreConfigure
is now
preConfigureHooks+=(myPreConfigure)
2014-08-09 12:45:53 +02:00
Eelco Dolstra
e3875297fa
stdenv: Don't use sed to build the setup script
2014-08-09 12:45:52 +02:00
Eelco Dolstra
cd948c093f
stdenv: Reindent
2014-08-09 12:44:50 +02:00
Eelco Dolstra
15103e5e5f
stdenv: Remove the special handling of gcc
...
Now gcc is just another build input, making it possible in the future
to have a stdenv that doesn't depend on a C compiler. This is very
useful on NixOS, since it would allow trivial builders like
writeTextFile to work without pulling in the C compiler.
2014-08-09 12:44:50 +02:00
Eelco Dolstra
9f822e5477
stdenv: Move paxmark function to paxctl's setup hook
2014-08-09 12:44:50 +02:00
Eelco Dolstra
d7b356f73b
stdenv: Move unzip support to unzip's setup hook
2014-08-09 12:44:50 +02:00
Eelco Dolstra
3e33c975fb
stdenv: Make unpackFile extensible via the hook mechanism
...
unpackCmd is now a regular hook, so there can be multiple functions
hooking into it.
2014-08-09 12:44:49 +02:00
Eelco Dolstra
1a44dbbbb9
unpackFile: Always copy directories
...
If $src refers to a directory, then always copy it. Previously, we
checked the extension first, so if the directory had an extension like
.tar, unpackPhase would fail.
2014-08-09 12:44:49 +02:00
Eelco Dolstra
daa66b8b1c
Factor out fixup phase stuff into separate setup hooks
2014-08-09 12:44:49 +02:00
Eelco Dolstra
83a41771ab
Move RPATH shrinking from stdenv to a setup hook provided by patchelf
2014-08-09 12:44:49 +02:00
Eelco Dolstra
b23dbb1a5d
Allow buildInputs to be regular files
...
If a build input is a regular file, use it as a setup hook. This makes
setup hooks more efficient to create: you don't need a derivation that
copies them to $out/nix-support/setup-hook, instead you can use the
file as is.
2014-08-09 12:44:49 +02:00
Eelco Dolstra
0a8605ded1
Formatting
2014-08-09 12:44:48 +02:00
Eelco Dolstra
37889e2b5e
Provide a hook for per-output fixup
2014-08-09 12:44:48 +02:00
Eelco Dolstra
b0f2d3419c
Allow multiple hooks with the same name
...
You can now register multiple values per named hook, e.g.
addHook preConfigure "echo foo"
addHook preConfigure "echo bar"
will cause ‘runHook preConfigure’ to run both ‘echo foo’ and ‘echo
bar’ (in that order). It will also call the shell function
preConfigure() or eval the shell variable $preConfigure, if
defined. Thus, if you don't call addHook, it works like the old hook
mechanism.
Allowing multiple hooks makes stdenv more modular and extensible. For
instance, multiple setup hooks can define a preFixup hook, and all of
these will be executed.
2014-08-09 12:44:48 +02:00
Michael Raskin
0769fc5b77
Set CONFIG_SHELL to stdenv.shell in the default builder, just like SHELL
2014-07-30 16:44:28 +02:00
Eelco Dolstra
0da7fadce3
stdenv: Fix __ignoreNulls
...
Commit 262c21ed46
purported to enable
ignoreNulls, but it was bogus because it set the flag on the wrong
derivation (i.e. stdenv rather than the result of mkDerivation).
2014-07-01 16:56:36 +02:00
Eelco Dolstra
b3b9c51b34
Add a deprecation warning to ensureDir
2014-06-30 14:57:12 +02:00
Bjørn Forsman
ff999c31aa
Factor out allowUnfree,allowBroken help message
...
DRY.
2014-06-21 15:05:48 +02:00
Bjørn Forsman
abfaf42333
More helpful message when refusing to evaluate "broken" package
...
A "broken" package is one where either "meta.broken = true" or build
platform != meta.platforms.
2014-06-21 15:04:39 +02:00
Eelco Dolstra
e5d63646a0
Don't suggest using --arg config '{ allowUnfree = true; }'
...
This doesn't work when using the Nixpkgs/NixOS channel.
Issue #2998 .
2014-06-17 15:00:24 -05:00
Vladimír Čunát
9757785295
Merge recent master
2014-06-15 17:55:35 +02:00
Michael Raskin
a076a60735
Allow specifying allowUnfreePredicate instead of allowUnfree. The predicate will have access to the arguments of mkDerivation call. Should be an improvement for #2188
2014-06-14 13:01:12 +04:00
Sander van der Burg
9ec52d6323
Fixes to make basic builds on Cygwin work again + additions to support x86_64-cygwin
2014-05-29 14:47:07 +02:00
Vladimír Čunát
3d3aea09b9
fix paxmark on non-linux (a bug in grsecurity PR #1187 )
2014-05-15 13:25:49 +02:00
Ricardo M. Correia
8d5ce245a2
grsecurity: Add paxctl, paxmark and stdenv.needsPax to stdenv
2014-05-15 13:25:46 +02:00