Eelco Dolstra
4eb62b5230
nix-daemon: Call exit(), not _exit()
...
This was preventing destructors from running. In particular, it was
preventing the deletion of the temproot file for each worker
process. It may also have been responsible for the excessive WAL
growth on Hydra (due to the SQLite database not being closed
properly).
Apparently broken by accident in
8e9140cfde
.
2015-05-11 17:41:56 +02:00
Shea Levy
bed17f40fc
Fix build on gcc < 4.7
2015-05-11 17:37:20 +02:00
Eelco Dolstra
c2b65dd197
Remove some duplicate code
2015-05-11 17:36:05 +02:00
Eelco Dolstra
c957422835
createDirs(): Handle ‘path’ being a symlink
...
In particular, this fixes "nix-build -o /tmp/result" on Mac OS X
(where /tmp is a symlink).
2015-05-11 17:35:25 +02:00
Eelco Dolstra
e74390a16f
Remove bogus comment
2015-05-11 17:33:22 +02:00
Eelco Dolstra
75f746f018
Get rid of "killing <pid>" message for unused build hooks
2015-05-11 17:16:37 +02:00
Eelco Dolstra
b732ffd28d
Call commonChildInit() before doing chroot init
...
This ensures that daemon clients see error messages from the chroot
setup.
2015-05-11 17:15:44 +02:00
Eelco Dolstra
c51374c128
Eliminate redundant copy
2015-05-11 17:15:23 +02:00
Eelco Dolstra
82d463d9ca
Make readDirectory() return inode / file type
2015-05-11 17:14:51 +02:00
Eelco Dolstra
bb07dfe96f
nix-daemon: Simplify stderr handling
2015-05-11 17:11:14 +02:00
Ludovic Courtès
766481d606
Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix
2015-05-11 17:04:26 +02:00
Ludovic Courtès
c69944c511
Merge commit '8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74' into nix
...
Conflicts:
Makefile.config.in
configure.ac
dev-shell
doc/manual/builtins.xml
doc/manual/conf-file.xml
doc/manual/local.mk
doc/manual/nix-instantiate.xml
doc/manual/nix-store.xml
doc/manual/writing-nix-expressions.xml
misc/emacs/nix-mode.el
perl/lib/Nix/CopyClosure.pm
release.nix
scripts/nix-build.in
scripts/nix-copy-closure.in
src/download-via-ssh/download-via-ssh.cc
src/libexpr/common-opts.cc
src/libexpr/common-opts.hh
src/libexpr/eval.cc
src/libexpr/eval.hh
src/libexpr/local.mk
src/libexpr/nixexpr.cc
src/libexpr/nixexpr.hh
src/libexpr/parser.y
src/libexpr/primops.cc
src/libexpr/symbol-table.hh
src/libmain/shared.cc
src/libstore/local.mk
src/nix-env/nix-env.cc
src/nix-instantiate/nix-instantiate.cc
src/nix-store/local.mk
src/nix-store/nix-store.cc
src/nix-store/serve-protocol.hh
tests/lang.sh
tests/lang/eval-okay-context.nix
tests/lang/eval-okay-search-path.exp
tests/lang/eval-okay-search-path.nix
tests/local.mk
tests/nix-copy-closure.nix
2015-05-06 23:22:04 +02:00
Ludovic Courtès
a1dd396cc0
Merge commit '8d5f472f2c49c79a0d3ae2e506f4d4d76224b328' into nix
...
Conflicts:
.gitignore
Makefile
doc/manual/installation.xml
doc/manual/introduction.xml
doc/manual/local.mk
doc/manual/manual.xml
doc/manual/nix-collect-garbage.xml
doc/manual/nix-env.xml
doc/manual/nix-install-package.xml
doc/manual/nix-store.xml
doc/manual/quick-start.xml
doc/manual/release-notes.xml
local.mk
misc/emacs/nix-mode.el
mk/functions.mk
mk/install.mk
mk/lib.mk
mk/libraries.mk
mk/patterns.mk
mk/programs.mk
nix.spec.in
release.nix
scripts/install-nix-from-closure.sh
scripts/nix-build.in
src/libexpr/eval-inline.hh
src/libexpr/eval.cc
src/libexpr/eval.hh
src/libexpr/get-drvs.cc
src/libexpr/nixexpr.cc
src/libexpr/nixexpr.hh
src/libexpr/parser.y
src/libexpr/primops.cc
src/libstore/local.mk
src/nix-daemon/local.mk
src/nix-env/nix-env.cc
src/nix-env/user-env.cc
src/nix-instantiate/nix-instantiate.cc
src/nix-store/nix-store.cc
tests/init.sh
tests/nix-copy-closure.nix
tests/remote-builds.nix
version
2015-01-04 23:01:14 +01:00
Ludovic Courtès
0a751260ae
nix: Adjust code for Guix.
...
* nix/libstore/gc.cc (addAdditionalRoots): Refer to 'list-runtime-roots'
instead of 'find-runtime-roots.pl'.
* nix/libutil/hash.cc, nix/libutil/hash.hh: Change 'union Ctx' to
'struct Ctx', like 'nix/sync-with-upstream' did.
* nix/AUTHORS: New file.
* nix/COPYING: New file, from upstream Nix.
* nix/libutil/md32_common.h, nix/libutil/md5.c, nix/libutil/md5.h,
nix/libutil/sha1.c, nix/libutil/sha1.h, nix/libutil/sha256.c,
nix/libutil/sha256.h: Remove.
2014-12-17 22:57:33 +01:00
Ludovic Courtès
d4e18b05e0
Keep only libstore, nix-daemon, and related stuff.
2014-12-17 22:57:04 +01:00