Eelco Dolstra
fa738e50bc
Revert "builtins.readFile: Put the references of the file, not those needed to realize the file, into the context"
...
Reverting commit 451c223dee
for now
because it breaks http://hydra.nixos.org/build/46805136 , not clear
why.
2017-01-24 15:29:46 +01:00
Eelco Dolstra
4b6d3c5a28
Hopefully fix build on older GCC
...
http://hydra.nixos.org/build/46805140
2017-01-24 15:28:50 +01:00
Eelco Dolstra
19ce732a13
Fix typo
2017-01-24 13:57:26 +01:00
Eelco Dolstra
e3bf228c92
Enable verbose curl output
...
Closes #1182 .
2017-01-24 13:57:01 +01:00
Shea Levy
3b4a15bd48
build-remote: Use futimes instead of futimens on APPLE
2017-01-24 06:22:02 -05:00
Eelco Dolstra
e5641dfe1e
Work around a bug in clang and older versions of gcc
...
http://hydra.nixos.org/build/46597440
https://llvm.org/bugs/show_bug.cgi?id=28096
2017-01-24 10:57:24 +01:00
Eelco Dolstra
1102c77919
shell.nix: Add a flag for using clang
2017-01-24 10:53:18 +01:00
Eelco Dolstra
8af062f372
Merge pull request #981 from shlevy/build-remote-c++
...
build-remote: Implement in C++
2017-01-19 18:21:55 +01:00
Eelco Dolstra
21948deed9
Kill builds when we get EOF on the log FD
...
This closes a long-time bug that allowed builds to hang Nix
indefinitely (regardless of timeouts) simply by doing
exec > /dev/null 2>&1; while true; do true; done
Now, on EOF, we just send SIGKILL to the child to make sure it's
really gone.
2017-01-19 17:16:14 +01:00
Eelco Dolstra
63e10b4d28
Cleanup
2017-01-19 17:06:04 +01:00
Eelco Dolstra
2579e32c2b
Use std::unique_ptr for HookInstance
2017-01-19 17:06:04 +01:00
Eelco Dolstra
90ee1e3fe3
Add a test for --max-silent-time
2017-01-19 17:06:03 +01:00
Eelco Dolstra
cc3b93c991
Handle SIGINT etc. via a sigwait() signal handler thread
...
This allows other threads to install callbacks that run in a regular,
non-signal context. In particular, we can use this to signal the
downloader thread to quit.
Closes #1183 .
2017-01-17 18:21:02 +01:00
Jude Taylor
c0d55f9183
assign environ to a temp variable to ensure liveness
2017-01-16 23:52:44 +01:00
Eelco Dolstra
8079ab87a2
AutoCloseDir: Use std::unique_ptr
2017-01-16 22:39:27 +01:00
Eelco Dolstra
2b9d0a99cb
AutoDeleteArray -> std::unique_ptr
...
Also, switch to C++14 for std::make_unique.
2017-01-16 22:24:49 +01:00
Eelco Dolstra
40dfac968a
nix-build: Use showManPage() and printVersion()
2017-01-16 22:11:17 +01:00
Shea Levy
451c223dee
builtins.readFile: Put the references of the file, not those needed to realize the file, into the context
2017-01-10 12:22:22 -05:00
Shea Levy
28db297862
build-remote: Don't use C++ streams to read the conf file
2017-01-10 10:36:26 -05:00
Shea Levy
d771c28613
build-remote: Use std::set for feature sets
2017-01-10 10:29:06 -05:00
Eelco Dolstra
7adb986e35
Merge pull request #1139 from Mic92/master
...
Simplify remouting with MS_PRIVATE in sandbox build
2017-01-09 16:46:59 +01:00
Eelco Dolstra
f61337fdb3
Merge pull request #1177 from dezgeg/bash-env-breakage
...
nix-shell: Fix 'nix-shell --command' doing nothing without TTY
2017-01-09 16:44:42 +01:00
Tuomas Tynkkynen
3890de049d
nix-shell: Fix 'nix-shell --command' doing nothing without TTY
...
Regression from a5f2750e
("Fix early removal of rc-file for nix-shell").
The removal of BASH_ENV causes nothing to be executed by bash if it
detects itself in a non-interactive context. Instead, just
use the same condition used by bash to launch bash differently.
According to bash sources, the condition (stdin and stder both
must be TTYs) is specified by POSIX so this should be pretty
safe to rely on.
Fixes #1171 on master, needs a backport to the Perl code in 1.11.
2017-01-07 19:08:28 +02:00
Eelco Dolstra
9000150a78
Drop a few more references to all-packages.nix
...
And also don't refer to f-spot, which apparently no longer exists.
Issue #1170 .
2017-01-03 16:42:24 +01:00
Eelco Dolstra
5d377ace2d
Update upload-release script
2017-01-03 11:42:56 +01:00
Eelco Dolstra
c287e797a8
nix-shell: In #! mode, pass the last argument
...
"i < argc - 1" should be "i < argc".
2017-01-03 11:40:51 +01:00
Eelco Dolstra
ae1e4dfad2
Merge pull request #1169 from dezgeg/fix-shell-shebang
...
Fix nix-shell shebang usage
2017-01-03 10:08:15 +01:00
Tuomas Tynkkynen
b501bea25f
tests: Add simple tests for nix-shell
...
nix-shell -A, -p and -i are lightly tested.
2017-01-03 10:11:09 +02:00
Tuomas Tynkkynen
018f884ffd
nix-shell: Don't act interactive in shebangs
...
I had observed that 'bash --rcfile' would do nothing in a
non-interactive context and cause nothing to be executed if a script
using nix-shell shebangs were run in a non-interactive context.
2017-01-03 10:11:09 +02:00
Tuomas Tynkkynen
c698ec1f22
nix-shell: Fix 'nix-shell -i'
...
The 'args' variable here is shadowing one in the outer scope and its
contents end up unused. This causes any '#! nix-shell' lines to
effectively be ignored. The intention here was to clear the args vector,
as far as I can tell (and it seems to work).
2017-01-03 10:11:09 +02:00
Eelco Dolstra
b6b142b4b1
Provide /var/run/nscd/socket in the sandbox
...
Otherwise sandbox builds can fail, e.g.
$ NIX_REMOTE=local?root=/tmp/nix nix-build '<nixpkgs>' -A hello --option build-use-substitutes false
...
downloading ‘http://ftpmirror.gnu.org/bash/bash-4.3-patches/bash43-047’ ...
error: unable to download ‘http://ftpmirror.gnu.org/bash/bash-4.3-patches/bash43-047’ : Couldn't resolve host name (6)
2017-01-02 14:46:37 +01:00
Domen Kožar
c4f4eef915
Merge pull request #1168 from itsN1X/patch-1
...
Readme semantics.
2017-01-01 14:08:35 +01:00
N1X
c8b9e47fb3
Readme semantics.
2017-01-01 05:20:47 +05:30
Domen Kožar
00d93b65fa
Merge pull request #1165 from zimbatm/document-no-build-hook
...
Document the common --no-build-hook option
2016-12-28 16:01:16 +01:00
Jonas Chevalier
45ed6e7ef2
Document the common --no-build-hook option
2016-12-28 14:19:59 +00:00
Eelco Dolstra
d0a2db17d9
Call Aws::InitAPI
...
This is required now.
2016-12-22 17:39:49 +01:00
Eelco Dolstra
786ee585b8
Add comment
2016-12-22 17:39:49 +01:00
Domen Kožar
2d801bf0a4
Merge pull request #1144 from jamesbroadhead/shellcheck_install
...
shellcheck scripts/install-nix-from-closure.sh
2016-12-22 10:34:15 +00:00
James Broadhead
9ce3fa2b2d
shellcheck scripts/install-nix-from-closure.sh
2016-12-19 15:04:10 +00:00
Eelco Dolstra
3a4bd320c2
Revert "Merge branch 'seccomp' of https://github.com/aszlig/nix "
...
This reverts commit 9f3f2e21ed
, reversing
changes made to 47f587700d
.
2016-12-19 11:52:57 +01:00
Eelco Dolstra
11f0680f69
Revert "shell.nix: Add libseccomp"
...
This reverts commit 1df82b6245
.
2016-12-19 11:52:18 +01:00
Eelco Dolstra
05862209de
Revert "Give root a valid home directory"
...
This reverts commit ec7d498b72
.
2016-12-19 11:49:03 +01:00
Domen Kožar
621a53f64d
Merge pull request #1154 from LnL7/manual-conf-file
...
manual: add NIX_CONF_DIR to conf-file section
2016-12-16 12:46:17 +00:00
Daiderd Jordan
36b3e15953
manual: add NIX_CONF_DIR to conf-file section
2016-12-16 10:59:07 +01:00
Eelco Dolstra
ec7d498b72
Give root a valid home directory
...
Some programs barf if the current user has a non-writable home
directory, e.g. http://hydra.nixos.org/build/44818144 .
2016-12-15 15:56:08 +01:00
Eelco Dolstra
5278bb7c16
Merge branch 'master' of github.com:NixOS/nix
2016-12-15 12:31:52 +01:00
Eelco Dolstra
1df82b6245
shell.nix: Add libseccomp
2016-12-15 12:31:35 +01:00
Eelco Dolstra
9f3f2e21ed
Merge branch 'seccomp' of https://github.com/aszlig/nix
2016-12-15 12:04:45 +01:00
Shea Levy
f867f090ed
Merge branch 'base32-overflow' of git://github.com/vcunat/nix
2016-12-13 09:41:02 -05:00
Domen Kožar
05f907787f
Merge pull request #1153 from lheckemann/path-search
...
Document path-searching behaviour
2016-12-11 19:31:17 +01:00