diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-19 08:07:26 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-19 16:09:58 +0200 |
| commit | 2bb04905f86f9c3f1d27557fbff8cbdc776560a3 (patch) | |
| tree | 7b6d96ff607d926d93878d3595bbcddede32216c | |
| parent | a88b8c5c985a87586159c0621974a1dfe5b9b92d (diff) | |
| download | guix-2bb04905f86f9c3f1d27557fbff8cbdc776560a3.tar.gz | |
Merge branch 'nix'.
* daemon.am (AM_CXXFLAGS): Change -std=c++0x to -std=c++11.
(libstore_a_CPPFLAGS): Add -DDEFAULT_CHROOT_DIRS.
(parse_opt): Use 'settings.get' instead of 'settings.dirsInChroot'.
(main): Likewise.
* tests/guix-archive.sh: Don't grep for the "importing ..." message since it
is no longer produced.
The nix/ part is a squashed commit of the following:
commit 3bfa70b7963e12be346900e64ae45fa019850675
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 10 13:53:04 2014 +0100
Don't wait for PID -1
The pid field can be -1 if forking the substituter process failed.
commit 5241aec531e9c9a4b2dd5e5b6ee3f07ff049d9a5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 24 16:48:04 2014 +0100
Build derivations in a more predictable order
Derivations are now built in order of derivation name, so a package
named "aardvark" is built before "baboon".
Fixes #399.
commit 9f355738e106f4ca49bba7276e8d520a2fc2955d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 24 16:44:35 2014 +0100
Don't create unnecessary substitution goals for derivations
commit 554eaf5e8c82ddd6a42e4301f6d3dd5419c04060
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Nov 19 18:02:39 2014 +0100
Disable vacuuming the DB after garbage collection
Especially in WAL mode on a highly loaded machine, this is not a good
idea because it results in a WAL file of approximately the same size
ad the database, which apparently cannot be deleted while anybody is
accessing it.
commit 4eb62b5230c29e2f6ab17352439521083846c259
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Nov 19 17:09:27 2014 +0100
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
8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74.
commit f160a30d5612506de41a8206a57eccee1cd85fb7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Nov 19 17:07:29 2014 +0100
Clean up temp roots in a more C++ way
commit a64744477d95e6932ae0fefc7cc358b56b8c397f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 17 01:00:39 2014 +0100
Fix message
commit b73de6e49b64d01974649a1e67a77113b768c2b1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 14 14:16:20 2014 +0100
Don't use ADDR_LIMIT_3GB
This gives 32-bit builds on x86_64-linux more memory.
commit e0825bd36b43f3c1d408745a9c61f92fdaf7dace
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Nov 12 11:35:53 2014 +0100
Make ~DerivationGoal more reliable
commit 86b9e6d4575e5c93f428b8563ae259f0f4014173
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 4 10:41:29 2014 +0100
nix-store --gc: Don't warn about missing manifests directory
commit 1129a982c4e77ff465fd6102627477900af2f7f4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Oct 31 09:36:09 2014 +0100
Improve error message if the daemon worker fails to start
commit bed17f40fce27e1a31f70957b1d0dd912b58700d
Author: Shea Levy <shea@shealevy.com>
Date: Mon Oct 20 12:15:50 2014 -0400
Fix build on gcc < 4.7
commit ee8601cac4b353e551b238f546a0e7e8fcdcd3be
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 14 10:51:19 2014 +0200
Improved error message when encountering unsupported file types
Fixes #269.
commit c2b65dd197a1b2e14d517b0b5ff307b149538917
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Oct 3 22:37:51 2014 +0200
Remove some duplicate code
commit c95742283595cb01b44ddc8e6ff5e9c1d66db444
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Oct 3 16:53:28 2014 +0200
createDirs(): Handle ‘path’ being a symlink
In particular, this fixes "nix-build -o /tmp/result" on Mac OS X
(where /tmp is a symlink).
commit 6092a48603ea7888f8a1f69db87835bc339c973a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 25 18:45:43 2014 +0200
nix-daemon: Close unnecessary fd
commit e74390a16f74233283572661f64ed4f03ae1650d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 19 15:07:22 2014 +0200
Remove bogus comment
commit e63c8aaa0511d1d0a5487c45dec9f8cbd66b4cc6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 17 17:21:13 2014 +0200
On Linux, disable address space randomization
commit 55939b1a4b34b904eedba90ac6c14efc6258f40d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 17 15:18:13 2014 +0200
Settings: Add bool get()
commit 6621195e48f8e0cbbe6e19dbcde30bd8a7da0399
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon Sep 1 22:21:42 2014 +0200
Add an 'optimiseStore' remote procedure call.
commit 3bb89c3a31b9cf6e056f3659389e2d2e7afd17fa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Aug 28 18:57:13 2014 +0200
Add disallowedReferences / disallowedRequisites
For the "stdenv accidentally referring to bootstrap-tools", it seems
easier to specify the path that we don't want to depend on, e.g.
disallowedRequisites = [ bootstrapTools ];
commit abd9d61e6201ddbde3305dd27c286e883e950bec
Author: Gergely Risko <errge@nilcons.com>
Date: Wed Aug 27 16:46:02 2014 +0200
Introduce allowedRequisites feature
commit 8c766e48d5c4741b63a4f24dc91138f587c04a5a
Author: Joel Taylor <me@joelt.io>
Date: Thu Aug 21 14:06:49 2014 -0700
fix disappearing bash arguments
commit d4e7c195fabf0f24c2ffbd4ca8f189489bbbf44d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 19 17:44:59 2014 +0200
Make hook shutdown more reliable
commit ea837e470f70900481d00b0d1cd73e6855c4f70d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 18 11:35:50 2014 +0200
Doh
commit 790271559cb8b36cd8fcdc533f41be88ec15ad08
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 17 19:11:50 2014 +0200
Reduce verbosity
commit 3f6d4f63ec0d1d6cfc3233998b7dd9608b2f6ff3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 17 19:09:03 2014 +0200
Propagate remote timeouts properly
commit aa98ba506739b885b3ce0b392dade5e1e1bb07f7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 13 17:44:41 2014 +0200
Use regular file GC roots if possible
This makes hydra-eval-jobs create roots as regular files. See
1c208f2b7ef8ffb5e6d435d703dad83223a67bd6.
commit 5fe5ff77800c2911c011f582d8dfa90c44d4a3a5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 5 16:41:42 2014 +0200
Remove unnecessary call to addTempRoot()
commit 1820845c44c8cbe1121e78d5f16e7778532477f6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 5 10:19:57 2014 +0200
Doh
commit e9070bf4226b225a0b42798b20ea3947abf58a6f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 4 18:13:14 2014 +0200
Move some options out of globals
commit 31909515634d74e4c3d92be6186c5c48244582ae
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 4 18:02:29 2014 +0200
Refactor
commit f530ee6f356f4299ca343dde7f4c0742300ffa08
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 4 18:00:00 2014 +0200
Add option ‘build-extra-chroot-dirs’
This is useful for extending (rather than overriding) the default set
of chroot paths.
commit 75f746f018e34868b8057bed87c90d2cbe2c0b6c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 4 17:27:45 2014 +0200
Get rid of "killing <pid>" message for unused build hooks
commit 42c6246f674ca2d5ea166d1ae676b7087ea1b0d8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 1 19:38:21 2014 +0200
Remove ugly hack for detecting build environment setup errors
commit b732ffd28ddf50d3150e4f276a0e8488e38eaacb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 1 19:29:03 2014 +0200
Call commonChildInit() before doing chroot init
This ensures that daemon clients see error messages from the chroot
setup.
commit c51374c128cbe1f06acd95ba2d627a118a95aabf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 1 17:30:51 2014 +0200
Eliminate redundant copy
commit 666c9b7108e460f0d3450015a3379bfeb3e3a497
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 1 17:20:25 2014 +0200
findRoots(): Prevent a call to lstat()
This means that getting the roots from /nix/var/nix/.../hydra-roots
doesn't need any I/O other than reading the directory.
commit 82d463d9cacbf2a93b95ab5313567d593fd00d02
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 1 16:37:47 2014 +0200
Make readDirectory() return inode / file type
commit a98fa2d9e2b06e2561330c5ef845ffaf131e95ac
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 1 16:46:01 2014 +0200
Allow regular files as GC roots
If a root is a regular file, then its name must denote a store
path. For instance, the existence of the file
/nix/var/nix/gcroots/per-user/eelco/hydra-roots/wzc3cy1wwwd6d0dgxpa77ijr1yp50s6v-libxml2-2.7.7
would cause
/nix/store/wzc3cy1wwwd6d0dgxpa77ijr1yp50s6v-libxml2-2.7.7
to be a root.
This is useful because it involves less I/O (no need for a readlink()
call) and takes up less disk space (the symlink target typically takes
up a full disk block, while directory entries are packed more
efficiently). This is particularly important for hydra.nixos.org,
which has hundreds of thousands of roots, and where reading the roots
can take 25 minutes.
commit 4ab4b0c109734bd6e265ca5f1b6415c31c03ab11
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 24 00:00:53 2014 +0200
Remove some dead code
commit 1cffdf5847b065183c9aac86df3a9578020e6712
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 23 19:43:46 2014 +0200
nix-daemon: Less verbosity
commit bb07dfe96f0d07aa18db385d3ec93b24b5568213
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 23 19:37:40 2014 +0200
nix-daemon: Simplify stderr handling
commit 766481d606e4b1860307692d6a44723983662d45
Merge: c69944c fdee1ce
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon May 11 17:04:26 2015 +0200
Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix
commit c69944c511b89d3fdbffe00353e27d1e1c5f670c
Merge: a1dd396 8e9140c
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed May 6 23:22:04 2015 +0200
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
commit a1dd396cc02922372314c35c8035a38bfeea08df
Merge: 0a75126 8d5f472
Author: Ludovic Courtès <ludo@gnu.org>
Date: Sun Jan 4 23:01:14 2015 +0100
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
commit 0a751260ae54bb37ae33e0f4fc3bcda2a4ea3ceb
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Dec 17 11:10:25 2014 +0100
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.
commit d4e18b05e0ab149265d3d09ae017d7337fc4176f
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Dec 17 10:44:19 2014 +0100
Keep only libstore, nix-daemon, and related stuff.
commit fdee1ced43fb495d612a29e955141cdf6b9a95ba
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 23 19:11:26 2014 +0200
startProcess: Make writing error messages from the child more robust
commit 5989966ed3bd58cd362aed8cba6cd5c90b380a32
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 23 14:46:28 2014 +0200
Remove dead code
commit ee3c5d7916b48d0c3b1cc08044e27209c14acfdc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jul 19 02:25:47 2014 +0200
Revert old useBuildHook behaviour
commit 2e77bd70faee34cb2518529318a54b39f2d9143e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 18 12:54:30 2014 +0200
Better fix for strcasecmp on Darwin
commit f609eec71a25a9bb8c32dd9620b7deb88633a22a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 18 00:01:06 2014 +0200
Bump
commit 8ddffe7aac414756809f43732effb8951858243b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 17 23:57:17 2014 +0200
Ugly hack to fix building on old Darwin
http://hydra.nixos.org/build/12580878
commit 049c0eb49c621ae50f49c8a06dc6c3a9839ef388
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 17 16:57:07 2014 +0200
nix-daemon: Add trusted-users and allowed-users options
‘trusted-users’ is a list of users and groups that have elevated
rights, such as the ability to specify binary caches. It defaults to
‘root’. A typical value would be ‘@wheel’ to specify all users in the
wheel group.
‘allowed-users’ is a list of users and groups that are allowed to
connect to the daemon. It defaults to ‘*’. A typical value would be
‘@users’ to specify the ‘users’ group.
commit 0c730887c4ec4a03fb854490e422c134a1bf8139
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 17 15:49:33 2014 +0200
nix-daemon: Show name of connecting user
commit 77c972c898b325997fa2f527264a9706f1e414a5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 17 15:41:11 2014 +0200
nix-daemon: Only print connection info if we have SO_PEERCRED
commit 8f72e702a114458e92f644160950344a7bf7166a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 17 15:23:31 2014 +0200
nix-daemon: Fix compat with older clients
commit 2304a7dd21639959dc4bcafa3e17374cc087cd0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 16 16:32:26 2014 +0200
Get rid of a compiler warning
commit 985f1595fe9f61095c7bc94b49be1179811ec630
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 16 16:30:50 2014 +0200
Be more strict about file names in NARs
commit 276a40b31f631c188d6dcbdf603a738e1380ff74
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 16 16:02:05 2014 +0200
Handle case collisions on case-insensitive systems
When running NixOps under Mac OS X, we need to be able to import store
paths built on Linux into the local Nix store. However, HFS+ is
usually case-insensitive, so if there are directories with file names
that differ only in case, then importing will fail.
The solution is to add a suffix ("~nix~case~hack~<integer>") to
colliding files. For instance, if we have a directory containing
xt_CONNMARK.h and xt_connmark.h, then the latter will be renamed to
"xt_connmark.h~nix~case~hack~1". If a store path is dumped as a NAR,
the suffixes are removed. Thus, importing and exporting via a
case-insensitive Nix store is round-tripping. So when NixOps calls
nix-copy-closure to copy the path to a Linux machine, you get the
original file names back.
Closes #119.
commit bb65460feb265be4d938c7dc724a76ef41a8bfaf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 16 11:19:12 2014 +0200
Make dev-shell script work on Darwin
commit de8be7c3e06b52c313e0b452b641ad5f90dca2fe
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 16 11:16:54 2014 +0200
Install systemd and Upstart stuff only on Linux
commit 048be62484537633e2523dd4d200619649ff860d
Author: Shea Levy <shea@shealevy.com>
Date: Wed Jul 16 01:11:24 2014 -0400
Pass *_proxy vars to bootstrap fetchurl
commit a2c85b2ef85a34bf8e5238c315a4ca73606f5ae6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 16 11:09:01 2014 +0200
Manual: Typo
commit 5bcb98271103c6c2ca3b993d8b1b0eb9eadcbc1c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 14 12:39:33 2014 +0200
Remove cruft
commit fa13d3f4f3d8fb6dc3e3fc87ac5a2e26d8b32d84
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 14 12:19:27 2014 +0200
build-remote.pl: Fix building multiple output derivations
We were importing paths without sorting them topologically, leading to
"path is not valid" errors.
See e.g. http://hydra.nixos.org/build/12451761
commit b2e0293f022123b11759dfd498d4eff72233d3f7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jul 12 00:43:28 2014 +0200
build-remote.pl: Don't keep a shell process around
commit a00a98548e994d1ea258e14793c7bcd8ea56cfdf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jul 12 00:09:43 2014 +0200
build-remote.pl: Fix build log
commit 838138c5c4d21a207f3579c4f743698bd6dbb6b1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 11 16:20:12 2014 +0200
Fix test
commit a5c6347ff06ba09530fdf0e01828aaec89f6ceb6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 11 16:02:19 2014 +0200
build-remote.pl: Use ‘nix-store --serve’ on the remote side
This makes things more efficient (we don't need to use an SSH master
connection, and we only start a single remote process) and gets rid of
locking issues (the remote nix-store process will keep inputs and
outputs locked as long as they're needed).
It also makes it more or less secure to connect directly to the root
account on the build machine, using a forced command
(e.g. ‘command="nix-store --serve --write"’). This bypasses the Nix
daemon and is therefore more efficient.
Also, don't call nix-store to import the output paths.
commit b8f24f253527e1cb071785c3b2d677ed2f734ab1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 11 14:27:17 2014 +0200
Fix closure size display
commit e196eecbe6552d5afed89ad480544c90cf959922
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 11 13:55:06 2014 +0200
Allow $NIX_BUILD_HOOK to be relative to Nix libexec directory
commit d0eb970fb4d3b5c347506b77f9657fc5eb6229e2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 21:48:21 2014 +0200
Fix broken Pid constructor
commit edbfe2232e275a9e6c10cd8eb4dc36ca992af084
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 21:30:22 2014 +0200
Replace message "importing path <...>" with "exporting path <...>"
This causes nix-copy-closure to show what it's doing before rather
than after.
commit 42d91b079c5d0b468663511e7b2a8e2f4048c475
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 21:14:34 2014 +0200
Fix use of sysread
commit 7bb632b02464febd8806ef4bd3fa0ac107f52650
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 20:43:04 2014 +0200
nix-copy-closure -s: Do substitutions via ‘nix-store --serve’
This means we no longer need an SSH master connection, since we only
execute a single command on the remote host.
commit 7c3a5090bff4e9cfe70f1d89619563b55af13d89
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 17:44:18 2014 +0200
nix-copy-closure: Fix --dry-run
commit 43b64f503844a66c344780a11289678a001572db
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 17:32:21 2014 +0200
Remove tabs
commit 8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 16:50:51 2014 +0200
Refactoring: Move all fork handling into a higher-order function
C++11 lambdas ftw.
commit 1114c7bd57bcab16255d5db5e6f66ae8dece7b1e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 14:15:12 2014 +0200
nix-copy-closure: Restore compression and the progress viewer
commit 7911e4c27a0020a61ace13cfdc44de4af02f315e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 23 09:15:35 2014 -0400
Remove maybeVfork
commit 04170d06bf7d17f882c01d3ab98885e0f3e46d2f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 11:51:22 2014 +0200
nix-copy-closure: Fix race condition
There is a long-standing race condition when copying a closure to a
remote machine, particularly affecting build-remote.pl: the client
first asks the remote machine which paths it already has, then copies
over the missing paths. If the garbage collector kicks in on the
remote machine between the first and second step, the already-present
paths may be deleted. The missing paths may then refer to deleted
paths, causing nix-copy-closure to fail. The client now performs both
steps using a single remote Nix call (using ‘nix-store --serve’),
locking all paths in the closure while querying.
I changed the --serve protocol a bit (getting rid of QueryCommand), so
this breaks the SSH substituter from older versions. But it was marked
experimental anyway.
Fixes #141.
commit 2c3a8f787ba9da49feafdec4022534184e0a96a3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 11:46:01 2014 +0200
Fix security hole in ‘nix-store --serve’
Since it didn't check that the path received from the client is a
store path, the client could dump any path in the file system.
commit 66dbc0fdeebf509c5d919e9c12b2645136d6deeb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 10 01:50:29 2014 +0200
Add a test for the SSH substituter
commit 0e5d0c15430cf82861a1ae213cbccff065f71107
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 9 12:14:40 2014 +0200
Fix compilation error on some versions of GCC
src/libexpr/primops.cc:42:8: error: looser throw specifier for 'virtual nix::InvalidPathError::~InvalidPathError()'
src/libexpr/nixexpr.hh:12:1: error: overriding 'virtual nix::EvalError::~EvalError() noexcept (true)'
http://hydra.nixos.org/build/12385750
commit beac05c206a801be6f83b4eaaffe75c30eeb7d37
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 8 20:41:25 2014 +0200
Don't build on Ubuntu 10.10
Its C++ compiler is too old.
http://hydra.nixos.org/build/12385722
commit beaf3e90aff14664b98f2c7ab7387c9fa4354fd1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 4 13:34:15 2014 +0200
Add builtin function ‘fromJSON’
Fixes #294.
commit e82951fe23daa961ef18b0c5cc9ba1f5d8906186
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 3 12:36:58 2014 +0200
Manual: html -> xhtml
commit e477f0e9385d7825f005b7e9a32cd3ad6ee27aab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 27 11:36:23 2014 +0200
Style fix
commit 858b8f9760a81540b0a95068d96dc5c1628673c3
Author: Paul Colomiets <paul@colomiets.name>
Date: Tue Jun 24 00:30:22 2014 +0300
Add `--json` argument to `nix-instantiate`
commit 8504e7d60488cb12dd2597734ebd1d3cadf5d153
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 27 11:20:16 2014 +0200
allow-arbitrary-code-during-evaluation -> allow-unsafe-native-code-during-evaluation
commit d7be6d45d97e89653b77686bdb39b833afbcf6ca
Merge: 9d0709e d62f46e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 27 11:18:54 2014 +0200
Merge branch 'shlevy-import-native'
commit d62f46e500958bc97ae6837911e27c20a47cc181
Author: Shea Levy <shea@shealevy.com>
Date: Tue Jun 24 10:50:03 2014 -0400
Only add the importNative primop if the allow-arbitrary-code-during-evaluation option is true (default false)
commit 5cd022d6c099c583c0494bdacd06f4eb32661135
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jun 1 10:42:56 2014 -0400
Add importNative primop
This can be used to import a dynamic shared object and return an
arbitrary value, including new primops. This can be used both to test
new primops without having to recompile nix every time, and to build
specialized primops that probably don't belong upstream (e.g. a function
that calls out to gpg to decrypt a nixops secret as-needed).
The imported function should initialize the Value & as needed. A single
import can define multiple values by creating an attrset or list, of
course.
An example initialization function might look like:
extern "C" void initialize(nix::EvalState & state, nix::Value & v)
{
v.type = nix::tPrimOp;
v.primOp = NEW nix::PrimOp(myFun, 1, state.symbols.create("myFun"));
}
Then `builtins.importNative ./example.so "initialize"` will evaluate to
the primop defined in the myFun function.
commit 9d0709e8c47082cec35d6412053eacfadae23bcd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 12 17:30:37 2014 +0200
Don't use member initialisers
They're a little bit too recent (only supported since GCC 4.7).
http://hydra.nixos.org/build/11851475
commit 48495f67ed893c4ee056099ae0ca5a2afacde93c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 12 13:15:35 2014 +0200
Fix bogus warnings about dumping large paths
Also, yay for C++11 non-static initialisers.
commit 0960d674d48808eaaa3475899f45cfd6c7c3e51d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 12 13:00:54 2014 +0200
Drop ImportError and FindError
We're not catching these anywhere.
commit 718f20da6d79466f91c49849bcf91a688aaa871e
Author: Shea Levy <shea@shealevy.com>
Date: Fri May 30 15:43:31 2014 -0400
findFile: Realise the context of the path attributes
commit a8fb575c98726f195d0cf5c7e6b7e51c75a0a9b3
Author: Shea Levy <shea@shealevy.com>
Date: Fri May 30 15:04:17 2014 -0400
Share code between scopedImport and import
In addition to reducing duplication, this fixes both import from
derivation and import of derivation for scopedImport
commit 61c464f252271d3d6343e1bfa1e3b39d2c8473cd
Author: Steve Purcell <steve@sanityinc.com>
Date: Thu Jun 5 11:04:48 2014 +0100
Add autoloads, make code more concise & idiomatic
- Use define-derived-mode to declare nix-mode
- Use autoloads to ensure nix-mode is usable (and enabled) without needing `require`
- Use set + make-local-variable instead of longer 2-step equivalent
commit ee7fe64c0ac00f2be11604a2a6509eb86dc19f0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jun 10 14:02:56 2014 +0200
== operator: Ignore string context
There really is no case I can think of where taking the context into
account is useful. Mostly it's just very inconvenient.
commit b1beed97a0670befbfd5e105a81132e87e58ac37
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jun 10 13:45:50 2014 +0200
Report daemon OOM better
When copying a large path causes the daemon to run out of memory, you
now get:
error: Nix daemon out of memory
instead of:
error: writing to file: Broken pipe
commit 829af22759b8a99c3b44697365390a945f3acc04
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jun 10 13:30:09 2014 +0200
Print a warning when loading a large path into memory
I.e. if you have a derivation with
src = ./huge-directory;
you'll get a warning that this is not a good idea.
commit 3c6b8a521561f5341652ffe37b869d5ab457227b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 2 17:58:43 2014 +0200
nix-env -qa --json: Generate valid JSON even if there are invalid meta attrs
commit ceed8192848760430c9c23659f9cb979aad1f9c3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 29 19:04:27 2014 +0200
Fix test
commit becc2b01678c5742b3fe6c379430606a5ef8e34d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 29 19:02:14 2014 +0200
Sort nixPath attributes
commit 54a34119f349d531557af9e90d21d04d689ee817
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 17:53:17 2014 +0200
Use std::unordered_set
commit a457d5ad4d7f6cd4f817581de1b4f70cdad9c617
Author: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun May 4 14:26:41 2014 +0200
nix-build: --add-root also takes 1 parameter
commit b1d39d476544644b2de8addb5ad3289fede2f95a
Author: Sönke Hahn <soenkehahn@gmail.com>
Date: Fri May 23 11:41:09 2014 +0800
dev-shell is a bash script, not sh
'type -p' does not work in e.g. dash
commit 8ea9fd7aa6b2152f95724e504ac61c57d90b113c
Author: Adam Szkoda <adaszko@gmail.com>
Date: Sun May 25 10:54:54 2014 +0200
Rephrase @ operator description
commit d8c061e044a07f7516d76df12bc6920f4f04e5ff
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 17:14:28 2014 +0200
Remove ExprBuiltin
It's slower than ExprVar since it doesn't compute a static
displacement. Since we're not using the throw primop in the
implementation of <...> anymore, it's also not really needed.
commit 62a6eeb1f3da0a5954ad2da54c454eb7fc1c6e5d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 17:02:22 2014 +0200
Make the Nix search path declarative
Nix search path lookups like <nixpkgs> are now desugared to ‘findFile
nixPath <nixpkgs>’, where ‘findFile’ is a new primop. Thus you can
override the search path simply by saying
let
nixPath = [ { prefix = "nixpkgs"; path = "/my-nixpkgs"; } ];
in ... <nixpkgs> ...
In conjunction with ‘scopedImport’ (commit
c273c15cb13bb86420dda1e5341a4e19517532b5), the Nix search path can be
propagated across imports, e.g.
let
overrides = {
nixPath = [ ... ] ++ builtins.nixPath;
import = fn: scopedImport overrides fn;
scopedImport = attrs: fn: scopedImport (overrides // attrs) fn;
builtins = builtins // overrides;
};
in scopedImport overrides ./nixos
commit 39d72640c2459dc2fa689bfe8b756ee193f7b98a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 16:50:36 2014 +0200
Ensure that -I flags get included in nixPath
Also fixes #261.
commit a8edf185a9e1677088c8c30acc9d281c8350bca7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 14:55:47 2014 +0200
Add constant ‘nixPath’
It contains the Nix expression search path as a list of { prefix, path
} sets, e.g.
[ { path = "/nix/var/nix/profiles/per-user/root/channels/nixos"; prefix = ""; }
{ path = "/etc/nixos/configuration.nix"; prefix = "nixos-config"; }
{ path = "/home/eelco/Dev/nix/inst/share/nix/corepkgs"; prefix = "nix"; }
]
commit c273c15cb13bb86420dda1e5341a4e19517532b5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 13:46:11 2014 +0200
Add primop ‘scopedImport’
‘scopedImport’ works like ‘import’, except that it takes a set of
attributes to be added to the lexical scope of the expression,
essentially extending or overriding the builtin variables. For
instance, the expression
scopedImport { x = 1; } ./foo.nix
where foo.nix contains ‘x’, will evaluate to 1.
This has a few applications:
* It allows getting rid of function argument specifications in package
expressions. For instance, a package expression like:
{ stdenv, fetchurl, libfoo }:
stdenv.mkDerivation { ... buildInputs = [ libfoo ]; }
can now we written as just
stdenv.mkDerivation { ... buildInputs = [ libfoo ]; }
and imported in all-packages.nix as:
bar = scopedImport pkgs ./bar.nix;
So whereas we once had dependencies listed in three places
(buildInputs, the function, and the call site), they now only need
to appear in one place.
* It allows overriding builtin functions. For instance, to trace all
calls to ‘map’:
let
overrides = {
map = f: xs: builtins.trace "map called!" (map f xs);
# Ensure that our override gets propagated by calls to
# import/scopedImport.
import = fn: scopedImport overrides fn;
scopedImport = attrs: fn: scopedImport (overrides // attrs) fn;
# Also update ‘builtins’.
builtins = builtins // overrides;
};
in scopedImport overrides ./bla.nix
* Similarly, it allows extending the set of builtin functions. For
instance, during Nixpkgs/NixOS evaluation, the Nixpkgs library
functions could be added to the default scope.
There is a downside: calls to scopedImport are not memoized, unlike
import. So importing a file multiple times leads to multiple parsings
/ evaluations. It would be possible to construct the AST only once,
but that would require careful handling of variables/environments.
commit f0fdbd0897ce63c138ec663ed89a94709a8441a7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 26 12:34:15 2014 +0200
Shut up some signedness warnings
commit 0321ef9bb261958fe4d63210e9a9d3350737ef18
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 23 14:43:55 2014 +0200
Ugly hack to allow --argstr values starting with a dash
Fixes #265.
commit 3064a8215608eca391fcb9d492735a662f48242e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 22 11:38:50 2014 +0200
Disable parallel.sh test
It breaks randomly: http://hydra.nixos.org/build/11152871
commit 9f9080e2c019f188ba679a7a89284d7eaf629710
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 21 17:19:36 2014 +0200
nix-store -l: Fetch build logs from the Internet
If a build log is not available locally, then ‘nix-store -l’ will now
try to download it from the servers listed in the ‘log-servers’ option
in nix.conf. For instance, if you have:
log-servers = http://hydra.nixos.org/log
then it will try to get logs from http://hydra.nixos.org/log/<base
name of the store path>. So you can do things like:
$ nix-store -l $(which xterm)
and get a log even if xterm wasn't built locally.
commit eac5841970737b799c55ec78f6ace6d80762ff04
Author: Shea Levy <shea@shealevy.com>
Date: Thu May 15 11:30:46 2014 -0400
Provide a more useful error message when a dynamic attr lookup fails
commit 8d5f472f2c49c79a0d3ae2e506f4d4d76224b328
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 15 11:37:44 2014 +0200
lvlInfo -> lvlTalkative
commit 84813af5b938246d9a4a785dfb08b86383ef62ae
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 15 11:33:46 2014 +0200
nix-store --optimise: Remove bogus statistics
commit 690adeb03de039551c4d8b5b4e7dda21c9c8f9b9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 15 11:19:16 2014 +0200
Remove tab
commit a1b66f316e980b4b7e755de47604bdc30371b67e
Merge: e384e7b 3b9ea84
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 15 11:18:29 2014 +0200
Merge branch 'master' of github.com:wmertens/nix
commit 3b9ea8452f102595874826e349fa38f85c00aa39
Author: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu May 15 09:02:22 2014 +0200
Shortcut store files before lstat
readdir() already returns the inode numbers, so we don't need to call
lstat to know if a file was already linked or not.
commit d73ffc552f78e0d9048e3bcc1e84452d1e8d2ede
Author: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed May 14 22:52:10 2014 +0200
Use the inodes given by readdir directly
commit e384e7b387c4745f30032ef431a06aa26cee73a5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 14 22:25:25 2014 +0200
Remove redundant code
commit e974f20c9811c3efe09cfca9bda7816f9091c0d5
Author: Wout Mertens <Wout.Mertens@gmail.com>
Date: Tue May 13 23:10:06 2014 +0200
Preload linked hashes to speed up lookups
By preloading all inodes in the /nix/store/.links directory, we can
quickly determine of a hardlinked file was already linked to the hashed
links.
This is tolerant of removing the .links directory, it will simply
recalculate all hashes in the store.
commit 36662eb5629c31cfd1b8472c9b7eb136b3937a4d
Author: Ricky Elrod <ricky@elrod.me>
Date: Sun May 11 18:57:53 2014 -0400
Prepare nix-mode to be uploaded to marmalade
Signed-off-by: Ricky Elrod <ricky@elrod.me>
commit 95501c4deea1d945022df18475340232bc6980be
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 13 12:54:28 2014 +0200
nix-instantiate --eval: Apply auto-arguments if the result is a function
Fixes #254.
commit a55e77ae10a76336728be6fbb0f0d7957422b56a
Author: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon May 12 14:31:16 2014 -0400
fix typo
commit a84f503d863fd77de9b6ecf149399c2ca7642b75
Author: wmertens <Wout.Mertens@gmail.com>
Date: Sat May 10 15:53:01 2014 +0200
Shortcut already-hardlinked files
If an inode in the Nix store has more than 1 link, it probably means that it was linked into .links/ by us. If so, skip.
There's a possibility that something else hardlinked the file, so it would be nice to be able to override this.
Also, by looking at the number of hardlinks for each of the files in .links/, you can get deduplication numbers and space savings.
commit aa9b1cf48e6482a74dcc19e6aef1d8236b57abe4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 6 10:51:16 2014 +0200
Really fix the RPM builds
http://hydra.nixos.org/build/10840199
commit 2c4affbaa88c8bfbee92093f0355b6e118fd5447
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 5 20:22:35 2014 +0200
Fix RPM build
We don't install a nix.conf anymore.
http://hydra.nixos.org/build/10826143
commit 93506e60d2f86079a6db260d376a92773900d0d3
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat May 3 17:54:48 2014 +0200
Add ubuntu 14.04
commit 40250f23a0a301bb758e7f0f21fcd09b702e0e1e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 19:04:10 2014 +0200
Don't install Upstart job on Fedora
Also, don't install a nix.conf anymore, it's not needed.
http://hydra.nixos.org/build/10775854
commit 6dd10873961d45fd246b48ad82b7f05ad3d4d077
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 19:02:10 2014 +0200
Fix Debian tests
These actually run as root in a VM, so they get confused.
http://hydra.nixos.org/build/10775854
commit a8c31d501185c42de477a7e833af956d68e095c3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 14:44:44 2014 +0200
Simplify multi-user installation instructions
commit 696f960dee35889433adfa6c08a2dbfb6ea0724f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 14:31:15 2014 +0200
Set up directories and permissions for multi-user install automatically
This automatically creates /nix/var/nix/profiles/per-user and sets the
permissions/ownership on /nix/store to 1775 and root:nixbld.
commit 20668b136329da92be7c63e7f7c4918968ff0015
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 13:14:10 2014 +0200
Install an Upstart service
commit de4cdd0d47adc70a4db12397a42c18ee50b4e662
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 12:51:43 2014 +0200
Set build-max-jobs to the number of available cores by default
More zero configuration.
commit ada3e3fa15bc14aebb2bafd1240c15cf1fd99351
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 2 12:46:03 2014 +0200
When running as root, use build users by default
This removes the need to have a nix.conf, and prevents people from
accidentally running Nix builds as root.
commit eeffdb74dcdbd64bcdc44cff4e587b59c4f807b5
Author: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun Apr 27 14:07:50 2014 -0400
doc fix: swap 'import' and 'export'
commit 31fe55bb8e599702ac79b24b2109199be50a85a1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 25 14:55:13 2014 +0200
trunk -> master
commit 700c678c2eed5e05c3e68d722c41c2b37d0a2f45
Author: Ricardo M. Correia <rcorreia@wizy.org>
Date: Fri Apr 11 17:10:20 2014 +0200
nix-env: Minor change to '--delete-generations Nd' semantics
The option '--delete-generations Nd' deletes all generations older than N
days. However, most likely the user does not want to delete the
generation that was active N days ago.
For example, say that you have these 3 generations:
1: <30 days ago>
2: <15 days ago>
3: <1 hour ago>
If you do --delete-generations 7d (say, as part of a cron job), most
likely you still want to keep generation 2, i.e. the generation that was
active 7 days ago (and for most of the past 7 days, in fact).
This patch fixes this issue. Note that this also affects
'nix-collect-garbage --delete-older-than Nd'.
Thanks to @roconnor for noticing the issue!
commit fb5d76b89e8b0084fb147d79af5481e09b889386
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 15 15:32:27 2014 +0200
Fix test evaluation
commit a1917208c025e0a029cb33bbf3cf69e4d4128a39
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 11 15:11:28 2014 +0200
Bump date
commit 742933116fd803afbf8c36dbc1eab51612d4bb55
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 11 11:15:24 2014 +0200
Bump version to 1.8
commit 924e19341a5ee488634bc9ce1ea9758ac496afc3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 10 23:42:48 2014 +0200
Don't barf when installing as root
commit b0a09a6f320d3a0ac186e87edb1c1782d8d168d5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Apr 9 14:52:43 2014 +0200
Add docbook icons to the distribution
Grmbl...
commit dfa2f77d2e1118f32771c2fceefd683435554b9d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 8 19:24:29 2014 +0200
If a .drv cannot be parsed, show its path
Otherwise you just get ‘expected string `Derive(['’ which isn't very helpful.
commit e0a947cde6d11b5182500f024719b04b8997189a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 8 16:28:39 2014 +0200
Simplify quick start section
commit d23931f3a448fddc43d81f774fa83797729910e7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 8 16:10:25 2014 +0200
Remove redundant stuff
commit 48460057419ce651c9484a66d83e6b987b261d8c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 8 16:09:56 2014 +0200
Update installation instructions
commit 2b6c8ef40121fdc418551e9b780bb909477c9a3c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 8 14:08:57 2014 +0200
nix-shell --pure: Keep the user's $PAGER
commit 76cbf55a6d8953e393ba39896ccbb0948bac96d6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 8 13:51:34 2014 +0200
Ensure that systemd units to into lib, not lib64
http://hydra.nixos.org/build/10170940
commit 89f923281335f695d4199e1fafaaeeb1729ba2d3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 7 12:00:23 2014 +0200
Update release notes
commit 84d6936371037559704337614c65007a8e61b5e1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 7 11:18:54 2014 +0200
Install systemd units
commit 8e5fbf4d730b9fcf39eddf5539a206cf19d2cdce
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 22:52:14 2014 +0200
Show position info in attribute selection errors
commit 4c5faad99408cdfc35a8b0923d1efdf288fd9990
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 22:43:52 2014 +0200
Show position info in Boolean operations
commit bd9b1d97b42f307c8b595bb2de9b15bec1405b23
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 22:19:33 2014 +0200
Show position info in string concatenation / addition errors
commit 8160f794e79a4a2a5269080b408d69fc93d7a305
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 21:53:47 2014 +0200
derivation: Don't require certain function arguments
Turns out that in Nixpkgs, derivation is actually called without a
‘name’ argument in some places :-(
commit a5fe73094016973a50741db0c5d51ca96c14147b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 21:14:11 2014 +0200
forceString: Show position info
commit 27b44b8cf7072b09a1929ee44ba784b1c8d5211a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 19:11:40 2014 +0200
forceAttrs: Show position info
commit 96b695ccab4a4c8c4ef7f14ac261df43dcc00743
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 19:05:36 2014 +0200
forceList: Show position info
commit b62d36963c45ccaebb328fceaf0bb40f9c02a14b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 18:58:15 2014 +0200
forceInt: Show position info
commit c28de6d96e7bfea834a44deac5217d4696fa8d86
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 18:51:01 2014 +0200
Pass position information to primop calls
For example:
error: `tail' called on an empty list, at
/home/eelco/Dev/nixpkgs/pkgs/applications/misc/hello/ex-2/default.nix:13:7
commit 8b31ffd10de44871a3912184fedbeca57d8cf60f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 17:58:23 2014 +0200
Remove unnecessary quotes around file names
commit b72c8d2e5b5bbdc218f7c00694027cdd75b6a584
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 17:53:52 2014 +0200
Include position info in function application
This allows error messages like:
error: the anonymous function at `/etc/nixos/configuration.nix:1:1'
called without required argument `foo', at
`/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/lib/modules.nix:77:59'
commit 3f8e1f56825f3ec2a9d99715609e362fe5e5a218
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 14:51:07 2014 +0200
Update release notes
commit 1f19fdbd45d902a48fd8bacb25ef1a88020a0cc7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 4 13:49:53 2014 +0200
Document that we require a C++11 compiler
commit ae6b631dc48f4b923a6ed17b8d6e59524c4ea883
Author: Danny Wilson <danny@decube.net>
Date: Thu Apr 3 16:59:25 2014 +0200
Fix compile errors on Illumos
commit daa16cca11304a0e91a188176959e2af28be1f57
Merge: f0de863 7191a73
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 3 17:37:14 2014 +0200
Sync with make-rules repo
commit 7191a7394a3091ed2856508674f84f3a87eda5a6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 3 17:35:16 2014 +0200
Support Illumos
From https://github.com/NixOS/nix/pull/236
commit f0de86357c18e18eccd814c8bea3bfdaf10f75f5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 3 15:24:02 2014 +0200
Tweak error message
commit e7720aa10a1da63bb15a4587837d649268944943
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Apr 2 23:41:11 2014 +0200
Make sure /dev/pts/ptmx is world-writable
While running Python 3’s test suite, we noticed that on some systems
/dev/pts/ptmx is created with permissions 0 (that’s the case with my
Nixpkgs-originating 3.0.43 kernel, but someone with a Debian-originating
3.10-3 reported not having this problem.)
There’s still the problem that people without
CONFIG_DEVPTS_MULTIPLE_INSTANCES=y are screwed (as noted in build.cc),
but I don’t see how we could work around it.
commit ac6ceea7641d6c19c71079e22b03b4c1519c0c94
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 1 17:04:38 2014 +0200
Fix potential segfault
The newEnv variable was accessed (via the dynamicEnv) pointer after it
had gone out of scope.
Fixes #234.
commit 034b6f60626be014d00f68e02d8614ddf7ba44a0
Author: Ricardo M. Correia <rcorreia@wizy.org>
Date: Tue Mar 11 22:16:00 2014 +0100
nix-collect-garbage: Add --delete-older-than option
commit 7ef7597f71b282265a9f79afe4608cd3b1bc4127
Author: Ricardo M. Correia <rcorreia@wizy.org>
Date: Tue Mar 11 21:47:21 2014 +0100
nix-env: Add support for --delete-generations 15d
It will delete all generations older than the specified number of days.
commit 59c90196850b6ac8c110e54c7f03d6417ed9bf61
Author: Maxim Ivanov <ivanov.maxim@gmail.com>
Date: Sat Mar 29 11:43:11 2014 +0000
Fix nix-shell for derivation with multiple outputs
If derivation declares multiple outputs and first (default) output
if not "out", then "nix-instantiate" calls return path with output
names appended after "!". Than suffix must be stripped before
ant path checks are done.
commit 1c2550a2ae826c422cf6d34f1c5c3e687474929d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Mar 30 00:49:23 2014 +0100
boost::shared_ptr -> std::shared_ptr
commit 9becaa041f4a597dc085e58ebe8f66a4f95d018e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Mar 29 22:20:33 2014 +0100
Drop pointless #include
commit acb8facbbc3ae0795987bd03a3dc2c17217d6172
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Mar 29 22:14:11 2014 +0100
Fix potential segfault in waitForInput()
Since the addition of build-max-log-size, a call to
handleChildOutput() can result in cancellation of a goal. This
invalidated the "j" iterator in the waitForInput() loop, even though
it was still used afterwards. Likewise for the maxSilentTime
handling.
Probably fixes #231. At least it gets rid of the valgrind warnings.
commit 90dc50b07c3939dda44fde79f696f64bf8f2f4d7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Mar 29 20:20:14 2014 +0100
restoreSIGPIPE(): Fill in sa_mask
Issue #231.
commit 49009573bc2eacd823d57433daf1f59dfe415065
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Mar 28 16:59:26 2014 +0100
Don't interpret strings as format strings
Ludo reported this error:
unexpected Nix daemon error: boost::too_few_args: format-string refered to more arguments than were passed
coming from this line:
printMsg(lvlError, run.program + ": " + string(err, 0, p));
The problem here is that the string ends up implicitly converted to a
Boost format() object, so % characters are treated specially. I
always assumed (wrongly) that strings are converted to a format object
that outputs the string as-is.
Since this assumption appears in several places that may be hard to
grep for, I've added some C++ type hackery to ensures that the right
thing happens. So you don't have to worry about % in statements like
printMsg(lvlError, "foo: " + s);
or
throw Error("foo: " + s);
commit 24cb65efc3c34e24fc653779a4d42cf4f31c6737
Author: Ludovic Courtès <ludo@gnu.org>
Date: Fri Mar 21 13:54:53 2014 +0100
Make /dev/kvm optional
The daemon now creates /dev deterministically (thanks!). However, it
expects /dev/kvm to be present.
The patch below restricts that requirement (1) to Linux-based systems,
and (2) to systems where /dev/kvm already exists.
I’m not sure about the way to handle (2). We could special-case
/dev/kvm and create it (instead of bind-mounting it) in the chroot, so
it’s always available; however, it wouldn’t help much since most likely,
if /dev/kvm missing, then KVM support is missing.
commit 3fc056927c962ec9778e94528f2f9ae316afca4e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 18 23:23:55 2014 +0100
Fix tabs
commit 51800e06dec91282b81fc41e56d1e9325849d2c2
Author: Ludovic Courtès <ludo@gnu.org>
Date: Tue Mar 18 23:17:14 2014 +0100
Allow recovery from isValidPath RPCs with an invalid path
Currently, clients cannot recover from an isValidPath RPC with an
invalid path parameter because the daemon closes the connection when
that happens.
More precisely:
1. in performOp, wopIsValidPath case, ‘readStorePath’ raises an
‘Error’ exception;
2. that exception is caught by the handler in ‘processConnection’;
3. the handler determines errorAllowed == false, and thus exits after
sending the message.
This last part is fixed by calling ‘startWork’ early on, as in the patch
below.
The same reasoning could be applied to all the RPCs that take one or
more store paths as inputs, but isValidPath is, by definition, likely to
be passed invalid paths in the first place, so it’s important for this
one to allow recovery.
commit f93e97517e449cb1b3c7bdf8076812276b4cb2cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 17 17:35:11 2014 +0100
Fix -j and other flags when using the daemon
commit 77e2cc6c8ed1206c029218d3bc22575202a73b4c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 17 17:33:13 2014 +0100
nix-build: Fix --cores flag
commit fb8d8f5428ec37a40656d64d9190fdc32b0c769b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Mar 12 14:42:25 2014 +0100
Remove unnecessary null pointer checks
Fixes #225.
commit 006f24c7faf146d97742c1d7cc270ec107fa2e56
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Mar 12 14:25:48 2014 +0100
Document nix-env -q --json
commit d435e46daa98ffd268b6bb7221b0f3841f3a63ef
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Mar 12 14:15:37 2014 +0100
Generate release notes again
commit e9934bb5ada1a974744c61479ca50c75c82e5836
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Mar 12 13:58:06 2014 +0100
Update release notes for 1.7
commit 25386e5edc2d65c84ce824d2c964a5c029f4c30d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 11 17:31:13 2014 +0100
Fix passing meta attribute to buildenv.nix
Since the meta attributes were not sorted, attribute lookup could
fail, leading to package priorities and active flags not working
correctly.
Broken since 0f24400d90daf65cf20142a662f8245008437e2c.
commit 92a848f674f371d675f461d2a7a6810d492dd4ea
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 11 13:16:21 2014 +0100
Fix typos
commit 2f2a20ed18535ba819225fabe9a4cf2f37d2edb1
Author: Shea Levy <shea@shealevy.com>
Date: Mon Mar 10 07:09:07 2014 -0400
Document null dynamic attrs
commit 049a379ec6ca755bcc077fd0e8da186ff76b8679
Author: Shea Levy <shea@shealevy.com>
Date: Sun Mar 9 14:41:02 2014 -0400
The expr of AttrNames/DynamicAttrDefs is always an ExprConcatStrings
commit 908e9ce259710037ae9824a3246143e46e27e867
Author: Shea Levy <shea@shealevy.com>
Date: Sun Mar 9 14:24:47 2014 -0400
If a dynamic attribute name evaluates to null, remove it from the set
commit 2caab8166045135bb78fd93dc9778a4d25d9499f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Mar 5 16:18:13 2014 +0100
Revert "Make ifs and asserts tail-recursive"
This reverts commit 273322c7732093a354e86df82cf75d6604b8bce8.
commit f7e077ad275a0f405b750e2b19fedbeadc6f8a15
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Mar 5 11:11:24 2014 +0100
Install missing Boost headers
http://hydra.nixos.org/build/9328376
commit d6a45f6bdbf7c71eda9e4ab1ab78b373be5422b9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 3 15:29:58 2014 +0100
Don't set an absolute soname
commit a3767628481eefc956eb9d9d70eda62930549205
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 3 15:19:04 2014 +0100
Add support for making relocatable packages using $ORIGIN
commit 3a86888fd7da44782233adf9fde34b6605e015bd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 28 14:01:26 2014 +0100
Typo
commit 4eac3b2471063a3726790368665df963e809fc4e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 28 12:13:20 2014 +0100
Add a variable GLOBAL_CXXFLAGS_PCH for use by precompiled headers
You don't want to use GLOBAL_CXXFLAGS for passing flags like
"-include-pch" (clang), because that means you cannot use
GLOBAL_CXXFLAGS when generating the PCH.
commit 4e7e498ff95b553227a26fc20549bd69995a0b08
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 28 12:01:42 2014 +0100
Add variable GLOBAL_COMMON_DEPS
This is a list of dependencies on which all C/C++ object files depend.
Primarily useful for global precompiled headers.
commit 1017bd68ea9264afe8b9d672653ca8c6271611d5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 27 23:25:03 2014 +0100
Set up a private /dev/pts in the chroot
commit 3fd01b171a74d28dc8e48b9ee5f2d0e9a3915fb8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 27 23:17:53 2014 +0100
Set up a minimal /dev in chroots
Not bind-mounting the /dev from the host also solves the problem with
/dev/shm being a symlink to something not in the chroot.
commit c9f6232304558cbdafb14e13e316e539f5bed72e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 27 21:47:59 2014 +0100
Correctly detect infinite recursion in function application
If we're evaluating some application ‘v = f x’, we can't store ‘f’
temporarily in ‘v’, because if ‘f x’ refers to ‘v’, it will get ‘f’
rather than an infinite recursion error.
Unfortunately, this breaks the tail call optimisation introduced in
c897bac54954373f63511702731fe2cb23c0c98e.
Fixes #217.
commit 29cde917fe6b8f2e669c8bf10b38f640045c83b8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 27 13:31:33 2014 +0100
Fix deadlock in SubstitutionGoal
We were relying on SubstitutionGoal's destructor releasing the lock,
but if a goal is a top-level goal, the destructor won't run in a
timely manner since its reference count won't drop to zero. So
release it explicitly.
Fixes #178.
commit 7c7707638a446f91893cdc21b9e0638d2ebd42d3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 22:41:29 2014 +0100
Doh
commit 788097382743dccc2e6de02c0b0342c9bb693b37
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 19:12:31 2014 +0100
Test trace and addErrorContext
commit 5ad263c26b5b9cc0ba067050e4a09b2491c9d40c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 19:08:44 2014 +0100
Test some more primops
commit 3d0a9ec8258fc2a6ec6a73e249aa38fbd03207d8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:59:01 2014 +0100
Test executables in NARs
commit 91f25f0510db32d627bf5ed7d4067b90e37f2f86
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:55:18 2014 +0100
And another one
commit 432328cc550cea6b6ab23b3eeca69dc2307c5c74
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:49:36 2014 +0100
Remove another unused function
commit 509993e5983e333f5a50ee75d71c742590d304fb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:48:32 2014 +0100
Remove unused function
commit d58ceae022ad887686e55068db7229f931eb96af
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:45:26 2014 +0100
Test nix-env --switch-generation
commit 7bbc68fdff0afe22a517b63f3ca37d9021a5799c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:42:19 2014 +0100
Test nix-env --set
commit a0806389e909203d9c3c1c32a2cc95b50300da59
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:40:08 2014 +0100
Test the -b and -s flags of nix-store -q
commit a9c4a987705b00a6d5e98e0ad7cc44c8bc96ba22
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:33:13 2014 +0100
Test ~/.nix-defexpr
commit 045d3b2ed7aa7678779052a1d0accf53d47988b7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:28:55 2014 +0100
Test nix-store --switch-profile and more daemon actions
commit fac6f8aac0802be4481e7dab53d4875ca8b60ee0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 18:00:46 2014 +0100
Test nix-store -q --roots
commit 84143c4bd80b38a44443e06f1c8c33dc212ccef7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 17:58:53 2014 +0100
Test nix-store -l
commit 19437785ebf515aa0ac63541566d28267f63a333
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 17:53:51 2014 +0100
Test nix-store --optimise
commit fdff3a7eae8a4d2f0e6eae992d3c3cf64e1a3ad3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 17:47:54 2014 +0100
Add a test for nix-store --dump-db / --load-db
commit 506d86394d463d862b212f2f203bdded98a8efab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 17:23:23 2014 +0100
Installer: Handle Darwin
"cp -r" doesn't copy symlinks properly on Darwin, but "cp -R" does.
Fixes #215.
commit 6b9cd59a41f059bed393f512bf495be09c1d22f6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 16:32:46 2014 +0100
nix-store -r: Respect --add-root for non-derivations
Fixes #68.
Fixes #117.
commit 7f74513b4e5b632b4099702cf4fe2800de7b67f9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 16:07:43 2014 +0100
Also provide an option for setting the curl connection timeout
commit 00d761016a33ff9aa0ea162402d0d846dd1927cb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 15:58:37 2014 +0100
Respect $NIX_CONNECT_TIMEOUT properly
We were 1) using CURLOPT_TIMEOUT instead of CURLOPT_CONNECTTIMEOUT; 2)
not passing it to the curl child process.
Issue #93.
commit d761009e3ccdcdd7b150b26f7f35eecf8f2fb59c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 15:24:48 2014 +0100
Add ~/.nix-profile/sbin to $PATH
Fixes #112.
commit f14ef84a51e211b3924f59333d98d838ab500740
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 15:21:56 2014 +0100
Warn about missing -I paths
Fixes #121. Note that we don't warn about missing $NIX_PATH entries
because it's intended that some may be missing (cf. the default
$NIX_PATH on NixOS, which includes paths like /etc/nixos/nixpkgs for
backward compatibility).
commit 733214144a7a910001c1c82683db780853bac9b1
Author: Shea Levy <shea@shealevy.com>
Date: Wed Jan 22 00:33:18 2014 +0000
Document dynamic attributes
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 42eb4afd7a38f3024a66da037d9f39859f7bd8f3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 13:58:46 2014 +0100
Simplify getting use-ssh-substituter from untrusted users
commit bf4a577a586d99b7bc4298ae662e312eb73815e2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 13:48:23 2014 +0100
Fix broken patch
commit 8a02fdc38ef5d02115d152a2d3e79ebd8a462e3e
Author: Ian-Woo Kim <ianwookim@gmail.com>
Date: Fri Feb 14 14:44:01 2014 -0800
use USER environmental variable if getting user id by getpwuid is failed in perl scripts: download-from-binary-cache.pl and nix-channel
commit dcaea042fc895667bf6f529471ff9f449629774c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 26 13:40:08 2014 +0100
Only start download-via-ssh if it's enabled
commit df5de9dfd72f9dc3d57157d0496443732a517491
Author: Shea Levy <shea@shealevy.com>
Date: Wed Feb 19 07:05:15 2014 -0500
Add use-ssh-substituter setting.
It defaults to false and can be overridden by RemoteStore.
Untested currently, just quickly put this together
commit 36b90e72d7e09b983acfa08f9016e8b3ece5199d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 19 17:08:01 2014 +0100
nix-shell: Add --packages flag
This allows you to easily set up a build environment containing the
specified packages from Nixpkgs. For example:
$ nix-shell -p sqlite xorg.libX11 hello
will start a shell in which the given packages are present.
commit a897b583733aaf3ee7aa0efe495f9ea046567555
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 19 16:46:33 2014 +0100
nix-instantiate: Allow --dry-run as a synonym for --readonly-mode
--dry-run is more consistent with nix-env and nix-store.
commit e1cf40fa9537162efe0dc19dcea9ae7d043fde66
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 19 16:34:24 2014 +0100
nix-instantiate: Rename --eval-only to --eval, --parse-only to --parse
commit c31836008e45460513188a3fbeda4416f9153a05
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 19 16:30:19 2014 +0100
nix-instantiate: Add a flag --expr / -E to read expressions from the command line
This is basically a shortcut for ‘echo 'expr...' | nix-instantiate -’.
Also supported by nix-build and nix-shell.
commit e707a8a526698de2237e6ac89e2f1ce6dbc63269
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 19 15:32:19 2014 +0100
Move manpages around
commit 73f74ebba09f8bceed46a11f7348b4c398bde6f3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 19 15:01:04 2014 +0100
nix-shell: Don't leave a temporary directory in /tmp behind
commit a7e70518b8d0cb9a72cb3733b563b49caf922966
Author: Shea Levy <shea@shealevy.com>
Date: Sat Feb 15 11:02:47 2014 -0500
lexer-tab.o and parser-tab.o require each other's headers
commit 70a558e20250f7c865fd36c1c678192fe29d088f
Author: Shea Levy <shea@shealevy.com>
Date: Sat Feb 15 10:56:11 2014 -0500
Update ignores
commit 7bef965d6f191efb9c671f49fd187f4214db6120
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 18 13:35:35 2014 +0100
Make it work on GNU Make > 3.81 again
commit 79f699edca26c035a8bcd68c7d5a13b4fbcbf3be
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 18 12:57:32 2014 +0100
More GNU Make 3.81 compatibility
commit 8129cf33d959db44344fbffc34a981cc27b29bfb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 18 10:46:30 2014 +0100
Slight simplification
commit 1aa19b24b27c6bbf4d46cdd7f6d06b534dd67c19
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 18 01:01:14 2014 +0100
Add a flag ‘--check’ to verify build determinism
The flag ‘--check’ to ‘nix-store -r’ or ‘nix-build’ will cause Nix to
redo the build of a derivation whose output paths are already valid.
If the new output differs from the original output, an error is
printed. This makes it easier to test if a build is deterministic.
(Obviously this cannot catch all sources of non-determinism, but it
catches the most common one, namely the current time.)
For example:
$ nix-build '<nixpkgs>' -A patchelf
...
$ nix-build '<nixpkgs>' -A patchelf --check
error: derivation `/nix/store/1ipvxsdnbhl1rw6siz6x92s7sc8nwkkb-patchelf-0.6' may not be deterministic: hash mismatch in output `/nix/store/4pc1dmw5xkwmc6q3gdc9i5nbjl4dkjpp-patchelf-0.6.drv'
The --check build fails if not all outputs are valid. Thus the first
call to nix-build is necessary to ensure that all outputs are valid.
The current outputs are left untouched: the new outputs are either put
in a chroot or diverted to a different location in the store using
hash rewriting.
commit 4ec626a286afd4a9596357fc6d36aaf8bc07442a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 23:24:12 2014 +0100
Test nix-store --verify-path and --repair-path
commit 99f14c25842a897a1a352a3b3be7c0362cb0313f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 23:10:40 2014 +0100
Don't build on Debian 6.0
Its linker is too old to understand --no-copy-dt-needed-entries.
http://hydra.nixos.org/build/9113883
commit b6def5b542d35eaed5e8cbc6eaa9bbf644262686
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 23:09:48 2014 +0100
Make --repair work on Darwin
Mac OS X doesn't allow renaming a read-only directory.
http://hydra.nixos.org/build/9113895
commit dfbcb7c403363c21c1eab8082ffaade29bba9036
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 23:04:52 2014 +0100
Refactoring
commit 71adb090f05532b2116e952b617048abd0a6081d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 22:58:21 2014 +0100
When using a build hook, only copy missing paths
commit 69fe6c58faa91c3b8f844e1aafca26354ea14425
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 22:25:15 2014 +0100
Move some code around
In particular, do replacing of valid paths during repair later. This
prevents us from replacing a valid path after the build fails.
commit 1da6ae4f9904f7e09166085a2cfed8887e0e86d4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 14:48:50 2014 +0100
nix-store --gc --max-freed: Support a unit specifier
E.g. "--max-freed 10G" means "free ten gigabytes".
commit 00d30496ca32145f55891364ddcf3d4af87f05d5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 14:15:56 2014 +0100
Heuristically detect if a build may have failed due to a full disk
This will allow Hydra to detect that a build should not be marked as
"permanently failed", allowing it to be retried later.
commit e81d38c02b267eea93a91de3e8a00b185355d681
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 13:34:24 2014 +0100
nix-shell: Execute shellHook if it exists
Since normal builds don't execute shellHook, this allows nix-shell
specific customisation. Suggested by Domen.
commit 832377bbd6ccd43895ac346131cafe4901f7996b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 17 12:22:50 2014 +0100
Add a test for repairing paths
commit 581a160c11dd3de66d9cd1a6e01c0641909546ef
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 14 20:12:04 2014 +0100
Add a function for looking up programs in $PATH
commit a9d99ab55fdaa1c9dde87eaa8d289ecdb8cf9068
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 14 12:31:10 2014 +0100
download-via-ssh: Use readStorePath
commit 4db572062ccf318a6524abb8da046592a570eb94
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 14 12:20:12 2014 +0100
download-via-ssh: Show where we're downloading from
commit dba33d4018c07699b59f024ca61442c896579c64
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 14 11:48:42 2014 +0100
Minor style fixes
commit 61fd494d760d667649fa48665f9aa75ba88a1eb6
Merge: f9fc6ac f67f527
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 14 11:42:47 2014 +0100
Merge remote-tracking branch 'shlevy/ssh-substituter'
commit f67f52751f21b2fe70b5a7352053f130eb6f0f59
Author: Shea Levy <shea@shealevy.com>
Date: Wed Feb 12 07:33:07 2014 -0500
Indendation fix
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 62eb9eb76ddacc1aa97400bef9f25b6ca4c50c8c
Author: Shea Levy <shea@shealevy.com>
Date: Wed Feb 12 07:27:45 2014 -0500
Remove relic of old code
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 7438f0bc2bc4b92bddf7159744ab2923e34b7457
Author: Shea Levy <shea@shealevy.com>
Date: Wed Feb 12 07:26:35 2014 -0500
error messages start in lowercase
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 2246aa77d291e07141f6a508e46730e2c28e1d84
Author: Shea Levy <shea@shealevy.com>
Date: Wed Feb 12 07:22:36 2014 -0500
Remove using declarations from download-via-ssh
Signed-off-by: Shea Levy <shea@shealevy.com>
commit f9fc6acbf4eadd2d9018d3da14394fdfbddde5f6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 12 10:53:22 2014 +0100
Document current meaning of preferLocalBuild
Closes #208.
commit a35c6eb4a2209716fe1d40cebad2b3adb5d05e0f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 11 14:15:57 2014 +0100
Support setting CFLAGS and CXXFLAGS for libraries/programs
commit 1f841c9d50a100a3d40fec6260d36ec9ee309af3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 10 17:42:36 2014 +0100
Force use of Bash
"echo -n" doesn't work with /bin/sh on Darwin.
commit 57386c9baee78e50eb0c4a901ca9e1c147dc9777
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 10 16:35:59 2014 +0100
Binary tarball: Automatically create /nix
The tarball can now be unpacked anywhere. The installation script
uses "sudo" to create /nix if it doesn't exist. It also fetches the
nixpkgs-unstable channel.
commit c89d6b9b63b629ff936a56855be5689523910c58
Author: Shea Levy <shea@shealevy.com>
Date: Mon Feb 10 07:43:13 2014 -0500
nix-store --serve: Use a versioned protocol
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 38c3beac1a8ac9ddf4fdbbcafd400dabcf195076
Author: Shea Levy <shea@shealevy.com>
Date: Mon Feb 10 06:52:48 2014 -0500
Move StoreApi::serve into opServe
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 16146031659eae475cd5933b8553b13d725ca436
Author: Shea Levy <shea@shealevy.com>
Date: Mon Feb 10 06:49:37 2014 -0500
Pass in params by const ref
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 78d979567fa304fa4445fe7403932d9d97183ebd
Author: Shea Levy <shea@shealevy.com>
Date: Mon Feb 10 06:43:29 2014 -0500
Clarify comment
Signed-off-by: Shea Levy <shea@shealevy.com>
commit c5839752b9d5099d4b5e7bcfc853581673e779f6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 10 10:50:29 2014 +0100
Binary tarball: Automatically fetch the Nixpkgs channel
commit b632153ebd1bf8d773872eb36f9ad335d2c89fab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 10 10:25:13 2014 +0100
nix-shell: Use shell.nix as the default expression if it exists
commit 64e23d0a38f316a07cef0960d0ed74a450214283
Author: Shea Levy <shea@shealevy.com>
Date: Sat Feb 8 00:05:46 2014 -0500
Add download-via-ssh substituter
This substituter connects to a remote host, runs nix-store --serve
there, and then forwards substituter commands on to the remote host and
sends their results to the calling program. The ssh-substituter-hosts
option can be specified as a list of hosts to try.
This is an initial implementation and, while it works, it has some
limitations:
* Only the first host is used
* There is no caching of query results (all queries are sent to the
remote machine)
* There is no informative output (such as progress bars)
* Some failure modes may cause unhelpful error messages
* There is no concept of trusted-ssh-substituter-hosts
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 5671188eb2822b7392a6affa5ebe2f1eb8f521a0
Author: Shea Levy <shea@shealevy.com>
Date: Fri Feb 7 16:56:00 2014 -0500
nix-store --serve: Flush out after every loop
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 73874629ef59dc3b237a2c316179e722f971bb5e
Author: Shea Levy <shea@shealevy.com>
Date: Fri Feb 7 16:17:52 2014 -0500
nix-store --serve: Use dump instead of export
Also remove signing support
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 188f96500bc16891b22c684ad96122635667a8ff
Author: Shea Levy <shea@shealevy.com>
Date: Fri Feb 7 15:29:32 2014 -0500
nix-store --serve: Don't fail if asked for info about non-valid path
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 94884475947ca8c44dda51d83f3c1fbfeff5ccc0
Author: Shea Levy <shea@shealevy.com>
Date: Fri Feb 7 14:07:31 2014 -0500
nix-store --serve: Don't loop forever
nix-store --export takes a tmproot, which can only release by exiting.
Substituters don't currently work in a way that could take advantage of
the looping, anyway.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 3a38d0f3565a02c034c29b264aceb0eb78dac005
Author: Shea Levy <shea@shealevy.com>
Date: Thu Feb 6 11:52:03 2014 -0500
Add the nix-store --serve command
This is essentially the substituter API operating on the local store,
which will be used by the ssh substituter. It runs in a loop rather than
just taking one command so that in the future nix will be able to keep
one connection open for multiple instances of the substituter.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 84a8b5e9af2df4ed7f7860a6768daf83f72724ca
Author: Shea Levy <shea@shealevy.com>
Date: Tue Feb 4 10:37:10 2014 -0500
nix-instantiate --eval-only --read-write-mode: Don't depend on ordering
Signed-off-by: Shea Levy <shea@shealevy.com>
commit e4058fab64d82ddb7723142c7c595e80eeba0f3e
Author: Shea Levy <shea@shealevy.com>
Date: Tue Feb 4 10:35:30 2014 -0500
Rename --no-readonly-mode --read-write-mode
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 0c3e8a616e8e243ee45c78491fe86f50230d82b9
Author: Shea Levy <shea@shealevy.com>
Date: Tue Feb 4 09:17:59 2014 -0500
nix-instantiate: Add a --no-readonly-mode flag
This allows running nix-instantiate --eval-only without performing the
evaluation in readonly mode, letting features like import from
derivation and automatic substitution of builtins.storePath paths work.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 0432bc52ea21bb7b60477965054362f7414c569f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 7 17:34:39 2014 +0100
Fix the RPM build
commit 7fab23e237b36a7ca2df6f34eb5febe4c851db42
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 7 17:15:00 2014 +0100
Install header files
commit 764d90597a2ef9f5f5a5041993b728e020fb08b0
Merge: 2a469ad a210c99
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 7 16:27:34 2014 +0100
Merge commit 'a210c995cdd9279ed4137ec5d2e4cc928cb36097'
commit a210c995cdd9279ed4137ec5d2e4cc928cb36097
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 7 15:06:21 2014 +0100
Support DESTDIR
commit 97f8e9bc76b08ac6d63c6419490f8fcc9670a58b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 6 19:06:08 2014 +0100
Remove dead code
commit 2a469ad31da7cac5c4ecab6838c364956319821f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 6 14:21:14 2014 +0100
Set a maintainer address
Issue #202.
commit 1f94ec3924f132ae6d92b29631a59f9818ba4e31
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 6 13:54:44 2014 +0100
Clean up a test warning
commit 20d059892819d2f06f4da8c1150c91e16df1f8cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 6 13:51:57 2014 +0100
Drop dependency on ‘expr’
http://hydra.nixos.org/build/8715639
Not sure why this causes a failure now.
commit 4161fce472a8875427e73776d0e8665ca49c1835
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 6 10:59:58 2014 +0100
Create the target directory of libraries and programs
commit 80b691316c4b15e69c63c285b8ed6cc72fb95e93
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 4 11:08:41 2014 +0100
Fix version in nix.spec
http://hydra.nixos.org/build/8715502
commit 4ee6001f95908578a1693c0fbf7b7fdc309b86c5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 4 11:02:49 2014 +0100
GNU Make 3.81 compatibility
3.81 doesn't understand the ‘define foo =’ syntax, which was added in
3.82. So use ‘define foo’ instead.
commit 0da82efa5d67ab1eb8b8cc066704d7f863451d5b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 4 11:02:49 2014 +0100
GNU Make 3.81 compatibility
3.81 doesn't understand the ‘define foo =’ syntax, which was added in
3.82. So use ‘define foo’ instead.
commit 143224f7cd6f6667047a1683c1ede4e1f7816843
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 4 10:09:45 2014 +0100
Add nix.spec to the distribution
commit d210cdc4355bb48786b474e41a8ed7f1a152626f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 3 22:36:07 2014 +0100
Fix assertion failure in ‘nix-store --load-db’
Namely:
nix-store: derivations.cc:242: nix::Hash nix::hashDerivationModulo(nix::StoreAPI&, nix::Derivation): Assertion `store.isValidPath(i->first)' failed.
This happened because of the derivation output correctness check being
applied before the references of a derivation are valid.
commit 73a775f3b757d105a9987c5e469d6a3e8f32024f
Merge: d6582c0 8468806
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 3 19:57:02 2014 +0100
Merge commit '8468806552d6730abec6431c42b5b0e897c0222c'
commit 8468806552d6730abec6431c42b5b0e897c0222c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Feb 3 17:05:55 2014 +0100
Add a basic README
commit d6582c04c169d7ac32820d855de92ca4e4969de3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 16:57:38 2014 +0100
Give a friendly error message if the DB directory is not writable
Previously we would say "error: setting synchronous mode: unable to
open database file" which isn't very helpful.
commit 2f9bb5c7e744ddca3fbe5576e520a3e80c106c55
Merge: c5ba081 6dca720
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 16:41:52 2014 +0100
Merge branch 'make'
commit 6dca72006aa9b1cf2f226bb5b538e744fcab976f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 16:30:24 2014 +0100
Only run "git ls-files" when doing "make check"
commit 2a97f7b039be4cd290076707e1b02d04d3b257b6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 16:08:59 2014 +0100
Fix logging test
commit 965218a62a195632fe754307e09d4d4abd286c82
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 16:08:51 2014 +0100
Remove obsolete file
commit b6465ae5d3efb057b82f31e10112cc359b9afdfd
Merge: 762ef46 28dc488
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 15:37:59 2014 +0100
Merge commit '28dc4883356a50f2805a3e3c819a541c44a4ff0a' into make
commit 762ef464f843a0fe50e25ba07d11296b1540080e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 15:37:50 2014 +0100
Fix the nix-profile test
commit 28dc4883356a50f2805a3e3c819a541c44a4ff0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 15:33:27 2014 +0100
installcheck: Don't depend on install
This is a hack to prevent "installcheck" from clobbering files fixed
up by Nixpkgs' fixupPhase.
commit 844d83352c23db4a3131ac2b11b9ed2af03cdfd6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 15:18:48 2014 +0100
More "make dist" fixes
commit 74ca70da3a6d2f110a9dccf15c46422b1b078e3f
Merge: 6ef32bd 1eff3ad
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 14:38:28 2014 +0100
Add 'mk/' from commit '1eff3ad37fdb9dcf9f8528fdacea0ebf0e79d545'
git-subtree-dir: mk
git-subtree-mainline: 6ef32bddc1f10034322966b3a5b85af7b9cdc4d8
git-subtree-split: 1eff3ad37fdb9dcf9f8528fdacea0ebf0e79d545
commit 6ef32bddc1f10034322966b3a5b85af7b9cdc4d8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 14:28:31 2014 +0100
Fix "make dist"
commit 1eff3ad37fdb9dcf9f8528fdacea0ebf0e79d545
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 14:36:44 2014 +0100
Add missing file
commit 6f8aa145d43d0453d74e70d1d33cfa6e21fddf89
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 14:22:08 2014 +0100
Improve "make dist"
commit 0c6d62cf27b3b22fa60bddad16ea8e8d062e4a99
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 12:26:38 2014 +0100
Remove Automakefiles
commit 16e7d692092449263880ee795ec419cecbe22d24
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 12:23:14 2014 +0100
Update Makefile variable names
commit ec1738589a3aa1dd59e476de09ae2721d51b3e6e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 12:20:06 2014 +0100
Make variable names more regular
commit 35107038f7c726f5ef8d7ab014ad45c73970e65d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 11:47:34 2014 +0100
Support adding "make help" text
commit f324b49ea19e606f84b89ecb499f0e961646cd50
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 11:31:25 2014 +0100
Change dependency file names from foo.dep to .foo.o.dep
commit ac8c2ef1aa30c50b568883d2051335a66437694f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Feb 1 11:30:21 2014 +0100
Build/install manual
commit 4271927c5be2c5b87ca83682d1f2bd71d5ce4a66
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jan 31 15:33:12 2014 +0100
Add support for installing man-pages
commit e0234dfddc8343a6bca80ba6e6e93d083ce51a85
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 30 12:11:06 2014 +0100
Rename Makefile -> local.mk
commit 4a2ec9c6598aafb98e5495c2cf3a24e166668790
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 30 12:08:26 2014 +0100
Install nix-worker symlink
commit c5ba08133370f98de722c978bda3b446721985de
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 23 13:33:00 2014 +0100
nix-shell: Add --impure flag
This is currently the default, but I might change that to --pure in
the future.
commit 79dee4283de798da8728dd8504cdc4ab5c9b9fe0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 23 13:31:29 2014 +0100
nix-shell: Preserve the TZ variable of the user
commit 7fdee6e13695a1e85b0b3f476a33a9e934af3f0b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 23 13:27:22 2014 +0100
nix-build: Refactor
commit 5311b2b25084e53ff132df96d66ab06efead0853
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 23 10:49:53 2014 +0100
Clang doesn't know the "-z defs" flag
commit 94f9c14d526abfe9b18045fc638e8f5a3a670210
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 18:29:55 2014 +0100
Fix some clang warnings
commit a26307b28192e61bc06b5f5ef42f0fb51858d822
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 17:39:19 2014 +0100
Fix build
commit 625ffd441d8c98331ee357f4900fa50dd9be05bc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 16:38:03 2014 +0100
Ugly hack to fix building with clang
commit 68cde53c47e5447d2c91f5fe4521b5209af7b73e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 15:34:04 2014 +0100
Fix building against Bison 3.0.2
commit 81628a6ccc6ce496735b22492bee15c9ad46f072
Merge: b1db599 5ef8508
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 15:30:01 2014 +0100
Merge branch 'master' into make
Conflicts:
src/libexpr/eval.cc
commit 5ef8508a92997dbd7f8aa501b64fd283fb1c7bb8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 15:11:57 2014 +0100
Remove unused type
commit c8fff6a77fb63dc8043a7a468feea37b41bfec06
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 21 15:09:59 2014 +0100
Fix evaluation
commit 0e2ca268187e0a1c17f2ba58ce53f59682df2fc4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 20 14:23:07 2014 +0100
nix.spec: Remove "make check" since it's a no-op
commit 0f2f44bb0ff8aafc160d8b236201ce510ca0b876
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 20 14:22:59 2014 +0100
Build Fedora 20 RPMs
commit bf0ad8aabca67b4faabe3a1ac3c57884ae9924f4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 15 14:34:49 2014 +0100
nix-profile.sh: Add the Nixpkgs channel to $NIX_PATH
commit f5e5793cd2f32bc0f0d072b38cda742830f40f25
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jan 6 13:53:57 2014 -0500
Bare dynamic attrs: Match interpolation semantics
Signed-off-by: Shea Levy <shea@shealevy.com>
commit f9913f4422d1317af3c6b5aff37ad18b78083eb5
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jan 6 10:27:26 2014 -0500
Allow "bare" dynamic attrs
Now, in addition to a."${b}".c, you can write a.${b}.c (applicable
wherever dynamic attributes are valid).
Signed-off-by: Shea Levy <shea@shealevy.com>
commit e640d671443e291b3ca5cc0575919d6fcf14a157
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 13 13:50:12 2014 +0100
Document nulls
commit f1357059a441a588b9a2b78d3500d7068238b478
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 13 13:46:44 2014 +0100
nix-shell: Don't set NIX_INDENT_MAKE
It generally is not useful in interactive environments (and messes up
some non-ANSI-compliant terminals).
commit ea59f39326c8e9dc42dfed4bcbf597fbce58797c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 13 13:42:29 2014 +0100
nix-shell: Set $IN_NIX_SHELL before evaluating
commit ca73c0102fc68ece171d7cc062e464b4d418d07c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jan 10 22:31:38 2014 +0100
Nicer Make output
E.g.
CXX src/nix-log2xml/log2xml.o
CC src/bsdiff-4.3/bsdiff.o
GEN scripts/nix-channel
LD src/libmain/libnixmain.so
commit e991ab942b6ed1bc50a63afafe55ffe5cae8cbad
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 22:14:34 2014 +0100
Add support for building shared libraries on Mac OS X
commit b1db599dd05e86f65e73dc40584913e6e78c2bac
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 22:10:35 2014 +0100
Generate schema.sql.hh
commit cf918b889b2ff30d1532a62d00c21007d0cb25cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 17:33:55 2014 +0100
Handle systems where "echo -n" doesn't work
commit 70d8e8fdded9e21995fecc3ecc68e14cf4f53be7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 16:57:38 2014 +0100
Declare template_files as a simply expanded variable
commit 814a73227f9571d8fbd831fedced5e87cd9c926b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 16:54:01 2014 +0100
Remove duplicate elements from *_SOURCES
This is useful when you do:
foo_SOURCES := $(wildcard *.cc) foo.cc
where foo.cc is a generated file. In this case, if foo.cc already
exists, you get foo.cc twice in foo_SOURCES, leading to a link error.
commit b4c684e0f9c6890e13f9a5cc90b5e379b3d1f75d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 16:53:47 2014 +0100
Update Makefiles
commit 568b1b0a8a65cb255d6a7a33dfe2c15df3212103
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 16:15:16 2014 +0100
Remove mk subdirectory in preparation for "git subtree"
commit 55c9a40613fefda6622aa9acd22cce4006fd1077
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 9 16:12:02 2014 +0100
Move stuff to top-level
This makes it easier to use with "git subtree".
commit f4013b6189af731af42f99684ed7721076a54a0d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 8 17:56:58 2014 +0100
Fix signed-binary-caches test
commit ea38e39a203a96451b1d0469103b737de5a85105
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 8 17:56:30 2014 +0100
Test whether Nix correctly checks the hash of downloaded NARs
commit 11cb4bfb257f18c906ef1d6f14ed450be8fa49fe
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 8 17:32:40 2014 +0100
Fix checking of NAR hashes
*headdesk*
*headdesk*
*headdesk*
So since commit 22144afa8d9f8968da351618a1347072a93bd8aa, Nix hasn't
actually checked whether the content of a downloaded NAR matches the
hash specified in the manifest / NAR info file. Urghhh...
commit 0fdf4da0e979f992db75cc17376e455ddc5a96d8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 8 15:23:41 2014 +0100
Support cryptographically signed binary caches
NAR info files in binary caches can now have a cryptographic signature
that Nix will verify before using the corresponding NAR file.
To create a private/public key pair for signing and verifying a binary
cache, do:
$ openssl genrsa -out ./cache-key.sec 2048
$ openssl rsa -in ./cache-key.sec -pubout > ./cache-key.pub
You should also come up with a symbolic name for the key, such as
"cache.example.org-1". This will be used by clients to look up the
public key. (It's a good idea to number keys, in case you ever need
to revoke/replace one.)
To create a binary cache signed with the private key:
$ nix-push --dest /path/to/binary-cache --key ./cache-key.sec --key-name cache.example.org-1
The public key (cache-key.pub) should be distributed to the clients.
They should have a nix.conf should contain something like:
signed-binary-caches = *
binary-cache-public-key-cache.example.org-1 = /path/to/cache-key.pub
If all works well, then if Nix fetches something from the signed
binary cache, you will see a message like:
*** Downloading ‘http://cache.example.org/nar/7dppcj5sc1nda7l54rjc0g5l1hamj09j-subversion-1.7.11’ (signed by ‘cache.example.org-1’) to ‘/nix/store/7dppcj5sc1nda7l54rjc0g5l1hamj09j-subversion-1.7.11’...
On the other hand, if the signature is wrong, you get a message like
NAR info file `http://cache.example.org/7dppcj5sc1nda7l54rjc0g5l1hamj09j.narinfo' has an invalid signature; ignoring
Signatures are implemented as a single line appended to the NAR info
file, which looks like this:
Signature: 1;cache.example.org-1;HQ9Xzyanq9iV...muQ==
Thus the signature has 3 fields: a version (currently "1"), the ID of
key, and the base64-encoded signature of the SHA-256 hash of the
contents of the NAR info file up to but not including the Signature
line.
Issue #75.
commit 405434e084fa994cc957249db7787731e9311fa8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 6 17:38:04 2014 +0100
Revert "nix-shell: Set $IN_NIX_SHELL before evaluation"
This reverts commit 0c1198cf08576f16633b2344dc6513cefb567cfc.
commit 7a61c88dbb517453f73c5b4ede4a4468e38cae32
Merge: 485f474 cd49fe4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 6 15:46:18 2014 +0100
Merge branch 'dynamic-attrs-no-sugar' of github.com:shlevy/nix
commit 485f4740ee3ba4228ba3345873eb530466a8f42d
Author: Domen Kožar <domen@dev.si>
Date: Wed Jan 1 18:10:48 2014 +0100
wording
commit fe23e28f12f5eedf387c974c73813f6de8320b21
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 6 11:34:05 2014 +0100
Disable FreeBSD tests for now
The FreeBSD machines in the build farm are currently unreachable.
commit 4252b5a645138e84fa8916dfc3f8d6af8e74fc28
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 6 11:32:22 2014 +0100
Disable the tail call test
On i686-linux, GCC stubbornly refuses to do tail-call optimisation.
Don't know why.
http://hydra.nixos.org/build/7300170
commit cd49fe4f9b338242e1e404fd4dbb0a3ebc1c3a12
Author: Shea Levy <shea@shealevy.com>
Date: Tue Dec 31 23:56:26 2013 +0000
Don't use any syntactic sugar for dynamic attrs
This doesn't change any functionality but moves some behavior out of the
parser and into the evaluator in order to simplify the code.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 6f3a51809a2603574a16573bd46b95e4ff5233bd
Author: Shea Levy <shea@shealevy.com>
Date: Tue Dec 31 17:57:10 2013 -0500
Fold dynamic binds handling into addAttr
Since addAttr has to iterate through the AttrPath we pass it, it makes
more sense to just iterate through the AttrNames in addAttr instead. As
an added bonus, this allows attrsets where two dynamic attribute paths
have the same static leading part (see added test case for an example
that failed previously).
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 18fefacf7df570444b332a8a0c2dc4f9d98d4344
Author: Shea Levy <shea@shealevy.com>
Date: Fri Sep 20 23:25:30 2013 -0400
Dynamic attrs
This adds new syntax for attribute names:
* attrs."${name}" => getAttr name attrs
* attrs ? "${name}" => isAttrs attrs && hasAttr attrs name
* attrs."${name}" or def => if attrs ? "${name}" then attrs."${name}" else def
* { "${name}" = value; } => listToAttrs [{ inherit name value; }]
Of course, it's a bit more complicated than that. The attribute chains
can be arbitrarily long and contain combinations of static and dynamic
parts (e.g. attrs."${foo}".bar."${baz}" or qux), which is relatively
straightforward for the getAttrs/hasAttrs cases but is more complex for
the listToAttrs case due to rules about duplicate attribute definitions.
For attribute sets with dynamic attribute names, duplicate static
attributes are detected at parse time while duplicate dynamic attributes
are detected when the attribute set is forced. So, for example, { a =
null; a.b = null; "${"c"}" = true; } will be a parse-time error, while
{ a = {}; "${"a"}".b = null; c = true; } will be an eval-time error
(technically that case could theoretically be detected at parse time,
but the general case would require full evaluation). Moreover, duplicate
dynamic attributes are not allowed even in cases where they would be
with static attributes ({ a.b.d = true; a.b.c = false; } is legal, but {
a."${"b"}".d = true; a."${"b"}".c = false; } is not). This restriction
might be relaxed in the future in cases where the static variant would
not be an error, but it is not obvious that that is desirable.
Finally, recursive attribute sets with dynamic attributes have the
static attributes in scope but not the dynamic ones. So rec { a = true;
"${"b"}" = a; } is equivalent to { a = true; b = true; } but rec {
"${"a"}" = true; b = a; } would be an error or use a from the
surrounding scope if it exists.
Note that the getAttr, getAttr or default, and hasAttr are all
implemented purely in the parser as syntactic sugar, while attribute
sets with dynamic attribute names required changes to the AST to be
implemented cleanly.
This is an alternative solution to and closes #167
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 136f2f7046dfed18fde0b5f9933ddfafc1518ef5
Author: Shea Levy <shea@shealevy.com>
Date: Fri Sep 13 16:55:33 2013 -0400
Add the ExprBuiltin Expr type to the AST
Certain desugaring schemes may require the parser to use some builtin
function to do some of the work (e.g. currently `throw` is used to
lazily cause an error if a `<>`-style path is not in the search path)
Unfortunately, these names are not reserved keywords, so an expression
that uses such a syntactic sugar will not see the expected behavior
(see tests/lang/eval-okay-redefine-builtin.nix for an example).
This adds the ExprBuiltin AST type, which when evaluated uses the value
from the rootmost variable scope (which of course is initialized
internally and can't shadow any of the builtins).
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 5ba5993470a6ad532fc8e842084a574a88876b0a
Author: Shea Levy <shea@shealevy.com>
Date: Mon Dec 30 07:58:14 2013 -0500
nix-shell --pure: Don't clear IN_NIX_SHELL
Signed-off-by: Shea Levy <shea@shealevy.com>
commit b352fe2775d09993add893ebff8c0c4c8369182a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 14:18:24 2013 +0100
Revert "Scan /proc/<pid>/cmdline for GC roots"
This reverts commit 194e3374b89b8b2dec6296923877304bdb5c6ae2.
Checking the command line for GC roots means that
$ nix-store --delete $path
will fail because $path is now a root because it's mentioned on the
command line.
commit 8931bf7168cbbc6a078bed6486b8081652663836
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 13:09:12 2013 +0000
Doh
commit f1e5dedb611d39ecc600fccb4eba4b0de730c5fc
Author: Petr Rockai <me@mornfall.net>
Date: Sun Nov 24 21:22:23 2013 +0100
perl: Call loadConfFile() in doInit to avoid screwing sqlite journal mode.
If the database is opened through perl bindings (and even though nix.conf has
use-sqlite-wal set to false), the database is automatically converted into WAL
mode. This makes the next nix process to access the database convert it back to
"truncate". If the database is still open at the time in wal mode by the perl
program, this fails and crashes the nix doing the wal -> truncate conversion.
commit 7d203faff6d74d839324cd082236381d20444d8e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 13:56:42 2013 +0100
nix-env --set-flag: Barf if a selector doesn't match any installed package
Fixes #184.
commit 194e3374b89b8b2dec6296923877304bdb5c6ae2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 13:31:31 2013 +0100
Scan /proc/<pid>/cmdline for GC roots
commit 769f66216504cd882ac7b6bdfa0dd1ff26f3efe5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 12:19:10 2013 +0000
nix-shell: Don't warn about the lack of a GC root
commit 0c1198cf08576f16633b2344dc6513cefb567cfc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 13:11:41 2013 +0100
nix-shell: Set $IN_NIX_SHELL before evaluation
This has some hacky applications.
commit 65a64522403f353880a501b02aca10fb96ea1c26
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 20 13:10:14 2013 +0100
nix-shell: Handle --option correctly
Fixes #181.
commit 259086de841d155f7951c2cc50f799a4631aa512
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 18 16:40:48 2013 +0100
Add support for building JARs from Java sources
commit 99ed25accfd968003d3b0d294720828a1348ce47
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 18 15:01:14 2013 +0100
Add a function for doing recursive wildcard searches
Source: http://blog.jgc.org/2011/07/gnu-make-recursive-wildcard-function.html
commit 7b0d8fb23d9c71f1efb119c1f267124349c82742
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 17 18:16:04 2013 +0100
nix-shell --pure: Keep $TERM
commit 088552b319d8f5896e6cfd6a8e449b4239696ea2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 17 12:13:48 2013 +0100
Set default installation paths
commit e81b82a2cf0c7e460d02c554c597a6cf9a144e8e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Dec 16 16:51:05 2013 +0100
make dryclean: Sort names
commit a630635d7f0e63a865ddd3b0a3cf2d44c603c0e5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Dec 16 16:49:41 2013 +0100
No longer interpret $(..._SOURCES) relative to $(..._DIR)
commit 4da804651378b612313c8fb71688f71a4717a26e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 12 11:39:58 2013 +0100
Don't include all *.dep files
commit 034bbcafafdbec0b2c4d29b1d5018bec20120e77
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 12 11:27:47 2013 +0100
Add 'make help'
commit 45131da736f21975e5b6d03f508b49f10621a30e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 12 11:24:03 2013 +0100
Get rid of whitespace in $(d)
commit c34f3c5ba4f353d67ec4a88a32c3aa688347aa4d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 12 11:22:57 2013 +0100
Handle *.cpp extension
commit dfcc64f556295481bfea0b68cab11604ec131189
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 12 11:22:25 2013 +0100
Only provide 'make dist' if PACKAGE_NAME is set
commit 3560f52cc427a4eb368815ae7dd9badffba84f3f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 12 11:22:08 2013 +0100
dryclean: Show what actual files would be deleted
commit 49a385096e08b42277b7105d5d8d1e0e62b6b7a4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 10 15:54:34 2013 +0100
Initial commit (imported from the Nix repo)
commit e36229d27f9ab508e0abf1892f3e8c263d2f8c58
Author: Shea Levy <shea@shealevy.com>
Date: Thu Dec 5 12:07:05 2013 -0500
Bump language version for new storePath feature
This will allow e.g. channel expressions to use builtins.storePath IFF
it is safe to do so without knowing if the path is valid yet.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 22d665019a3770148929b7504c73bcdbe025ec12
Author: Shea Levy <shea@shealevy.com>
Date: Thu Dec 5 11:51:54 2013 -0500
builtins.storePath: Try to substitute the path if it is not yet valid
Signed-off-by: Shea Levy <shea@shealevy.com>
commit a6add93d734279db8503951ac6466c275b3c8e4e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 10 13:13:59 2013 +0100
Garbage collector: Release locks on temporary root files
This allows processes waiting for such locks to proceed during the
trash deletion phase of the garbage collector.
commit c5b8fe315162440c1d808bc0a684a412d78bfa76
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 5 14:31:57 2013 -0500
Print a trace message if a build fails due to the platform being unknown
commit bf8b66adcfdc04f2f0f0a482c66dd419a355cad6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 4 13:41:32 2013 -0500
Add missing file
commit f3cf0436b520918e061bf91efef3bb19b99bf726
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Dec 2 20:21:31 2013 +0000
Install bsdiff and bspatch in $(libexecdir)/nix
commit 0202ce6b94f287f70a6723473c73a4c7f135dae4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 18:47:03 2013 +0100
Add support for ‘make installcheck’
commit 9285f0aa2b44427afef7c50f0efae8f74307a7a5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 16:38:33 2013 +0000
Add a Makefile for the Perl stuff
commit 8f08046606c147004642a7569f78bc61ab450419
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 15:51:22 2013 +0000
Expand configure variables before writing config.status
This way, we can use config.status for generating scripts/* (without
ending up with lines like "#! /usr/bin/perl -I${libexecdir}/...").
commit 7ce0e05ad875657a0fec10e192454b837146e190
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 15:25:13 2013 +0000
Rename Makefile.new -> Makefile
commit 962551a071da87589a97a2f40d72b87d6e6ba9e2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 15:05:56 2013 +0000
Add a Makefile for the scripts directory
commit 1a1d8b073a1d770c8de4f8eb274387b209b32782
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 11:39:21 2013 +0000
Add a Makefile for bsdiff
commit 784feb68392ec4a0bdd45bf0d37f08c3eb1b61ac
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 11:29:13 2013 +0000
Let ‘make clean’ delete instantiated template files
commit cac06ed0a4b63bab62ba7629584db602222131f2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 11:26:51 2013 +0000
Remove obsolete setting of $CC_FOR_BUILD
commit b225ccb65455b24141cffd6706b6fba8a4838525
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 11:26:02 2013 +0000
Add config.guess, config.sub and install-sh
Autoreconf doesn't install these if you're not using Automake.
commit 0c504a756cbcf58f0fc4b1a9083d372e1dbb50ac
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 11:18:41 2013 +0000
Don't install Libtool
commit 2cc591c7b55a1d3e8f667871b0ddf216d81d6b47
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 10:56:14 2013 +0000
Don't instantiate Automake makefiles
commit 79b7c596a994dd426807281c3c34d8cb6bc12e5f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 10:17:37 2013 +0000
Use create-dir for installing dynamic libraries
commit ed0a8dd71ad58d16c24d714ab2b9419285d1ffc0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 10:16:07 2013 +0000
Add a function for instantiating Autoconf *.in files
commit f980755766e7cd74c0c959eaa2a6d4655980e2ea
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 09:50:35 2013 +0000
Split Makefile.lib into several *.mk files
commit e9b6397d2f902eb4f5bf0fd513013d92af074cfc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 09:17:02 2013 +0000
Add a rule for creating directories
The tricky thing here is that if you have a directory as a
prerequisite, you need to declare it as a "order-only prerequisite"
("dir/prog: stuff | dir"), otherwise the target will be rebuilt every
time because the timestamp on the directory keeps changing.
commit 4315acb8c0a40703b17f837ab82e9a691b5c14ab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 25 08:55:19 2013 +0000
Add a generic rule for installing files
commit c7547cff1951aec5e36580a8497dd13020dfc8d3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 23:56:23 2013 +0000
Install into $(libdir) instead of $(pkglibdir)
We don't need $(pkglibdir) anymore, since the libraries themselves
have a "nix" prefix now.
commit 2bd0fcc9663211cc480f61dc9e05f43ac9ecca69
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 23:53:41 2013 +0000
Use libnix as a prefix for all Nix libraries
In particular "libutil" was always a problem because it collides with
Glibc's libutil. Even if we install into $(libdir)/nix, the linker
sometimes got confused (e.g. if a program links against libstore but
not libutil, then ld would report undefined symbols in libstore
because it was looking at Glibc's libutil).
commit f267ff16b4527ca6c083014b93b4568d89221f49
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 23:49:34 2013 +0000
Allow libraries to set an actual name different from the symbolic name
commit abb5bd66dee7afe9560b3a132da42b71d4801274
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 23:42:50 2013 +0000
Add Makefile for nix-log2xml
commit 07c87a8e9ef7bd42995230700169c6a18cf26313
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Nov 24 00:15:25 2013 +0100
Consistent naming
commit c1f3a1a89b717e73c2a8c2315067c495e246457c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Nov 24 00:10:00 2013 +0100
Disallow undefined symbols in dynamic libraries by default
This encourages that each library declares its own dependencies
properly.
commit 5a1114ecdbbd115ec8aeb1a98326d793ff3e8058
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 20:19:36 2013 +0000
Drop the dependency on libgc in libmain
Instead, libexpr now depends on libgc. This means commands like
nix-store that don't do any evaluation no longer require libgc.
commit 06a8ac96e79547c092debfe3b93d78bcb862edc2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 20:15:57 2013 +0000
Initialise Boehm GC only once
commit 90dfb37f147941e5edf262c27e269cdfd1e8dcfb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 20:11:02 2013 +0000
Allow (dynamic) libraries to depend on other libraries
commit 14772783e66a6e67726872926834c0e9f7210e6d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 20:32:20 2013 +0100
Support installation of dynamically linked programs
Here we need to re-link programs so that their RPATH refers to the
installed libraries.
commit 611868a90904ac233d8476682a4618fdd8c78c50
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 17:04:27 2013 +0000
Implement basic ‘make install’
commit d1b3ca0b4a57f48f94a555c97f6a555c3a1f3639
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Nov 23 17:20:15 2013 +0100
Improve building dynamic libraries
They now get a correct RPATH.
commit 6dd74b48f8d587fcc215e9f4721eacace7f8f462
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 20:56:58 2013 +0000
Support building dynamic libraries
commit 9b11a8bfbcfd9e6f40ae8b573d4de492a23b91b9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 20:05:00 2013 +0000
Fix building without Boehm GC
commit 812b5a30ecc9d8f78b54644b37c5c2c4375555bc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 19:51:18 2013 +0000
Add a Makefile variable for enabling debug info
commit ea2f7df5fac0b319b82a4a33ba8b992737fa8c56
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 20:38:30 2013 +0100
Introduce variables GLOBAL_CFLAGS and GLOBAL_CXXFLAGS
There are flags that must be set, so they shouldn't be overriden by
the user's CFLAGS or CXXFLAGS.
commit 6b5f89f2cf954cae1623a6cd3a8f7eb78e19e85b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 19:30:24 2013 +0000
Drop the dependency on Automake
commit 754c05ed6c3b88f8180ae8686e030b5b02b23d43
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 16:45:52 2013 +0000
Rename $(here) to $(d) for brevity, and remove trailing slash
commit 9a14d5e2f3a0b6ab626b9d22256df8bcc1c585a3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 16:59:09 2013 +0100
Automatically regenerate Makefile.config
And move some stuff around.
commit ffdc85fc8afba0828bd1f300fdb4f68de99d7000
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 15:47:47 2013 +0000
Respect configure flags
commit 62e35cc3a893e3bc4ed1fe2a37ba67af9859b4cb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 16:42:25 2013 +0100
Add ‘make dist’ support
commit eff6c4b791ad0a8b9a8499fcbcc2add7154d4dca
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 15:41:48 2013 +0000
Add missing #include
commit e0a108b203b40f81df4cb0f1e433476cd8a37491
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 15:25:10 2013 +0000
Remove unnecessary line
commit eaf903f993094af27958b9935635710ffbf42bf6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 16:24:41 2013 +0100
Clean more aggressively
commit 1474ecfe426ef69bbb376df82fd0c48e7dedf606
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 16:22:31 2013 +0100
Generate the parser and the lexer
commit bc96c4518e4430f0cd996b2c77fe8e08d7694efa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 15:10:33 2013 +0000
Automatically emit make rules for header files
commit b8e9efc476abc248a17c9e9cd117f3d53e4a7f63
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 15:54:18 2013 +0100
New non-recursive, plain Make-based build system
commit 709cbe4e76e7b0f1b8abddbeb7714e194f6f8a02
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 22 10:00:43 2013 +0000
Include <cstring> for memset
This should fix building on Illumos.
commit d4a76ff0e45a609b3a878bc0ccf4ff95ff3e9ecb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 14:45:19 2013 +0100
Bump version number
commit 30b986908eed5d8fd6a2b21da98878f2a0bf19c0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 14:29:39 2013 +0100
Check meta values and warn about bad ones
commit 0f24400d90daf65cf20142a662f8245008437e2c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 14:09:03 2013 +0100
Generalise meta attributes
commit 990126cde03428509191bed132f38050034d342e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 12:08:03 2013 +0000
Shorter error message
commit af94a70ba6bb9ba2eac328133b2a97d405867f68
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 11:18:13 2013 +0100
Drop support for user environment manifests in ATerm format
commit 245e26408fc0954974a1b30991af6d97c1d1e2ce
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 00:41:45 2013 +0100
nix-env -q: Add a --json flag
commit 5fea98111b3cd9b94ed1ebe89953a7757d6d3a69
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 00:33:06 2013 +0100
Refactor JSON output
commit 77c13cdf566ffedc70d8860571afae8a6d43b552
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 19 00:03:11 2013 +0100
Add a toJSON primop
commit 285df765b91588e39d6f35a32e30b84c3cb5be75
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 18 22:22:35 2013 +0100
Add a primop unsafeGetAttrPos to return the position of an attribute
commit fc33fd86b7727365caab44c05a90d5b52209131b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 18 20:14:54 2013 +0100
Add a symbol __curPos that expands to the current source location
I.e. an attribute set { file = <string>; line = <int>; column = <int>; }.
commit 90b5e692846d9b7a951155c5ed4fc7cf72b08e31
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 18 10:21:12 2013 +0000
Support quoted attribute names in -A
This is requires if you have attribute names with dots in them. So
you can now say:
$ nix-instantiate '<nixos>' -A 'config.systemd.units."postgresql.service".text' --eval-only
Fixes #151.
commit a478e8a7bb8c24da0ac91b7100bd0e422035c62f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 14 11:57:37 2013 +0100
Remove nix-setuid-helper
AFAIK, nobody uses it, it's not maintained, and it has no tests.
commit 89e6781cc5885cbf6284a51c0403dded62ce8bc0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 12 12:51:59 2013 +0100
Make function calls show up in stack traces again
Note that adding --show-trace prevents functions calls from being
tail-recursive, so an expression that evaluates without --show-trace
may fail with a stack overflow if --show-trace is given.
commit 2bcb384e95500ff197fd4888c659ccf0034cf214
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 12 11:31:50 2013 +0000
Add a test to check that tail calls run in bounded stack space
commit c897bac54954373f63511702731fe2cb23c0c98e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 7 17:04:36 2013 +0000
Make function calls tail-recursive
commit 273322c7732093a354e86df82cf75d6604b8bce8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 7 14:33:35 2013 +0100
Make ifs and asserts tail-recursive
The local Value object prevented g++ from making a tail call. Not
clear why. In any case, not using a temporary makes g++ do the tail
call.
commit 4badd7ed17b4628d3a8d96e21c900aa91004daaf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 7 12:44:14 2013 +0000
Get rid of an intermediary on the stack
commit 8d6418d46e5f8a2f31417ba363efd2785c49b2eb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Oct 28 22:51:12 2013 +0100
Fix building without a garbage collector
http://hydra.nixos.org/build/6695350
commit dec2f195022bcc14f217aa20c1e05e4b7fe9e917
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Oct 28 18:50:58 2013 +0100
Fix a segfault in genericClosure
It kept temporary data in STL containers that were not scanned by
Boehm GC, so Nix programs using genericClosure could randomly crash if
the garbage collector kicked in at a bad time.
Also make it a bit more efficient by copying points to values rather
than values.
commit 61231449332154170eafc2b80c10328ba736f31e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Oct 28 11:56:37 2013 +0000
Drop Cygwin and Solaris builds
commit 1dacd427cd2d149fe46e0cb43ca45bb9344de2f7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Oct 28 11:56:21 2013 +0000
Update release notes, set version for 1.6.1 release
commit ea6bf0c21fc08ea269514fa9788f8f05fcc54fb5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Oct 28 07:34:44 2013 +0100
Slightly optimize listToAttrs
commit 36e67ff16bc6a4cb96466f58616a95a25250274d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 22:06:39 2013 +0200
Undocument obsolete form of "let"
commit fba17a9043527aad89dbf53d3458ca14a86a421c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 22:05:58 2013 +0200
Doc fix
commit 2d9bb56e554b17488c0f8984f34c026a66cdce67
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 19:10:38 2013 +0200
Fix segfault on Darwin
Ever since SQLite in Nixpkgs was updated to 3.8.0.2, Nix has randomly
segfaulted on Darwin:
http://hydra.nixos.org/build/6175515
http://hydra.nixos.org/build/6611038
It turns out that this is because the binary cache substituter somehow
ends up loading two versions of SQLite: the one in Nixpkgs and the
other from /usr/lib/libsqlite3.dylib. It's not exactly clear why the
latter is loaded, but it appears to be because WWW::Curl indirectly loads
/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation,
which in turn seems to load /usr/lib/libsqlite3.dylib. This leads to
a segfault when Perl exits:
#0 0x00000001010375f4 in sqlite3_finalize ()
#1 0x000000010125806e in sqlite_st_destroy ()
#2 0x000000010124bc30 in XS_DBD__SQLite__st_DESTROY ()
#3 0x00000001001c8155 in XS_DBI_dispatch ()
...
#14 0x0000000100023224 in perl_destruct ()
#15 0x0000000100000d6a in main ()
...
The workaround is to explicitly load DBD::SQLite before WWW::Curl.
commit 5bc41d78ffcd2952eaddb20ef129f48e94d60cb0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 16:41:04 2013 +0200
Rename "attribute sets" to "sets"
We don't have any other kind of sets so calling them attribute sets is
unnecessarily verbose.
commit 9e4bb2045548e2166102f4a8eedf43741e1a6a98
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 16:02:08 2013 +0200
Manual: Fix broken URLs
Fixes #172.
commit dc341811d6bfb2a33601fe22f11db0a97956f97e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 15:54:23 2013 +0200
Add rpm_fedora19i386 to the release-critical builds
commit 69befd33a9e3600c125803694fbac96053f943b0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 03:08:34 2013 +0200
Remove unnecessary call to forceStringNoCtx
commit a5684e09d34deb5c380c736ce520c030eb14bfc6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 02:56:00 2013 +0200
Document typeOf
commit 411a3461dca6b26f1a1a6b0c7f1f322f1d8df506
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 02:51:28 2013 +0200
Add a test of the type primops
commit 05d02f798f65bf18e8ca71f3d23bfdf9df63fb7c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 02:49:13 2013 +0200
Add a typeOf primop
We already have some primops for determining the type of a value, such
as isString, but they're incomplete: for instance, there is no isPath.
Rather than adding more isBla functions, the generic typeOf function
returns a string representing the type of the argument (e.g. "int").
commit 6da92d96aec29ab09cf909ac6a270bc2753cd34a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 02:22:24 2013 +0200
Document NIX_SHOW_STATS and NIX_COUNT_CALLS
commit 543d8a5942f503f5e49eecbf7e4e7a039472e9ea
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 24 02:20:54 2013 +0200
Don't require NIX_SHOW_STATS for NIX_COUNT_CALLS
commit fe95650487d189bae2be198fe2cbbb0cb6c3788f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 23 11:16:46 2013 +0000
Memoize evalFile() lookups under both the original and resolved name
Previously we only used the resolved name, causing repeated resolution
(e.g. /dir to /dir/default.nix).
commit 3139481822b770a5ad1f81f447ef31ed5446bc72
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 23 11:52:25 2013 +0200
Add an aggregate job
Also, build for Ubuntu 13.10 and Fedora 19.
commit c0861838432ea9d8e5ea5750aadfbc59ebd6f3b4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 22 11:39:10 2013 +0200
For auto roots, show the intermediate link
I.e. "nix-store -q --roots" will now show (for example)
/home/eelco/Dev/nixpkgs/result
rather than
/nix/var/nix/gcroots/auto/53222qsppi12s2hkap8dm2lg8xhhyk6v
commit 4f4a14453ae8dbfc24a1e580aa695165e9d81f0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Oct 18 14:51:25 2013 +0200
Don't set $PS1 in non-interactive shells
Shouldn't really matter, but you never know.
commit 4ea034a5c56a60ae0ceedf18a066c428a963c836
Author: Shea Levy <shea@shealevy.com>
Date: Thu Oct 17 11:07:34 2013 -0400
nix-shell: Play nicely with non-interactive shells
nix-shell with the --command flag might be used non-interactively, but
if bash starts non-interactively (i.e. with stdin or stderr not a
terminal), it won't source the script given in --rcfile. However, in
that case it *will* source the script found in $BASH_ENV, so we can use
that instead.
Also, don't source ~/.bashrc in a non-interactive shell (detectable by
checking the PS1 env var)
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 792fd51f41212b0bf1d8a121a4f228a92fec3906
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 11:53:40 2013 +0200
Fold two stack trace messages in derivations
Combined with the previous changes, stack traces involving derivations
are now much less verbose, since something like
while evaluating the builtin function `getAttr':
while evaluating the builtin function `derivationStrict':
while instantiating the derivation named `gtk+-2.24.20' at `/home/eelco/Dev/nixpkgs/pkgs/development/libraries/gtk+/2.x.nix:11:3':
while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/home/eelco/Dev/nixpkgs/pkgs/stdenv/generic/default.nix:78:17':
while evaluating the attribute `outPath' at `/nix/store/212ngf4ph63mp6p1np2bapkfikpakfv7-nix-1.6/share/nix/corepkgs/derivation.nix:18:9':
...
now reads
while evaluating the attribute `propagatedNativeBuildInputs' of the derivation `gtk+-2.24.20' at `/home/eelco/Dev/nixpkgs/pkgs/development/libraries/gtk+/2.x.nix:11:3':
...
commit f440558acc76c2939cf5f0744c6669279b6351a0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 11:47:38 2013 +0200
Don't show <nix/derivation.nix> in stack traces
Messages like
while evaluating the attribute `outPath' at `/nix/store/212ngf4ph63mp6p1np2bapkfikpakfv7-nix-1.6/share/nix/corepkgs/derivation.nix:18:9':
are redundant, because Nix already shows that it's evaluating a derivation:
while instantiating the derivation named `firefox-24.0' at `/home/eelco/Dev/nixpkgs/pkgs/applications/networking/browsers/firefox/default.nix:131:5':
while evaluating the derivation attribute `nativeBuildInputs' at `/home/eelco/Dev/nixpkgs/pkgs/stdenv/generic/default.nix:76:17':
commit bb659bad8116d380271e5103e3bb5c8a6056ee58
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 11:40:20 2013 +0200
Nix 1.6.1 release notes
commit f6a8e7f4c2897c131afe0beed199dc406b0f052a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 11:18:37 2013 +0200
Fix test
commit b08f4b0da98d0a2534626c01cbb0c3c3eb4713a1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 01:12:43 2013 +0200
Test string semantics a bit more
commit d7625b5c2d6d9fd23708057957172c0446ffdabc
Author: goblin <github@uukgoblin.net>
Date: Sun Sep 22 13:36:23 2013 +0100
two typos
commit b8034e5581ef40cc043da35ed01280b166da81ca
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 00:57:24 2013 +0200
Ensure proper type checking/coercion of "${expr}"
Now we only rewrite "${expr}" to expr if expr is a string literal.
commit 9d8a80375d2d0581b53d270eb4d543fa0d3f0190
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 00:45:16 2013 +0200
Add a test for type correctness of antiquotes
Antiquotes should evaluate to strings or paths. This is usually
checked, except in the case where the antiquote makes up the entire
string, as in "${expr}". This is optimised to expr, which discards
the runtime type checks / coercions.
commit d6a7aa8f4827f97856ed55226426c355e1d1b4d1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 17 00:39:59 2013 +0200
Revert the behaviour of antiquoted paths to pre-Nix 1.6
Commit 159e621d1a9c4391b53f3d822109c36931934698 accidentally changed
the behaviour of antiquoted paths, e.g.
"${/foo}/bar"
used to evaluate to "/nix/store/<hash>-foo/bar" (where /foo gets
copied to the store), but in Nix 1.6 it evaluates to "/foo/bar". This
is inconsistent, since
" ${/foo}/bar"
evaluates to " /nix/store/<hash>-foo/bar". So revert to the old
behaviour.
commit b8571d68c4f2c0b4b0b8f3d7c7ef09668aab140f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 23:28:10 2013 +0200
Add a regression test for correct path antiquotation behavior
This broke in Nix 1.6.
commit a737f51fd96be2866a33eb67732e034bcc65a659
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 15:58:20 2013 +0200
Retry all SQLite operations
To deal with SQLITE_PROTOCOL, we also need to retry read-only
operations.
commit ff02f5336cd0cff0e97fbcf3c54b5b23827702d6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 14:51:20 2013 +0200
Fix a race in registerFailedPath()
Registering the path as failed can fail if another process does the
same thing after the call to hasPathFailed(). This is extremely
unlikely though.
commit 4bd52825734face53df2ab00052d2457d31c3c68
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 14:46:35 2013 +0200
Convenience macros for retrying a SQLite transaction
commit bce14d0f61801f0f1c3080970619e2ca11683a4e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 14:36:53 2013 +0200
Don't wrap read-only queries in a transaction
There is no risk of getting an inconsistent result here: if the ID
returned by queryValidPathId() is deleted from the database
concurrently, subsequent queries involving that ID will simply fail
(since IDs are never reused).
commit 7cdefdbe732c209e13f234eb71022791909a5518
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 14:27:36 2013 +0200
Print a distinct warning for SQLITE_PROTOCOL
commit d05bf044441dbf8e000036d545df9689bdec0b72
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 16 14:03:22 2013 +0200
Treat SQLITE_PROTOCOL as SQLITE_BUSY
In the Hydra build farm we fairly regularly get SQLITE_PROTOCOL errors
(e.g., "querying path in database: locking protocol"). The docs for
this error code say that it "is returned if some other process is
messing with file locks and has violated the file locking protocol
that SQLite uses on its rollback journal files." However, the SQLite
source code reveals that this error can also occur under high load:
if( cnt>5 ){
int nDelay = 1; /* Pause time in microseconds */
if( cnt>100 ){
VVA_ONLY( pWal->lockError = 1; )
return SQLITE_PROTOCOL;
}
if( cnt>=10 ) nDelay = (cnt-9)*238; /* Max delay 21ms. Total delay 996ms */
sqlite3OsSleep(pWal->pVfs, nDelay);
}
i.e. if certain locks cannot be not acquired, SQLite will retry a
number of times before giving up and returing SQLITE_PROTOCOL. The
comments say:
Circumstances that cause a RETRY should only last for the briefest
instances of time. No I/O or other system calls are done while the
locks are held, so the locks should not be held for very long. But
if we are unlucky, another process that is holding a lock might get
paged out or take a page-fault that is time-consuming to resolve,
during the few nanoseconds that it is holding the lock. In that case,
it might take longer than normal for the lock to free.
...
The total delay time before giving up is less than 1 second.
On a heavily loaded machine like lucifer (the main Hydra server),
which often has dozens of processes waiting for I/O, it seems to me
that a page fault could easily take more than a second to resolve.
So, let's treat SQLITE_PROTOCOL as SQLITE_BUSY and retry the
transaction.
Issue NixOS/hydra#14.
commit c1994fecf9f9ea129f6164db92ad242e392d987c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Oct 14 15:20:45 2013 +0200
nix-shell: Fix bash completion
Nixpkgs's stdenv setup script sets the "nullglob" option, but doing so
breaks Bash completion on NixOS (when ‘programs.bash.enableCompletion’
is set) and on Ubuntu. So clear that flag afterwards. Of course,
this may break stdenv functions in subtle ways...
commit 672c3acc7109a84abeae3d28dc907132f2bad953
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Oct 11 10:57:23 2013 +0200
Adjust to the NixOS/Nixpkgs merge
commit 7bdb85453d16106ebf4d4af106720d917e221ad9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 8 15:34:57 2013 +0200
printStats(): Print the size of the symbol table in bytes
commit 9deb822180fb80638559fe3c45c6a77a2b56ff40
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 8 15:19:59 2013 +0200
Deduplicate filenames in Pos
This saves ~4 MiB of RAM for NixOS system instantiation, and ~18 MiB
for "nix-env -qa".
commit b1e3b1a4ac8c276f503713f6002c3b42efef2ae8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 8 14:45:36 2013 +0200
Treat undefined variable errors consistently
Previously, a undefined variable inside a "with" caused an EvalError
(which can be caught), while outside, it caused a ParseError (which
cannot be caught). Now both cause an UndefinedVarError (which cannot
be caught).
commit 6b47de580ffe6101863a1054d9d47f9cbe691214
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 8 14:40:51 2013 +0200
Show the exact position of undefined variables
In particular, undefined variable errors in a "with" previously didn't
show *any* position information, so this should help a lot in those
cases.
commit a5e0f64db3f7355e320ecda478b84f238bf8869c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 8 12:30:23 2013 +0000
Remove some unused functions
commit 221a2daf34234c426fec8058f24b1093b2a61ba8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 8 14:24:53 2013 +0200
Merge VarRef into ExprVar
commit 176c666f36afee12f5cbd1f9615cf21d781fdbde
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Oct 5 21:29:48 2013 +0000
Don't show calls to primops in stack traces
Since they don't have location information, they just give you crap
like:
while evaluating the builtin function `getAttr':
while evaluating the builtin function `derivationStrict':
...
commit c945f015de2149233c1e4fa1628f05567f3657ba
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 2 15:24:45 2013 +0200
Fix segfault in nix-repl / hydra-eval-jobs
If a "with" attribute set fails to evaluate, we have to make sure its
Env record remains unchanged. Otherwise, repeated evaluation gives a
segfault:
nix-repl> :a with 0; { a = x; b = x; }
Added 2 variables.
nix-repl> a
error: value is an integer while an attribute set was expected
nix-repl> b
Segmentation fault
commit 28e0742966e962f2672f5731ea3612f223bf3283
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 2 14:34:36 2013 +0200
Report OOM errors better
commit a5fb4b5b7c1688c9b095bc1c278c17c20844302a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 2 14:22:49 2013 +0200
Fix typo
commit faaae44f2e8bc5f8863de80a2585fec8f51d144d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 18 14:04:03 2013 +0200
build-remote.pl: Don't use substituters on the remote
It's kinda pointless to check substituters on the remote side, since
we just checked them locally.
commit f53574ebd60e5a22dbaae7e2bec97f5993670c20
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 17 12:06:59 2013 +0000
RestoreSink: Slightly reduce the number of concurrent FDs
commit d5529f5b85d4f093c6c051c060eb6feef9f8f76f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 10 17:47:39 2013 +0200
Version was called 1.6, not 1.6.0
commit b072fc04a79c181af04fb1a07e221cb73f97cf48
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 10 17:41:49 2013 +0200
Bump version number
commit fecad91b67ee3523a6d8c0ea16ab71925ab6ab6e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 10 11:21:30 2013 +0200
Update release notes
commit 0220da3e10e76fd1ef46915493c0f5ed65482fa8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 6 17:20:19 2013 +0200
Remove stray debug line
commit 936f9d45baf474358346666ed9ad7f56960bb455
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 6 16:36:56 2013 +0200
Don't apply the CPU affinity hack to nix-shell (and other Perl programs)
As discovered by Todd Veldhuizen, the shell started by nix-shell has
its affinity set to a single CPU. This is because nix-shell connects
to the Nix daemon, which causes the affinity hack to be applied. So
we turn this off for Perl programs.
commit 4b83830d0c742b69b59c698a42948eaa6d214c1d
Author: Domen Kožar <domen@dev.si>
Date: Tue Sep 3 11:42:55 2013 +0200
typo
commit 5904262640199599122fcf563e7d1c7c3f3f3128
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 6 14:58:05 2013 +0200
nix-shell: Support a .drv as argument
Fixes #161.
commit 2c1ecf8e81f8ea5a9fa228aa22a57a6ba0a0e4df
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 21:15:47 2013 +0200
nix-env -i: Add a flag ‘--remove-all’ / ‘-r’
This is equivalent to running ‘nix-env -e '*'’ first, except that it
happens in a single transaction. Thus, ‘nix-env -i pkgs...’ replaces
the profile with the specified set of packages.
The main motivation is to support declarative package management
(similar to environment.systemPackages in NixOS). That is, if you
have a specification ‘profile.nix’ like this:
with import <nixpkgs> {};
[ thunderbird
geeqie
...
]
then after any change to ‘profile.nix’, you can run:
$ nix-env -f profile.nix -ir
to update the profile to match the specification. (Without the ‘-r’
flag, if you remove a package from ‘profile.nix’, it won't be removed
from the actual profile.)
Suggested by @zefhemel.
commit 88c07341a6bf99f923cb3d6487b72afc025b7746
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 15:56:33 2013 +0200
nix-env: Use wildcard match by default
That is, you don't need to pass '*' anymore, so
nix-env -qa
is equivalent to
nix-env -qa '*'
commit 07a08bddf001271b4b7eff2a119c395f40119966
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 15:45:32 2013 +0200
nix-env: Load files in ~/.nix-defexpr on demand
So if you do "nix-env -qa -A nixos", then other channels won't be
parsed/evaluated at all.
commit c57ed84e286047a9f3c103cf689ae04381c23dad
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 15:25:51 2013 +0200
Check for name collisions in the input Nix expressions
commit ef4f5ba85e487f567115d60e3cb4b53d81af6ea1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 13:17:51 2013 +0000
Work on Values instead of Exprs
This prevents some duplicate evaluation in nix-env and
nix-instantiate.
Also, when traversing ~/.nix-defexpr, only read regular files with the
extension .nix. Previously it was reading files like
.../channels/binary-caches/<name>. The only reason this didn't cause
problems is pure luck (namely, <name> shadows an actual Nix
expression, the binary-caches files happen to be syntactically valid
Nix expressions, and we iterate over the directory contents in just
the right order).
commit 06bb2d95b4d8232ef0cd0059d2609d2211d0e3e6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 11:04:21 2013 +0000
Reformat
commit 6f809194d7448c4ad50174bed9ba2419e2114352
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 3 12:56:33 2013 +0200
Get rid of the parse tree cache
Since we already cache files in normal form (fileEvalCache), caching
parse trees is redundant.
Note that getting rid of this cache doesn't actually save much memory
at the moment, because parse trees are currently not freed / GC'ed.
commit 57d18df7d0005cf822368d9f1d0c33396c6b9f9f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 18:34:04 2013 +0200
Add some support code for nix-repl
commit 92077b4547b473bb4ea7b38077299e8fba75ca62
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 16:39:17 2013 +0200
Get rid of a signedness warning
commit 33972629d76b1b1059de5b89ce68ef37dce45cbd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 16:29:15 2013 +0200
Fix whitespace
commit ac1b75413821c9ebaf317fb3fe1c695599e93818
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 13:32:51 2013 +0200
Lower xz compression level
Fixes #84.
commit c28dfc030587cb5a4ccdc71e5f55e708a9aa901d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 13:23:07 2013 +0200
Manual: Make '' a bit clearer
Issue #162.
commit e9b92169a5a9d187e32d0ce15ca785eb9f8dce56
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 13:19:34 2013 +0200
Fix manual error
Reported by Matija Šuklje.
Fixes #163.
commit ecd830b3b9e189d0b41cfeadc993c17d5858a79b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 13:11:36 2013 +0200
Update the release notes
commit 6ec8dab06abd08f3239c10b98d34a268cd0657cb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 12:44:30 2013 +0200
Adda test for build-max-log-size
commit b29d3f4aee9fa91f4ea1019d09bf63bc81b9f830
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 12:01:04 2013 +0200
Only show trace messages when tracing is enabled
commit efe428946431c6c670151c949884fa8c1fa31794
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Sep 2 11:58:18 2013 +0200
Add an option to limit the log output of builders
This is mostly useful for Hydra to deal with builders that get stuck
in an infinite loop writing data to stdout/stderr.
commit afc6c1bad63e27d68adf49e673f8aafd36495a8a
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jul 15 17:10:18 2013 -0400
Simplify inherited attribute handling
This reduces the difference between inherited and non-inherited
attribute handling to the choice of which env to use (in recs and lets)
by setting the AttrDef::e to a new ExprVar in the parser rather than
carrying a separate AttrDef::v VarRef member.
As an added bonus, this allows inherited attributes that inherit from a
with to delay forcing evaluation of the with's attributes.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 6cd6ce56083d0077485896a761520812d039bf10
Author: Ivan Kozik <ivan@ludios.org>
Date: Fri Aug 16 20:18:38 2013 +0000
Fix nix-shell command
commit 34bb806f747d5edc16119e38e2ac44e6b236ac12
Author: Ivan Kozik <ivan@ludios.org>
Date: Sat Aug 10 21:36:16 2013 +0000
Fix typos, especially those that end up in the Nix manual
commit c6c024ca6f587dab991589ad6fdf010b9f0e6d62
Author: Gergely Risko <gergely@risko.hu>
Date: Thu Aug 22 17:57:39 2013 +0200
Fix personality switching from x86_64 to i686
On Linux, Nix can build i686 packages even on x86_64 systems. It's not
enough to recognize this situation by settings.thisSystem, we also have
to consult uname(). E.g. we can be running on a i686 Debian with an
amd64 kernel. In that situation settings.thisSystem is i686-linux, but
we still need to change personality to i686 to make builds consistent.
commit 03eaef3d7a614872af309d1bfa5133845123720f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 23 10:12:20 2013 +0200
Manual: Don't use actual hashes of Nix dependencies
These cause an unnecessary runtime dependency :-)
commit b3110a15e9ab898e14721655030e7f0f7e2ea6c5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 21 12:52:44 2013 +0200
Fix corrupt PNG
Libpng used to accept this, but no longer does.
commit 25a108bb9c5eb1999e1699d4e0727de1cbce30c7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 19 13:22:56 2013 +0200
Hack to clean up tests/test-tmp
commit d308aeaf53b7324af98dfa949a747526c241ef30
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 19 12:35:03 2013 +0200
Store Nix integers as longs
So on 64-bit systems, integers are now 64-bit.
Fixes #158.
commit 297b762513ad416582c0850095506f802ff5b1bb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 19 11:41:15 2013 +0200
Turn on -Wall
commit 46222bbc43fa4d7b44a466bf7be435ea1a4d6fc0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 14 22:32:49 2013 +0200
Typo
commit 58204a3c39614297e71a21a7633ea8293e8304ee
Author: Shea Levy <shea@shealevy.com>
Date: Wed Aug 14 15:35:13 2013 -0400
corepkgs/nar.nix: Prefer local builds
nar.nix's builder depends on coreutils and nix itself being in $PATH.
Unfortunately, there's no good way to ensure that these packages exist
in the same place on the remote machine: The local machine may have nix
installed in /usr, and the remote machine in /usr/local, but the
generated nar.sh builder will refer to /usr and thus fail on the remote
machine. This ensures that nar.sh is run on the same machine that
instantiates it.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 3fb7ae0586958a2404db41b8cf6ec4fe88f2f674
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 7 15:44:19 2013 +0000
Respect MINSIGSTKSZ when allocating an alternative stack
http://hydra.nixos.org/build/5663577
commit 161a2ccf7af60acf8d04ba5d92f0116f6be19fba
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 7 17:26:41 2013 +0200
Fix build on non-Linux
http://hydra.nixos.org/build/5662914
commit a583a2bc59a4ee2b067e5520f6c5bc0c61852c32
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 7 11:51:55 2013 +0000
Run the daemon worker on the same CPU as the client
On a system with multiple CPUs, running Nix operations through the
daemon is significantly slower than "direct" mode:
$ NIX_REMOTE= nix-instantiate '<nixos>' -A system
real 0m0.974s
user 0m0.875s
sys 0m0.088s
$ NIX_REMOTE=daemon nix-instantiate '<nixos>' -A system
real 0m2.118s
user 0m1.463s
sys 0m0.218s
The main reason seems to be that the client and the worker get moved
to a different CPU after every call to the worker. This patch adds a
hack to lock them to the same CPU. With this, the overhead of going
through the daemon is very small:
$ NIX_REMOTE=daemon nix-instantiate '<nixos>' -A system
real 0m1.074s
user 0m0.809s
sys 0m0.098s
commit 263d6682224f516aed74286453c5e2e097a38aa6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 6 14:21:46 2013 +0200
Set the default GCC optimisation level to -O3
commit fd7d979c79759e5db68e4b62b3550a3906f67d40
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 6 14:15:11 2013 +0200
Remove obsolete reference to ATerms
commit 46ffcce0c355ee16075b4ba216bc0aea054143aa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 2 18:29:23 2013 +0000
In the profiler output, show function names (if available)
commit 8e74c0bfd1b61b175f04a7e0a8f0a3d9db809f1a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 2 18:53:02 2013 +0200
Let the ordering operators also work on strings
E.g. ‘"foo" < "bar"’ now works.
commit 3d77b28eacc940356e94c36017fb2d9f1a1b7ec2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 2 18:39:40 2013 +0200
Add comparison operators ‘<’, ‘<=’, ‘>’ and ‘>=’
commit 47701677e88230abf7d9106c55f46aa660643ce7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 2 16:03:02 2013 +0000
Add integer ‘-’, ‘*’ and ‘/’ operators
commit 5d147e125cea69e9a3b12f0ef64c64f42985c65e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 2 17:35:59 2013 +0200
Add a unary integer negation operator
This allows saying "-1" instead of "builtins.sub 0 1".
commit 159e621d1a9c4391b53f3d822109c36931934698
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 2 15:21:17 2013 +0000
Overload the ‘+’ operator to support integer addition
commit 511455965e1a17db3653147a4ac0d284a37915be
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 31 13:17:50 2013 +0200
nix-shell: Don't disable Automake dependency tracking
Nixpkgs' stdenv disables dependency tracking by default. That makes
sense for one-time builds, but in an interactive environment we expect
repeated "make" invocations to do the right thing.
commit 7df4ef983e96f604fa84abe4aeb54dcb00a72add
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 31 13:12:35 2013 +0200
Test the delayed with a bit more
commit 0a470fc3453f56a0a242d8f467b8079fe0040ff7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 31 12:44:21 2013 +0200
Make Env smaller
Commit 20866a7031ca823055a221653b77986faa167329 added a ‘withAttrs’
field to Env, which is annoying because it makes every Env structure
bigger and we allocate millions of them. E.g. NixOS evaluation took
18 MiB more. So this commit squeezes ‘withAttrs’ into values[0].
Probably should use a union...
commit 8ae6d55db15bb0777e3d707afb994f6fcbcc6a65
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 31 12:11:14 2013 +0200
Don't use NULL
commit e068f49f7dc59788cf356acfc77db614db6b28f0
Author: Shea Levy <shea@shealevy.com>
Date: Tue Jul 16 08:43:54 2013 -0400
Avoid thunks when a fromWith var can be looked up without evaluation
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 20866a7031ca823055a221653b77986faa167329
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jul 15 15:53:14 2013 -0400
Delay evaulation of `with` attrs until a variable lookup needs them
Evaluation of attribute sets is strict in the attribute names, which
means immediate evaluation of `with` attribute sets rules out some
potentially interesting use cases (e.g. where the attribute names of one
set depend in some way on another but we want to bring those names into
scope for some values in the second set).
The major example of this is overridable self-referential package sets
(e.g. all-packages.nix). With immediate `with` evaluation, the only
options for such sets are to either make them non-recursive and
explicitly use the name of the overridden set in non-overridden one
every time you want to reference another package, or make the set
recursive and use the `__overrides` hack. As shown in the test case that
comes with this commit, though, delayed `with` evaluation allows a nicer
third alternative.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 70e68e0ec604124bb248ea4d064307bbf96e7932
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 30 23:25:37 2013 +0200
Detect stack overflows
Previously, if the Nix evaluator gets a stack overflow due to a deep
or infinite recursion in the Nix expression, the user gets an
unhelpful message ("Segmentation fault") that doesn't indicate that
the problem is in the user's code rather than Nix itself. Now it
prints:
error: stack overflow (possible infinite recursion)
This only works on x86_64-linux and i686-linux.
Fixes #35.
commit e87d1a63bdef0ae08f2d94d67fd8daa8fbb63fb4
Author: Shea Levy <shea@shealevy.com>
Date: Mon Mar 18 11:13:53 2013 -0400
killUser: Don't let the child kill itself on Apple
The kill(2) in Apple's libc follows POSIX semantics, which means that
kill(-1, SIGKILL) will kill the calling process too. Since nix has no
way to distinguish between the process successfully killing everything
and the process being killed by a rogue builder in that case, it can't
safely conclude that killUser was successful.
Luckily, the actual kill syscall takes a parameter that determines
whether POSIX semantics are followed, so we can call that syscall
directly and avoid the issue on Apple.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit 7cf539c728b8f2a4478c0384d3174842e1e0cced
Author: Florian Friesdorf <flo@chaoflow.net>
Date: Mon Feb 20 04:09:46 2012 +0100
buildenv: remove special treatment of python files
buildPythonPackage does not leave easy_install.pth and site.py
anymore. A python package that leaves these files is broken. An
exception to this is setuptoolsSite which packages setuptools'
site.py. To include it into a buildenv, this patch is even needed, not
just cosmetic.
commit 7b09e9f2c49aba7ced0e7fbac3994f6686b6a303
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 19 16:51:31 2013 +0200
Add hacking notes plus a script for running nix-shell
commit 15e5ac80393f3b0a1be264e8cdaa8f048375b27d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 19 14:32:05 2013 +0200
nix-shell: Set $IN_NIX_SHELL
This allows scripts to distinguish between a real build and a Nix
shell.
commit 48858ad5cabd03976330dff3d7aaa3d949ca09d6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 19 14:06:58 2013 +0200
nix-shell: Set some environment variables also set by build.cc
Setting $NIX_STORE causes the purity checks in gcc/ld-wrapper to kick
in, so that's why we unset $NIX_ENFORCE_PURITY.
commit 2bc5de86357fddcc52e2ce0c1b432a9509dea27e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 19 12:02:44 2013 +0200
Rename ‘nix-build --run-env’ to ‘nix-shell’
commit dc5f2e7da607bdf50bf710cbe0b5f6ff32980e19
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 19 11:23:32 2013 +0200
nix-build --run-env: Add a ‘--pure’ flag
This causes the environment to be (almost) cleared, thus giving a
shell that more closely resembled the actual Nix derivation.
commit a4921b8ceb5bde3fbd1ae25ea4b367199796eded
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 18 12:52:16 2013 +0200
Revert "build-remote.pl: Enforce timeouts locally"
This reverts commit 69b8f9980f39c14a59365a188b300a34d625a2cd.
The timeout should be enforced remotely. Otherwise, if the garbage
collector is running either locally or remotely, if will block the
build or closure copying for some time. If the garbage collector
takes too long, the build may time out, which is not what we want.
Also, on heavily loaded systems, copying large paths to and from the
remote machine can take a long time, also potentially resulting in a
timeout.
commit 16591eb3cccf86da8cd3f20c56e2dd847576ff5e
Author: Shea Levy <shea@shealevy.com>
Date: Fri Jul 12 09:35:33 2013 -0400
Allow bind-mounting regular files into the chroot
mount(2) with MS_BIND allows mounting a regular file on top of a regular
file, so there's no reason to only bind directories. This allows finer
control over just which files are and aren't included in the chroot
without having to build symlink trees or the like.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit c3f5413e806a22d3e664416649687e331b14f8b9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 12 14:06:05 2013 +0200
Fix syntax error in unpack-channel
commit aeb810b01e17d040f9592681ee271f15874dce50
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 12 14:01:25 2013 +0200
Garbage collector: Don't follow symlinks arbitrarily
Only indirect roots (symlinks to symlinks to the Nix store) are now
supported.
commit 25a00cae5bf702b9e844b05923a9c59de9df6788
Author: Gergely Risko <gergely@risko.hu>
Date: Tue May 14 15:10:14 2013 +0200
Add gzip support for channel unpacking
commit 620d57f036be5a8b8fa04ee1a2aa2329e652e0f0
Author: Domen Kožar <domen@dev.si>
Date: Sat Jun 29 15:18:05 2013 +0200
doc: typo
commit 6fcc2906194cbbc49a1e8d1862465e891b67d573
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 11 17:16:45 2013 +0200
build-remote.pl: Move "building ..." message to a better place
commit ed09d0c0a436a412893ffe817c842827abbec6ed
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 11 14:40:29 2013 +0200
nix-build --run-env: Always use Bash
Fixes #113.
Fixes #131.
commit 656390062a9b612df3238f9e6a0d5ce89c3de21c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 11 14:32:22 2013 +0200
nix-build --run-env: Source $stdenv/setup in the interactive shell
This ensures that not just environment variables are set, but also
shell functions such as unpackPhase, configurePhase and so on.
commit 212e96f39c5120ef33b363647a58ebfd61fb3f5e
Author: Ludovic Courtès <ludo@gnu.org>
Date: Fri Jul 5 22:21:04 2013 +0200
Leave `HAVE_HUP_NOTIFICATION' undefined on GNU/Hurd.
commit b584a42e3db8302095e786b4a12894d073fd75cf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 3 18:35:59 2013 +0200
Manual: auto-optimise-store is disabled by default
commit 5116214343ecce70a3cb7037f223313314a0a614
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 1 21:02:36 2013 +0200
Add support for uncompressed NARs in binary caches
Issue NixOS/hydra#102.
commit 798671163254d9766f711f4e8101bc72bcf4bd5c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 1 13:30:28 2013 +0200
copy-from-other-stores.pl: Respect $NIX_BIN_DIR
commit 1917d750a0363f678a93c80c5a4e48e7493b1786
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 1 13:29:59 2013 +0200
copy-from-other-stores.pl: Report downloaded size as 0
commit 7ccd9464077180f633e65c15906bdda707077e8c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 20 20:05:03 2013 +0200
Don't set $preferLocalBuild and $requiredSystemFeatures in builders
With C++ std::map, doing a comparison like ‘map["foo"] == ...’ has the
side-effect of adding a mapping from "foo" to the empty string if
"foo" doesn't exist in the map. So we ended up setting some
environment variables by accident.
commit 5558652709f27e8a887580b77b93c705659d7a4b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 20 19:26:31 2013 +0200
Don't substitute derivations that have preferLocalBuild set
In particular this means that "trivial" derivations such as writeText
are not substituted, reducing the number of GET requests to the binary
cache by about 200 on a typical NixOS configuration.
commit 1906cce6fcea88d07b55c0b9734da39675e17a4d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 20 14:01:33 2013 +0000
Increase SQLite's auto-checkpoint interval
Common operations like instantiating a NixOS system config no longer
fitted in 8192 pages, leading to more fsyncs. So increase this limit.
commit 9b11165aec8639b021527978603423826b6b9cc3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 20 12:01:33 2013 +0200
Disable the copy-from-other-stores substituter
This substituter basically cannot work reliably since we switched to
SQLite, since SQLite databases may need write access to open them even
just for reading (and in WAL mode they always do).
commit 22144afa8d9f8968da351618a1347072a93bd8aa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 20 11:55:15 2013 +0200
Don't keep "disabled" substituters running
For instance, it's pointless to keep copy-from-other-stores running if
there are no other stores, or download-using-manifests if there are no
manifests. This also speeds things up because we don't send queries
to those substituters.
commit 2b29e4b8529ec9f4d6904a5142266c02d1b24c99
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 17 15:39:45 2013 +0200
Bump version
commit 6016bcd30ec32e2dfb92e197319ddbdbc4f520be
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 17 11:47:38 2013 +0200
Update release notes for Nix 1.5.3
commit 1b6ee8f4c7e74f75e1f49b43cf22be7730b30649
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 13 17:29:56 2013 +0200
Allow hard links between the outputs of a derivation
commit cd49ee08970f0fa44053fb12cdf29668e8131a51
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 13 17:12:24 2013 +0200
Fix a security bug in hash rewriting
Before calling dumpPath(), we have to make sure the files are owned by
the build user. Otherwise, the build could contain a hard link to
(say) /etc/shadow, which would then be read by the daemon and
rewritten as a world-readable file.
This only affects systems that don't have hard link restrictions
enabled.
commit 1e2c7c04b1125fb63fae733fc27abb86743b8224
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 13 17:12:06 2013 +0200
Fix assertion failure in canonicalisePathMetaData() after hash rewriting
The assertion in canonicalisePathMetaData() failed because the
ownership of the path already changed due to the hash rewriting. The
solution is not to check the ownership of rewritten paths.
Issue #122.
commit 6cc2a8f8ed7cb53e49bfbd08f462af062da18ce7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 13 16:43:20 2013 +0200
computeFSClosure: Only process the missing/corrupt paths
Issue #122.
commit bfee9a25815d6f3b90e48ccf5aa4fc055005450a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 13 14:51:11 2013 +0200
Typo
commit f9ff67e9487a0085ad6536016791242364ce70d9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 13 14:46:07 2013 +0200
In repair mode, update the hash of rebuilt paths
Otherwise subsequent invocations of "--repair" will keep rebuilding
the path. This only happens if the path content differs between
builds (e.g. due to timestamps).
commit 6b05f688ee6849b89e7fb0d3fb7b678f316039e7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jun 12 12:10:26 2013 +0200
nix-daemon: Trust options like binary-caches when the client is root
Fixes #127.
commit 5c06e5297d3e8660abfa238b7244d958237e54e8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 7 16:21:48 2013 +0200
download-from-binary-cache.pl: Respect $NIX_CONNECT_TIMEOUT
commit 24a356bf71e8c75bc7dbf9b4a619552b4ebe873c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 7 15:35:54 2013 +0200
Replace $NIX_DEBUG_SUBST with an option ‘debug-subst’
Thus passing ‘--option debug-subst 1’ allows daemon users to turn on
debug info and see what the substituter is doing.
commit 24e063efdcdc42e6ea4ad0c49595ce60e834f3ab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 7 15:33:44 2013 +0200
download-from-binary-cache.pl: Show if we're waiting for a URL
Previously, if a binary cache is hanging/unreachable/slow,
download-from-binary-cache.pl would also hang without any indication
to the user. Now, if fetching a URL takes more than 5 seconds, it
will print a message to that effect.
commit ca70fba0bff82465a14ca0d29266b609851a6547
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 7 15:10:23 2013 +0200
Remove obsolete EOF checks
commit 5959c591a0a6000b6de14eaec37e8139e36dfe0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 7 15:02:14 2013 +0200
Process stderr from substituters while doing have/info queries
commit c5f9d0d08058bca4af0d22e8d46a7d84627c0aae
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 7 14:00:23 2013 +0200
Buffer reads from the substituter
This greatly reduces the number of system calls.
commit 75e12b8e666aa0b689f6b654d37c84be912ff6d4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jun 5 16:17:06 2013 +0200
download-from-binary-cache.pl: Fix race condition
Fixes the error "DBD::SQLite::db do failed: column url is not unique".
commit f0576d67756fedca0010d20aaed2e9cffd24a108
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jun 5 13:36:43 2013 +0200
Update the default binary cache URL to cache.nixos.org
commit ff08306746e88e708612cdc6d2dac84bd76f1106
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jun 4 15:20:37 2013 +0200
download-from-binary-cache.pl: Treat a 403 error as a 404
Amazon S3 returns HTTP status code 403 if a file doesn't exist and the
user has no permission to list the contents of the bucket. So treat
it as 404 (meaning it's cached in the NARExistence table).
commit bc2e43f3c826eea5b92a4f255eee59c3bb253cbc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 29 18:18:59 2013 +0200
build-remote.pl: Remove meaningless signing when importing the output paths
The "$UID != 0" makes no sense: if the local side has write access to
the Nix store (which is always the case) then it doesn't matter if
we're root - we can import unsigned paths either way.
commit 039d5a023f2fd0d28438ca1a9493237c95cc05e1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 29 12:36:56 2013 +0200
.bashrc -> .profile
commit b09b87321c058f691fcf64babe56620277b68e63
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 23 14:55:36 2013 -0400
nix-store --export: Export paths in topologically sorted order
Fixes #118.
commit 107505e13ac83850fe01ef3e1a35e5bb2ab1ef52
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 23 14:39:58 2013 -0400
build-remote.pl: Copy all outputs in one operation
commit 72d8209548f2ba16e41a2faa850ab9af3616453d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 23 14:04:46 2013 -0400
build-remote.pl: Indicate if remote machine is refusing builds
Fixes #120.
commit 18a48d80a0686ba81959057e8becc6272acd6c46
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 16 19:08:02 2013 +0200
Show function names in error messages
Functions in Nix are anonymous, but if they're assigned to a
variable/attribute, we can use the variable/attribute name in error
messages, e.g.
while evaluating `concatMapStrings' at `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/pkgs/lib/strings.nix:18:25':
...
commit 1b3a03f1610b714adca41637ccd85a8157e236ab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 16 17:56:14 2013 +0200
Show which function argument was unexpected
Fixes #116.
commit 229567293c4e0f31bc8c79f69b2ff25f8f6e5147
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 16 17:48:19 2013 +0200
Shut up a compiler warning
commit a4cb62ac25931b269a9827beb1d1274b48c44f7c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 15 15:47:05 2013 +0200
download-from-binary-cache.pl: Get rid of an uninitialized value warning
Reported by Pablo Costa.
commit 31a551a60fb8c8cc8f1887f764d88c121ac1a3cf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 13 23:50:31 2013 +0200
Bump version
commit 6e85d1b5ba824d5a9eeb7ea3d065d1b8cc07e465
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 13 16:52:08 2013 +0200
Bump release date
commit 3a0cc43ac89ae8f778764c9f5e27b361e4986913
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 10 02:38:05 2013 +0200
build-remote.pl: Properly close the SSH connection between attempts
commit be0b9dda31ab42bb2e077751fc75abbc945e407f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 10 02:32:13 2013 +0200
build-remote.pl: Pass /dev/null as SSH's stdin
Otherwise it will set the parent's stdin to non-blocking mode, causing
the subsequent read of the set of inputs/outputs to fail randomly.
That's insane.
commit 78206f06ecb2f5d6dba85b5f709251030e966f1c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 10 01:09:46 2013 +0200
build-remote.pl: Allow a machine to refuse a build
Before selecting a machine, build-remote.pl will try to run the
command "nix-builds-inhibited" on the machine. If this command exists
and returns a 0 exit code, then the machine won't be used. It's up to
the user to provide this command, but it would typically be a script
that checks whether there is enough disk space and whether the load is
not too high.
commit 2ee9da9e22ecaad1cc5ad0f940e7b079a9e62cfa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 10 00:24:33 2013 +0200
In trace messages, don't print the output path
This doesn't work if there is no output named "out". Hydra didn't use
it anyway.
commit 6eba05613a2b794fead0cc9ef45eea036c5c5ea9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 9 18:39:04 2013 +0200
Communicate build timeouts to Hydra
commit 7a03cbf09dc5ecf16a1036fc83ace0e0ccec5626
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 9 17:30:07 2013 +0200
build-remote.pl: Create one process fewer on the remote side
commit 69b8f9980f39c14a59365a188b300a34d625a2cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 9 17:17:17 2013 +0200
build-remote.pl: Enforce timeouts locally
Don't pass --timeout / --max-silent-time to the remote builder.
Instead, let the local Nix process terminate the build if it exceeds a
timeout. The remote builder will be killed as a side-effect. This
gives better error reporting (since the timeout message from the
remote side wasn't properly propagated) and handles non-Nix problems
like SSH hangs.
commit e93acab85298cf3433d1938828e7772e8faa55dc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 8 14:41:35 2013 +0200
Build Fedora 18 RPMs
commit 806970349b494e03ecf531383874ee472810c07b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 7 15:46:25 2013 +0200
Update release date
commit ea019e9a269ae35fdf8861485fe16e622f8293f6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 7 15:37:28 2013 +0200
Add option ‘extra-binary-caches’
This allows providing additional binary caches, useful in scripts like
Hydra's build reproduction scripts, in particular because untrusted
caches are ignored.
commit cc837e24586eec62d07e0cb078e02caa6ee42171
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 7 11:21:30 2013 +0200
Build Debian 7.0 debs
commit 28034bfa49b258089d5e8d36e89677836acb8eab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 3 14:14:46 2013 +0200
Build Ubuntu 13.04 debs
commit 93f4fa8a15ce6d4ff6b14843a712990ca0f23dc5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 3 11:28:32 2013 +0200
Update release notes
commit c51b6a893ca6fcce86b40c4852cfa7f0ce3065fd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 3 11:12:11 2013 +0200
nix-copy-closure: Show a proper error message if no host name is given
commit e6c44d166a63abe95a02382386246acea8757951
Author: Lluís Batlle i Rossell <viric@viric.name>
Date: Wed May 1 22:44:37 2013 +0400
Fixing the pv position regarding compression
Problem noticed by niksnut.
commit 7391533ea57268a7f0aab433dad41b905e156be6
Author: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu Apr 11 19:54:38 2013 +0200
Fixing the pv reference; I didn't mean to change it
commit 5cc2fc46ecd4ad38a42591943fc29d412ad5cfc4
Author: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu Apr 11 19:52:21 2013 +0200
Adding ETA support to the --show-progress in nix-copy-closure
Based on https://github.com/NixOS/nix/pull/6 from shlevy
commit 3628b61ce0aaff43daf37d086697c7c3f9c8ef13
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 1 13:31:33 2013 +0200
Nix 1.5.2 release notes
commit 470553bd0572c4010407acb4e410b45a521e5f11
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 1 13:21:39 2013 +0200
Don't let stderr writes in substituters cause a deadlock
commit 4ddd077bfa9ad497e795a7f60d7734daf62117c1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 26 12:15:54 2013 +0200
find-runtime-roots.pl: Don't hardcode /nix/store
commit 0374d9443732c184ab054a926058b9c5b973198f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 26 12:07:25 2013 +0200
addAdditionalRoots(): Check each path only once
commit 00f698eb8b93c9de50ebbadb946c5bf188e8fa98
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 26 12:06:39 2013 +0200
find-runtime-roots.pl: Search process environments for roots
For instance, this prevents paths from being deleted that are in use
by a "nix-build --run-env" session.
commit 938092a21341b69604e9da6294fe76c13d6a1c07
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 26 11:44:19 2013 +0200
find-runtime-roots.pl: Use Nix::Utils::readFile
commit 772b70952f7583cfbd6363b30f926d7ad164175c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 18:04:59 2013 +0200
Fix --timeout
I'm not sure if it has ever worked correctly. The line "lastWait =
after;" seems to mean that the timer was reset every time a build
produced log output.
Note that the timeout is now per build, as documented ("the maximum
number of seconds that a builder can run").
commit f9974f856ec8aff848b157da7dbe0415ec50ab8f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 17:16:29 2013 +0200
Show that --timeout doesn't work if the build produces log output
commit 6955d41f2be32c3bb857703c3e006e24d787d540
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 17:16:01 2013 +0200
nix-build: Respect --timeout
commit 934cf2d1f4c46ecd6afd30cfb14aa55a6bf3d790
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 16:59:06 2013 +0200
Nix daemon: respect build timeout from the client
commit 08d96ffad094f4b686a2ad8f2a41a6b046b0f81b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 12:45:01 2013 +0200
Fix --fallback with the binary cache substituter
Reported by Peter Simons.
commit a9b4e26b5c3ce6259526fe038c771b9325d3e99e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 12:44:01 2013 +0200
Test whether --fallback works if NARS have disappeared from the binary cache
commit c642441beb504278819e43914516b5eda30f2c15
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 23 12:43:28 2013 +0200
Test NAR info caching
commit 05420e788315f04212fe936313b3ff7b580a206c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 9 17:57:48 2013 +0200
Manual: Add a missing step to the build instructions
Reported by Johan Grande.
commit 258897c265a6d6575f1669a896ab6f5ab92337c3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 4 11:16:26 2013 +0200
Complain if /homeless-shelter exists
commit 239841787bfbf499256c0bb9358f058a8243d60a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 25 21:59:11 2013 +0100
Fix evaluation of the VM tests
commit cc63db1dd5c37aead3e3d2e20e2d2f548cc24830
Author: Shea Levy <shea@shealevy.com>
Date: Thu Mar 7 22:53:49 2013 -0500
makeStoreWritable: Ask forgiveness, not permission
It is surprisingly impossible to check if a mountpoint is a bind mount
on Linux, and in my previous commit I forgot to check if /nix/store was
even a mountpoint at all. statvfs.f_flag is not populated with MS_BIND
(and even if it were, my check was wrong in the previous commit).
Luckily, the semantics of mount with MS_REMOUNT | MS_BIND make both
checks unnecessary: if /nix/store is not a mountpoint, then mount will
fail with EINVAL, and if /nix/store is not a bind-mount, then it will
not be made writable. Thus, if /nix/store is not a mountpoint, we fail
immediately (since we don't know how to make it writable), and if
/nix/store IS a mountpoint but not a bind-mount, we fail at first write
(see below for why we can't check and fail immediately).
Note that, due to what is IMO buggy behavior in Linux, calling mount
with MS_REMOUNT | MS_BIND on a non-bind readonly mount makes the
mountpoint appear writable in two places: In the sixth (but not the
10th!) column of mountinfo, and in the f_flags member of struct statfs.
All other syscalls behave as if the mount point were still readonly (at
least for Linux 3.9-rc1, but I don't think this has changed recently or
is expected to soon). My preferred semantics would be for MS_REMOUNT |
MS_BIND to fail on a non-bind mount, as it doesn't make sense to remount
a non bind-mount as a bind mount.
commit 2c9cf5074642459b37f19a2d4c6bc0233248d3a4
Author: Shea Levy <shea@shealevy.com>
Date: Thu Mar 7 19:39:55 2013 -0500
makeStoreWritable: Use statvfs instead of /proc/self/mountinfo to find out if /nix/store is a read-only bind mount
/nix/store could be a read-only bind mount even if it is / in its own filesystem, so checking the 4th field in mountinfo is insufficient.
Signed-off-by: Shea Levy <shea@shealevy.com>
commit c3fc60d9369fc802b33f75d2d9cd6ef22b916112
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 18 21:49:42 2013 +0100
Fix evaluation
commit f72ed360250fd04138358463b5d1965d81160e0d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Mar 15 14:21:05 2013 +0100
Bump version number
commit 78d777ca15a5212bef7d6674adf0ed1abadce883
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Mar 15 13:18:49 2013 +0100
Remove the "system" jobset input
commit a68ebf8e376a2f712cb7b00442e66c0c416026b4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Mar 14 18:33:15 2013 +0100
Require Bison 2.6
commit 804709706c56c207f1eb9033f98b213216672269
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Mar 14 18:31:08 2013 +0100
Fix building against Bison 2.6
commit c56bc3d81cdcc09daf331b253a42cd155a9bd5f2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Mar 14 17:21:13 2013 +0100
Make sure that thunks are restored properly if an exception occurs
Fixes Hydra bug #67.
commit 4b07476848f7738c07a5b0894ad7a848ee2e9c9d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Mar 8 01:27:04 2013 +0100
Prevent config.h from being clobbered
commit bdd4646338da296fdf3a8f9dc3cf5aff1dafa163
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Mar 8 01:24:59 2013 +0100
Revert "Prevent config.h from being clobbered"
This reverts commit 28bba8c44f484eae38e8a15dcec73cfa999156f6.
commit e73d9e948887621906363a35c980538294898a02
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Mar 8 00:27:32 2013 +0100
Fix annoying Perl 5.16 warnings
I.e.
Subroutine Nix::Store::isValidPath redefined at /nix/store/clfzsf6gi7qh5i9c0vks1ifjam47rijn-perl-5.16.2/lib/perl5/5.16.2/XSLoader.pm line 92.
and so on.
commit 28bba8c44f484eae38e8a15dcec73cfa999156f6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Mar 7 23:55:55 2013 +0100
Prevent config.h from being clobbered
commit 8057a192e3254c936fa0bcb5715e09600a28e8f8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 28 19:55:09 2013 +0100
Handle systems without lutimes() or lchown()
commit 9fa1bee575886b76c3a23af37f9f3ce2ce52733c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 28 19:36:02 2013 +0100
Update release notes
Also use a point release version number as suggested by several
people.
commit f45c731cd7740cfd479d8704de16ee49e51fe06e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 28 14:51:08 2013 +0100
Handle symlinks properly
Now it's really brown paper bag time...
commit 88936411bcdd344d04e3a9ae0cd5389650551784
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Feb 28 13:03:53 2013 +0100
Bump version number
commit 0111ba98ea0a91965ebb215b408ee1c10286a245
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 27 17:18:41 2013 +0100
Handle hard links to other files in the output
commit b008674e4616cd2596d8b02273deb52f8bcb7d6c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Feb 27 16:35:46 2013 +0100
Refactoring: Split off the non-recursive canonicalisePathMetaData()
Also, change the file mode before changing the owner. This prevents a
slight time window in which a setuid binary would be setuid root.
commit 826dc0d07d3b1ea6669f4ba42f73d1d29fe49642
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 26 14:32:48 2013 +0100
Remove outdated file
commit 97c6009c47d687fecbc0e49df421546b64a4c94b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 26 14:32:14 2013 +0100
Bump version number
commit ca9c02dff1449ff4c05ce86200ef73c2ff2883ab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 26 13:23:09 2013 +0100
Update release notes
commit 5526a282b5b44e9296e61e07d7d2626a79141ac4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 26 02:30:19 2013 +0100
Security: Don't allow builders to change permissions on files they don't own
It turns out that in multi-user Nix, a builder may be able to do
ln /etc/shadow $out/foo
Afterwards, canonicalisePathMetaData() will be applied to $out/foo,
causing /etc/shadow's mode to be set to 444 (readable by everybody but
writable by nobody). That's obviously Very Bad.
Fortunately, this fails in NixOS's default configuration because
/nix/store is a bind mount, so "ln" will fail with "Invalid
cross-device link". It also fails if hard-link restrictions are
enabled, so a workaround is:
echo 1 > /proc/sys/fs/protected_hardlinks
The solution is to check that all files in $out are owned by the build
user. This means that innocuous operations like "ln
${pkgs.foo}/some-file $out/" are now rejected, but that already failed
in chroot builds anyway.
commit dadf7a5b46f08b59c7e15a40937a9039ef273d63
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 19 16:56:31 2013 +0100
build-remote: Use the --quiet flag
‘--option verbosity 0’ doesn't actually do anything.
commit 3e067ac11c1621f989011432f619652a9c20e6f4
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon Feb 18 23:05:40 2013 +0100
Add `Settings::nixDaemonSocketFile'.
commit 5ea138dc4b9822095723b75bc2962e3d899f5437
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon Feb 18 23:05:39 2013 +0100
Enable chroot support on old glibc versions.
commit 79a3ba7fa3cd23b31ea43007899ed79f181d4faf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 8 20:02:58 2013 +0100
Document ‘hashString’
commit 5f18cd2e84bb4d7405f7dbcc8b6554365556a3a1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 8 19:49:24 2013 +0100
Make "${./path} ..." evaluate to a string, not a path
Wacky string coercion semantics caused expressions like
exec = "${./my-script} params...";
to evaluate to a path (‘/path/my-script params’), because
anti-quotations are desuged to string concatenation:
exec = ./my-script + " params...";
By constrast, adding a space at the start would yield a string as
expected:
exec = " ${./my-script} params...";
Now the first example also evaluates to a string.
commit 52172607cfc33867c0cdb526bef99c315e98baa2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Feb 8 19:36:23 2013 +0100
Rename "hash" to "hashString" and handle SHA-1
commit 01a5ea9914b3933e63a88184861900615be76e12
Author: Marc Weber <marco-oweber@gmx.de>
Date: Thu Feb 7 00:03:46 2013 +0100
experimental/hash
adding primop function calculating hash of a string
Signed-off-by: Marc Weber <marco-oweber@gmx.de>
commit 8add116acd050bdcca84b8a092420566a6e6692c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Feb 5 16:02:57 2013 +0100
Nix::Store::derivationFromPath: Return derivation outputs
commit d6143801fdba7354180d8a56ae86f7825178dff2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 30 18:49:19 2013 +0100
Support the colonies
commit 9842077cb2bd968e0b14502609cf41741e170d33
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 24 13:00:44 2013 +0100
Improve -I description
Issue #88.
commit 5e9c3da41282970d5a496d1327de69cc1274d353
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 23 16:45:10 2013 +0100
Only warn about SQLite being busy once
No need to get annoying.
commit 99ed558a93216288e50b11132f2a00a74cc6bb7f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jan 22 22:07:25 2013 +0100
Correctly handle missing logs
commit 1943b60ad820730a74d1dffcdddac396d0c1cb00
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 21 22:36:23 2013 +0100
Fix the VM tests
commit 96fbbbde55d6f226fc49299ed753761edfb6ad77
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 21 22:26:25 2013 +0100
build-remote.pl: Don't keep build logs on the build slave
commit d6fd6d8aff06740f6c2595d13482d9183c11d243
Author: Shea Levy <shea@shealevy.com>
Date: Fri Jan 18 19:59:23 2013 -0500
corepkgs/fetchurl: Enable making the downloaded file executable
commit 536c85ea49c16a2ecd5a1ba169975b296cd6158c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 17 15:37:52 2013 +0100
Store build logs in /nix/var/log/nix/drvs/<XX>
...where <XX> is the first two characters of the derivation.
Otherwise /nix/var/log/nix/drvs may become so large that we run into
all sorts of weird filesystem limits/inefficiences. For instance,
ext3/ext4 filesystems will barf with "ext4_dx_add_entry:1551:
Directory index full!" once you hit a few million files.
commit 66fa9e6a4d7cf4c0a32d33adfc464f84c492f6d1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jan 7 14:48:44 2013 +0100
Bump version number to 1.4
commit e42df686f309c5cd08a8653207e79e9caae37b67
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jan 5 00:13:29 2013 +0100
Delete a left-over trash directory before doing a GC
commit 92926be2fe15b25759e8e3e129a093798f8c37b6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jan 4 15:17:19 2013 +0100
Fix "0 store paths deleted" message
commit b424d29d1b2fb99c654f1cffe6cd57b298c0ab33
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 3 13:29:17 2013 +0100
Open the database after removing immutable bits
commit 3007f5737734856b58768f83edefe8574f373333
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 3 13:00:46 2013 +0100
Remove tabs
commit def5160b614a59a0aa96fe2252e3daa00146e061
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jan 3 12:59:23 2013 +0100
Clear any immutable bits in the Nix store
Doing this once makes subsequent operations like garbage collecting
more efficient since we don't have to call makeMutable() first.
commit 0a4e90395c3286a246b816575351b9f2016976ba
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 23:52:15 2013 +0100
Urgggh
http://hydra.nixos.org/build/3661100
commit f12492c66dc5c71c22ce2eb1788dacd86b1dfb1f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 22:36:08 2013 +0100
Manual: Fix "nix-store --export" example
commit aebea2e489a21af260e7a654b0313efe042fbf9d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 22:16:37 2013 +0100
Reinstate the http://nixos.org/binary-cache default for the binary-caches setting
commit 649bb60617e5413a87625a0c23e5ebd4f6229703
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 22:12:19 2013 +0100
Use sysconfdir=/etc
commit 42d6f640c13e292593d4141b8bae0a2da4ee6ef8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 12:59:49 2013 +0100
Update release notes
commit 299141ecbd08bae17013226dbeae71e842b4fdd7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 12:38:28 2013 +0100
If a substitute closure is incomplete, build dependencies, then retry the substituter
Issue #77.
commit 1b3a78a4597c6c1d94fc51aa0520252aab21a2c8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 12:00:26 2013 +0100
Automatically fall back if the references of a substitute are not substitutable
Fixes #77.
commit 82248abd8f2967f72b965c0ba7774815068c4962
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jan 2 11:45:23 2013 +0100
Add a test for incomplete closures in the binary cache
Issue #77.
commit 12f9129f60651793e319171236e006aecfdc34be
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Dec 29 23:21:46 2012 +0100
nix-build: Support talking to old daemons
Fixes #76.
commit b7629778efcfeb9ea876616feb869457cd2bf071
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Dec 29 23:04:02 2012 +0100
Allow mounting a path in a different location in the chroot
Fixes #24.
commit 68dcbb187e540034e85b5b77d1b37cec1759a587
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 21 15:00:07 2012 +0100
download-from-binary-cache: Use the channels of the calling user rather than root
This should make live easier for single-user (non-daemon)
installations. Note that when the daemon is used, the "calling user"
is root so we're not using any untrusted caches.
commit 5ee7d8fbab71b9eef94f1eecd38de511d00f6149
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 21 00:18:59 2012 +0100
Typo fix
commit 2754a07eadfa3fe263f83830c701748bbd4c0420
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 20 18:41:44 2012 +0100
nix-store -q --roots: Respect the gc-keep-outputs/gc-keep-derivations settings
So if a path is not garbage solely because it's reachable from a root
due to the gc-keep-outputs or gc-keep-derivations settings, ‘nix-store
-q --roots’ now shows that root.
commit 06f62defe640517267a6a16dd222076c822f3123
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 20 17:32:15 2012 +0100
Yet another rewrite of the garbage collector
But this time it's *obviously* correct! No more segfaults due to
infinite recursions for sure, etc.
Also, move directories to /nix/store/trash instead of renaming them to
/nix/store/bla-gc-<pid>. Then we can just delete /nix/store/trash at
the end.
commit 9c29a2ed35d884cda182cea74aee2a7ee614de93
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 20 12:22:13 2012 +0100
Give a better error message if writeFile fails due to permission issues
commit e775d4d84fe4b90464b00d560ceb79665301d79b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 19 15:33:09 2012 +0100
If gc-keep-derivations is set, only keep the actual deriver
This prevents zillions of derivations from being kept, and fixes an
infinite recursion in the garbage collector (due to an obscure cycle
that can occur with fixed-output derivations).
commit fbf0b2fa45c883f1f5e0c8f5397fcf62a4df9207
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 19 11:47:42 2012 +0100
Kill the build hook rather than shutting it down cleanly
Waiting for the hook to shut down cleanly sometimes seems to lead to
hangs.
commit 228ea7c2f988523d2c168f97975ab0e85f412e78
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 18 20:43:47 2012 +0100
Revert brain fart
This reverts commit cc511fd65b7b6de9e87e72fb4bed16fc7efeb8b7.
commit cc511fd65b7b6de9e87e72fb4bed16fc7efeb8b7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 18 18:50:05 2012 +0100
Check for potential infinite select() loops when building
commit a9045c727fab1cdcc530bc18e651334cf892d62c
Author: Stuart Pernsteiner <stuart@pernsteiner.org>
Date: Wed Dec 12 21:13:26 2012 -0800
fix use-after-free bug in mkString(Value&, Symbol&)
commit 9fa12fc2015c9cbc34bcf9d83e7396ba5dbc81a9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 12 16:01:46 2012 +0100
Allow setting the profile location using $NIX_PROFILE
Fixes #69.
commit 3ad53e43c8ca35cc581ebc3dd880c11892c8e016
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 11 16:50:21 2012 +0100
Debian package: Add dependency on libwww-curl-perl
Fixes issue #70.
commit 772778c0eced8f8d63bfe6b1e9801ad6aada65bf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 11 11:49:42 2012 +0100
On SQLITE_BUSY, wait a random amount of time
If all contending processes wait a fixed amount of time (100 ms),
there is a good probability that they'll just collide again.
commit e087bfef5f36f309b1c8d01bfe297e4cf4decb34
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Dec 7 13:14:04 2012 +0100
Bump version number
commit a6ce6d9e7cc0b95b8fc45ebf011ec10cc8eb0ff4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 6 16:55:57 2012 +0100
Fix manual generation
Grmbl.
commit 8cc19ed0892137a77d95250ffe1e5bc29ff2ebaf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Dec 6 11:43:34 2012 +0100
Set a long SQLite timeout in the binary cache substituter
commit 52edef34950354ecccbe8e1bf3f1aced3872b5c0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 23:25:40 2012 +0100
Fix RPM build
http://hydra.nixos.org/build/3436627
commit 8d100dbef1f2aeb90b73d659e0c9691be182d9ac
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 12:18:07 2012 +0100
Add a dependency on xz-utils
commit 5c487761c4df2aafd2f7d0f33f15adcc3dd45a82
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 12:17:12 2012 +0100
Add a dependency on xz
commit 3631dc6b2f8424018982f1b8a1c44e3d2f9e356e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 12:15:06 2012 +0100
Typo
commit aa61bc74729e1b96f6f345ff65fa6bd5de03df91
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 12:05:43 2012 +0100
Fix RPM build
http://hydra.nixos.org/build/3436511
commit 0f96966a44d76e0b625c0b17d02cc53b5233245d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 11:03:06 2012 +0100
Add release date
commit 566afa1e9c804dd4a893960f30325a38c81a4c51
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 11:02:44 2012 +0100
Support xz compression of nixexprs.tar in channels
commit 444b03a36fc038f030241d3d006d13ba2ae12e6b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 10:23:53 2012 +0100
Produce an xz-compressed tarball
Footnote: doing "make dist-gzip dist-xz" doesn't work with Automake;
you have to do "make dist-gzip; dist-xz". That's because the dist-*
targets delete the temporary distdir at the end.
commit d5a01d0f9dfda5a47461ab81e381a7035881b3ef
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Dec 5 09:54:41 2012 +0100
Build Debs for Ubuntu 12.10
commit a7b4aaa2c342437b14b82f216613759acc1208d5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 17:41:51 2012 +0100
Updated release notes
commit 3100b29fc51b46c76f6aca1fffc62881ca10de64
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 17:22:20 2012 +0100
Tiny optimisation in the filter primop
commit 094a08f8396c913b6023ae2bf1c6615470e7cc45
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 17:15:32 2012 +0100
Document new primops
commit 4387d19359780a03c8e60bf7b0687668c9ed88ca
Author: Florian Friesdorf <flo@chaoflow.net>
Date: Tue Dec 4 16:32:38 2012 +0100
nix-channel --update needs bzip2
commit 24d5875514ac4344643988077060e792252d135c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 16:03:56 2012 +0100
Document multiple output support
commit b215b23e9ee481dff55f8f0acf1232f608e5babb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 14:47:50 2012 +0100
Test priorities
commit 56d29dcd62ff5ff65b24da335a5119179c191806
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 14:45:32 2012 +0100
buildenv.pl: Create symlinks in priority order
This reduces unnecessary symlink/unlink steps.
commit 2d5e8e267b58f531f00b043c9e3dbaefad62a4a1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 14:30:34 2012 +0100
Add a test for ‘nix-env --set-flag active ...’
commit 5ad89398d12bf8bc83426036dedc2c601ff8f795
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Dec 4 14:20:36 2012 +0100
nix-env: Install all outputs of a derivation
If you explicitly install a package, presumably you want all of it.
So symlink all outputs in the user environment.
commit 21c2d8d102add45b8eda61c084aa072f8861a0ff
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Dec 3 21:02:06 2012 +0100
Test the ‘--prebuilt-only’ flag
commit d62fc71b851295b4c5692ec5fa362a06172e66ae
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Dec 3 21:01:41 2012 +0100
Fix the ‘--prebuilt-only’ flag
commit 4bb4d5479a8a2c2ed04bd65312ce1bfb6d2c0b13
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Dec 3 18:19:49 2012 +0100
Whitespace
commit 8eed07cda4c193bfcdd6ac4345ac6fb54aee0269
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Nov 28 13:49:44 2012 +0100
nix-env -q --out-path: Support multiple outputs
We now print all output paths of a package, e.g.
openssl-1.0.0i bin=/nix/store/gq2mvh0wb9l90djvsagln3aqywqmr6vl-openssl-1.0.0i-bin;man=/nix/store/7zwf5r5hsdarl3n86dasvb4chm2xzw9n-openssl-1.0.0i-man;/nix/store/cj7xvk7fjp9q887359j75pw3pzjfmqf1-openssl-1.0.0i
or (in XML mode)
<item attrPath="openssl" name="openssl-1.0.0i" system="x86_64-linux">
<output name="bin" path="/nix/store/gq2mvh0wb9l90djvsagln3aqywqmr6vl-openssl-1.0.0i-bin" />
<output name="man" path="/nix/store/7zwf5r5hsdarl3n86dasvb4chm2xzw9n-openssl-1.0.0i-man" />
<output name="out" path="/nix/store/cj7xvk7fjp9q887359j75pw3pzjfmqf1-openssl-1.0.0i" />
</item>
commit 6c98e6a5dec2bcbc25ddeb2c279aa4a0b274bd6a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 27 15:01:32 2012 +0100
Optionally ignore null-valued derivation attributes
This allows adding attributes like
attr = if stdenv.system == "bla" then something else null;
without changing the resulting derivation on non-<bla> platforms.
We once considered adding a special "ignore" value for this purpose,
but using null seems more elegant.
commit 8b8ee53bc73769bb25d967ba259dabc9b23e2e6f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 27 13:29:55 2012 +0100
Add builtin constants ‘langVersion’ and ‘nixVersion’
The integer constant ‘langVersion’ denotes the current language
version. It gets increased every time a language feature is
added/changed/removed. It's currently 1.
The string constant ‘nixVersion’ contains the current Nix version,
e.g. "1.2pre2980_9de6bc5".
commit 5943f41b8bd95b8559cb6768bb0a1151f6bee68d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 26 18:25:12 2012 +0100
queryMissing(): Handle partially valid derivations
commit 08964d7328f09a703467e4045e34023837a4cc01
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 26 17:57:14 2012 +0100
Undo accidental debug change
commit 69c88f5028b4b2d5d2500dc4f631d77ac1d2c5fd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 26 17:46:45 2012 +0100
Fix the multiple-outputs test
commit 408a7bfac1f4282ff6647696dfbc7988eed3a2ca
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 26 17:39:09 2012 +0100
nix-instantiate: Fix read-only evaluation
commit 8d8d47abd2a66898aa5d8999fcd75b29991e529d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 26 17:15:09 2012 +0100
Only substitute wanted outputs of a derivation
If a derivation has multiple outputs, then we only want to download
those outputs that are actuallty needed. So if we do "nix-build -A
openssl.man", then only the "man" output should be downloaded.
Likewise if another package depends on ${openssl.man}.
The tricky part is that different derivations can depend on different
outputs of a given derivation, so we may need to restart the
corresponding derivation goal if that happens.
commit 46a369ad9558939bc2c6ee588df483ca503bbb5a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 26 15:39:10 2012 +0100
Make "nix-build -A <derivation>.<output>" do the right thing
For example, given a derivation with outputs "out", "man" and "bin":
$ nix-build -A pkg
produces ./result pointing to the "out" output;
$ nix-build -A pkg.man
produces ./result-man pointing to the "man" output;
$ nix-build -A pkg.all
produces ./result, ./result-man and ./result-bin;
$ nix-build -A pkg.all -A pkg2
produces ./result, ./result-man, ./result-bin and ./result-2.
commit a3d6585c5a1006d4f9ebd2163d06f86ab71a4a3e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 23 16:20:16 2012 +0100
nix-copy-closure: Add flag ‘--use-substitutes’
commit 9de6bc5d05027363f968c20e53e8c3d5aa34f8b4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 20 00:27:25 2012 +0100
nix-store -r: Add ‘--ignore-unknown’ flag
This flag causes paths that do not have a known substitute to be
quietly ignored. This is mostly useful for Charon, allowing it to
speed up deployment by letting a machine use substitutes for all
substitutable paths, instead of uploading them. The latter is
frequently faster, e.g. if the target machine has a fast Internet
connection while the source machine is on a slow ADSL line.
commit bf3725da2a1e4e91fc34b5faeb55bb3c02f68674
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Nov 19 23:51:56 2012 +0100
nix-store -r: Don't quietly ignore missing paths
commit 17dc306aa32c48dcde6bfc12ad5e4b48f6b88974
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 15 23:04:34 2012 +0100
Revert "prim_toPath: Actually make the string a path"
This reverts commit 2980d1fba97069805c3649c5d99d0356bce6c303. It
causes a regression in NixOS evaluation:
string `/nix/store/ya3s5gmj3b28170fpbjhgsk8wzymkpa1-pommed-1.39/etc/pommed.conf' cannot refer to other paths
commit f794465ca8bd2a8d41ee3b6928db5fb1479dc96d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 15 19:35:18 2012 +0100
Disable use of vfork()
vfork() is just too weird. For instance, in this build:
http://hydra.nixos.org/build/3330487
the value fromHook.writeSide becomes corrupted in the parent, even
though the child only reads from it. At -O0 the problem goes away.
Probably the child is overriding some spilled temporary variable.
If I get bored I may implement using posix_spawn() instead.
commit 8541d27fce95f1f6a4a6c89bcbc09503ff7ea092
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 15 15:01:02 2012 +0100
Don't use std::cerr in a few places
Slightly scared of using std::cerr in a vforked process...
commit 3acc8adcad4066329913cf9ad4e1ccc535f73032
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Nov 15 13:55:02 2012 +0100
Add some debug code
commit ea89df2b76811505239b508a570ac9c0ea591038
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 18:00:33 2012 +0100
Use vfork() instead of fork() if available
Hopefully this reduces the chance of hitting ‘unable to fork: Cannot
allocate memory’ errors. vfork() is used for everything except
starting builders.
commit 48c19c4633b1443015531ee3032b16b29b0a92f9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 17:59:41 2012 +0100
Remove definition of non-existant function
commit 198dbe7fa1807f7464ef7c15c3fd0d230f7b844e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 16:58:51 2012 +0100
Remove some redundant close() calls
They are unnecessary because we set the close-on-exec flag.
commit 10dcee99ed62a775c05f34aa70449945d537e1a2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 16:42:10 2012 +0100
Remove the quickExit function
commit 4c9e3fa6412f736ce422f8deb0ba825999b66b0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 16:35:42 2012 +0100
Remove a Darwin hack that should no longer be needed
commit 182e15b66135a83d60d662a9e480831018572073
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 16:30:15 2012 +0100
Manual: Don't use a store path in our closure
http://hydra.nixos.org/build/3313227
commit 88164325fac228e8e27fdea27776416d67a85dd6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 15:09:31 2012 +0100
Fix a segfault when auto-calling a "a@{...}" function
Since the called function can return its argument attribute set
(e.g. "a"), the latter should not be allocated on the stack.
Reported by Shea.
commit f581ce0b0cb86670db2b806f98ac0ec368b8cdc1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 14:58:10 2012 +0100
Don't start copy-from-other-stores if $NIX_OTHER_STORES is unset
Slight optimisation.
commit 91ef4d9a81827177963bcf7708af3a46217fd0e9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 14:43:47 2012 +0100
Remove unnecessary call to closeMostFDs()
We have close-on-exec on all FDs now, and there is no security risk in
passing open FDs to substituters anyway.
commit a9a8baaccbe1c8291d0cfd42fe3c87377b105381
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 13:33:35 2012 +0100
Use a shorter Nixpkgs channel URL
commit c31ebc50aaaf011f020b7314baa9921aae1050a6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Nov 9 13:33:24 2012 +0100
Update release notes
commit e28b683324388f33b89ee40d7a7e25dcd8f98109
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 6 17:55:53 2012 +0100
download-from-binary-cache: Try next cache if downloading a NAR fails
commit bbc107ef1e850d73dbe9a21c567b34f5939570c6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 6 17:45:20 2012 +0100
Process binary caches in order of priority
Binary caches can now specify a priority in their nix-cache-info file.
The binary cache substituter checks caches in order of priority. This
is to ensure that fast, static caches like nixos.org/binary-cache are
processed before slow, dynamic caches like hydra.nixos.org.
commit 3a95e1a17cd2755f00c26eb16ffd066bc6aa1a8d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 6 15:49:53 2012 +0100
Update nix-push manpage and document the binary cache format
commit 82951e5582ae7927cb90320accb989214ce07142
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 6 13:53:53 2012 +0100
nix-push: Handle pushing a symlink
commit 620e92e880f8a011c5f465ea4fee2abf857d4ab2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 6 13:44:59 2012 +0100
Add an option ‘use-binary-caches’
This allows disabling the use of binary caches, e.g.
$ nix-build ... --option use-binary-caches false
Note that
$ nix-build ... --option binary-caches ''
does not disable all binary caches, since the caches defined by
channels will still be used.
commit df27db712df658dc9b7548b55fd65a15515d4d85
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Nov 6 13:43:46 2012 +0100
Fix "Not an ARRAY reference" error
It's a mystery why this error is not triggered in the build farm
(e.g. http://hydra.nixos.org/build/3265602). Ah well.
commit d0fc615af658cb83e858b3c3c5e0d4c6c539ad66
Author: Shea Levy <shea@shealevy.com>
Date: Mon Nov 5 23:00:21 2012 -0500
canonicalizePathMetaData: Fall-back to utimes if lutimes fails due to ENOSYS
commit 4c34d384e68ce7e2c949a7588d80bbe7d5a96440
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 23 18:05:50 2012 +0200
If hashes do not match, print them in base-32 for SHA-1/SHA-256
Fixes #57.
commit a28b4445a4eb8108dfc028083d3939d5f3a42685
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 23 18:04:00 2012 +0200
nix-prefetch-url: Improve option handling
commit 2980d1fba97069805c3649c5d99d0356bce6c303
Author: Shea Levy <shea@shealevy.com>
Date: Tue Aug 28 22:12:05 2012 -0400
prim_toPath: Actually make the string a path
commit dde6486eabbabf83e2d7aa65cde8eadfee108bdd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 18 10:36:16 2012 -0400
nix-push: Add a flag ‘--manifest-path’ to write the manifest to another directory
commit c8daeba30328c83328b632f8f45920d85d7d1968
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 17 17:01:23 2012 -0400
nix-push: Add ‘--link’ flag
If ‘--link’ is given, nix-push will create hard links to the NAR files
in the store, rather than copying them. This is faster and requires
less disk space. However, it doesn't work if the store is on a
different file system.
commit 167e36a5c3127da63d120d9fdaf5e046b829f287
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 17 16:45:04 2012 -0400
nix-push: Only generate and copy a NAR if it doesn't already exist
This prevents unnecessary and slow rebuilds of NARs that already exist
in the binary cache.
commit ac238d619c2469ea89b8707ae340d3f19c77eadf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Oct 12 10:21:04 2012 -0400
Typo
Reported by Shea.
commit 600daf972f9157d358841f76b3292b667c97666f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 11 14:21:22 2012 -0400
download-from-binary-cache: Remove duplicate entries in trustedURLs
commit e34518205533a90e9664d7ab3888818e669e11cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 11 14:03:06 2012 -0400
Shorten the names of temporary build directories
commit ecedd9c50c50bb42accf27394193bb7ef80c75b0
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date: Wed Oct 10 11:10:28 2012 +0200
Out-of-tree building of perl modules.
commit 70f75be199d8db959d313dc40111893fba56415f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 4 15:22:25 2012 -0400
getDerivation(): Don't always quietly ignore assertion failure
Ignoring assertion failures makes some sense for nix-env -qa, but not
for nix-instantiate/nix-build or hydra-eval-jobs.
commit ad328bea15e2708e5aa784c33ba8bfbc86d02e0d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 4 14:07:36 2012 -0400
XML writer: flush after newlines
This is useful for hydra-eval-jobs.
commit bfaa5635de8ed83085dfeb265227cc25a32ce07c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 4 13:37:30 2012 -0400
Manual: Don't use a store path that actually exists
http://hydra.nixos.org/build/3124130
commit 904f50412cdd0b7d0ef4933e7a5b652a9454d644
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 4 10:20:23 2012 -0400
nix-store --verify: Continue on errors
commit 90b8a34f821610a867b3a60d91c8e86267864be2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Oct 4 09:46:10 2012 -0400
Fix regular expression
http://hydra.nixos.org/build/3123177
commit d1de83693821c0cc46810e835509a89b46311d4a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 21:01:03 2012 -0400
Fix the tarball build
commit f766e146f484a10e0bfd3f29b1ba59cc38007b63
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 18:01:35 2012 -0400
Fix the test
commit e35d6f78dc797150451f5134833afa0ecdf4a241
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 17:57:20 2012 -0400
Rename nix-worker to nix-daemon
commit 522ecab9b83902de5a3010b50b9532e376cbba4c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 17:30:45 2012 -0400
Drop support for running nix-worker in "slave" mode
AFAIK nobody uses this, setuid binaries are evil, and there is no good
reason why people can't just run the daemon.
commit 7586095504f238a35937426aa870cb6d2a7b2862
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 16:54:40 2012 -0400
Remove bin2c
commit a562d544d8520a0f113ad1a348e28ea00f27b693
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 16:37:06 2012 -0400
When ‘--help’ is given, just run ‘man’ to show the manual page
I.e. do what git does. I'm too lazy to keep the builtin help text up
to date :-)
Also add ‘--help’ to various commands that lacked it
(e.g. nix-collect-garbage).
commit 9c41c66c5b877dbb529f6147b28384a57a591895
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 15:53:25 2012 -0400
Document ‘--repair’
commit 2bbc4a214ee998816921cefb2d69f30d5f277d12
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 15:35:42 2012 -0400
nix-env: Support ‘--repair’ flag
commit 2e90a5a2a7646f4ab36202d6a149518ccb6f750e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 15:14:02 2012 -0400
nix-build: Support ‘--repair’ flag
commit 0a7084567fc4e7d077863075a7ea1bb82d843341
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 15:09:18 2012 -0400
Add a ‘--repair’ flag to nix-instantiate
This allows repairing corrupted derivations and other source files.
commit a807edfae8428bf426ee6ae849a7a24d74d39202
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 11:20:16 2012 -0400
Handle repairing paths that are in build-chroot-dirs
commit a3f205b24954c7f0983a937b0b9b3d64c22a2fa7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Oct 3 10:38:09 2012 -0400
When repairing a derivation, check and repair the entire output closure
If we find a corrupted path in the output closure, we rebuild the
derivation that produced that particular path.
commit 2001895f3d2668549feb60a182aa624a7b6292eb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 2 17:13:46 2012 -0400
Add a --repair flag to ‘nix-store -r’ to repair derivation outputs
With this flag, if any valid derivation output is missing or corrupt,
it will be recreated by using a substitute if available, or by
rebuilding the derivation. The latter may use hash rewriting if
chroots are not available.
commit cf46f194445c9abc0398dae908295dff794fee98
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 2 16:00:09 2012 -0400
nix-store -r: Get rid of an unnecessary call to buildPaths/ensurePaths
commit 8e3a7bd71253f02eb1a9fbb996166727b1283887
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 2 15:04:59 2012 -0400
nix-store --verify: Add an option ‘--repair’ to repair all missing/corrupt paths
Also, return a non-zero exit code if errors remain after
verifying/repairing.
commit 9958bd6992e2b3e7bacb493a372d17d5a5b95d90
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Oct 2 14:08:59 2012 -0400
Add operation ‘nix-store --repair-path’
This operation allows fixing corrupted or accidentally deleted store
paths by redownloading them using substituters, if available.
Since the corrupted path cannot be replaced atomically, there is a
very small time window (one system call) during which neither the old
(corrupted) nor the new (repaired) contents are available. So
repairing should be used with some care on critical packages like
Glibc.
commit e666e1156fba936dce93ccfa2486f67369a97129
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 28 21:39:30 2012 -0400
Handle octal escapes in /proc/self/mountinfo
commit f406288cc7cf648001a40b0a96cb97c31347cc5a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 28 21:26:36 2012 -0400
Print a more descriptive error message if setting up the build environment fails
commit 95c74eae269b2b9e4bc514581b5caa1d80b54acc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 27 15:43:08 2012 -0400
Allow dashes in identifiers
In Nixpkgs, the attribute in all-packages.nix corresponding to a
package is usually equal to the package name. However, this doesn't
work if the package contains a dash, which is fairly common. The
convention is to replace the dash with an underscore (e.g. "dbus-lib"
becomes "dbus_glib"), but that's annoying. So now dashes are valid in
variable / attribute names, allowing you to write:
dbus-glib = callPackage ../development/libraries/dbus-glib { };
and
buildInputs = [ dbus-glib ];
Since we don't have a negation or subtraction operation in Nix, this
is unambiguous.
commit f46612be96a70a188cd48462ac94089d3e95a36b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 25 16:30:37 2012 -0400
Add "on Linux" qualifier
commit d534f137f0b0bf6b8559731edcfc1e50bd15a427
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 25 16:30:08 2012 -0400
Make the store writable before creating /nix/store/.links
commit 0f358ca5b6f1357e295020c3ed89fe877e809fd9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 25 16:11:58 2012 -0400
Document that Nix requires GNU Make
Fixes #44.
commit cb6651e878b3f2d97ac5e2318d679957904105ef
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 25 16:04:50 2012 -0400
Update release notes
commit e464b0247d9dd2c53770a851956dd34f82b7c9a6
Merge: 28bf183 b9c2b4d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 25 15:38:00 2012 -0400
Merge branch 'readonly-store'
commit 28bf183d2d2f775e653efe4cee98d7359ce65455
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 25 13:00:19 2012 -0400
Include <sys/types.h> for off_t
Reported by "gio" on IRC.
commit c1f91570b39caa3cf8a533aa517e3812a8bb8dc3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 21 15:02:33 2012 -0400
Style fix
commit 20582e9ae3c6eb14212a285489c1a573117d046c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 19 17:33:42 2012 -0400
Support xz compression in the download-using-manifests substituter
commit b9c2b4d5b4cd5d52a950e6dd90eb2e2e79891fa0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 19 16:17:54 2012 -0400
Remove setting of the immutable bit
Using the immutable bit is problematic, especially in conjunction with
store optimisation. For instance, if the garbage collector deletes a
file, it has to clear its immutable bit, but if the file has
additional hard links, we can't set the bit afterwards because we
don't know the remaining paths.
So now that we support having the entire Nix store as a read-only
mount, we may as well drop the immutable bit. Unfortunately, we have
to keep the code to clear the immutable bit for backwards
compatibility.
commit b9124a5c336fd231adaa548cf5be311731847848
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 19 15:45:29 2012 -0400
Support having /nix/store as a read-only bind mount
It turns out that the immutable bit doesn't work all that well. A
better way is to make the entire Nix store a read-only bind mount,
i.e. by doing
$ mount --bind /nix/store /nix/store
$ mount -o remount,ro,bind /nix/store
(This would typically done in an early boot script, before anything
from /nix/store is used.)
Since Nix needs to be able to write to the Nix store, it now detects
if /nix/store is a read-only bind mount and then makes it writable in
a private mount namespace.
commit 76e88871b21c47c0216e160a5fb926f763ba64fe
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 19 15:43:23 2012 -0400
Templatise tokenizeString()
commit 00092b2d356293a7af9d4d8125a689f90c461591
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 18 10:11:42 2012 -0400
Keep build directory if not all expected outputs were produced
Fixes issue #123 in Nixpkgs.
commit b67466576531959ca298fcfce4f0bf379515f8e5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 14 10:18:27 2012 -0400
Test whether GNU tar understands --warning=no-timestamp
http://hydra.nixos.org/build/3031618
commit 09eb23090022fed689c6db6c485d7cc973e2b79e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Sep 14 09:39:48 2012 -0400
Fix test
http://hydra.nixos.org/build/3031382
commit 983220bcd46e89ee4d2ce0417eb514cd6c062f2d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 18:09:20 2012 -0400
nix-collect-garbage: Support --dry-run
commit 9fd9dedf12bb64e02b35e9231173f9ebae5e1492
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 18:05:04 2012 -0400
nix-env --delete-generations: Support --dry-run flag
Fixes #43.
commit 1bda006b748ffec371096af56a8fbf7125658f71
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 17:58:14 2012 -0400
Add a test for nix-profile.sh
commit aac14222f52b15c9f4eea90359e9df09fb301739
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 17:48:19 2012 -0400
nix-profile.sh: Revert to single-user version
Commit 6a214f3e06fa1c5f0a4d40e555f14d87691af297 copied most of the Nix
shell initialisation code from NixOS to nix-profile.sh; however, that
code assumes a multi-user install and is Linux-specific (e.g. it calls
the "stat" command). So go back to the simple single-user version.
Fixes #49.
commit 54fe8e0773870631724b7325553f84637bb3e05a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 17:23:12 2012 -0400
Remove double Fedora release suffix
commit 47ae3ce2ca1dc93e2539a04c690c18f4747c8e8d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 16:39:16 2012 -0400
Put a time-to-live on negative binary cache lookups
Negative lookups are purged from the DB after a day, at most once per
day. However, for non-"have" lookups (e.g. all except "nix-env
-qas"), negative lookups are ignored after one hour. This is to
ensure that you don't have to wait a day for an operation like
"nix-env -i" to start using new binaries in the cache.
Should probably make this configurable.
commit e03a8a1c923365ca24ea63ac43d3e09f7f9fb3d8
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 14:58:56 2012 -0400
Doh
commit 8fbe96cb3154d5db11b15728ad037bed28f08aa9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 14:46:37 2012 -0400
RemoteStore::connectToDaemon(): Set close-on-exec flag
This ensures that "nix-build --run-env" doesn't keep a connection to
the worker open, preventing it from exiting.
commit e6e495649cc1f324cd0a66cfaf3c4bdf21522e63
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 14:33:41 2012 -0400
Vacuum the SQLite DB after running the garbage collector
commit 2923b55f9d67bda340053a27e08f7bcddc025f7c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 13:08:27 2012 -0400
Delete paths in a component in topologically sorted order
The outputs of a derivation can refer to each other (even though they
cannot have cycles), so they have to be deleted in the right order.
http://hydra.nixos.org/build/3026118
commit 31114ec3a5ce08ccf9526f62316f1cc60c8b399a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 12:54:23 2012 -0400
Fix the store optimisation test
http://hydra.nixos.org/build/3026118
commit c845c0ccad9a835a69c63c2eadd71d7845dca111
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 12:11:40 2012 -0400
nix-channel: Add option to force fetching of manifests
commit b14717ab9003452fda7afe0f9627673b9f331569
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 11:35:46 2012 -0400
Delete manifests in "nix-channel --remove" or when a binary cache is available
commit 6c4ac299173e3b9772c96bef1e6463b22dcd0227
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 10:28:20 2012 -0400
Disable auto store optimisation for now
I've seen operations like "nix-store --import" take much longer on one
system. So default to off until I've investigated this a bit further.
commit e56f71edafce9c60fd5e0c3ed93771b7d911d334
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Sep 13 10:06:24 2012 -0400
In startBuilder(), only print the new paths we're building
commit 4fca02077c4cdea13d32b4665e817460f6502726
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 12 18:49:35 2012 -0400
Handle gc-keep-outputs and gc-keep-derivations both enabled
If the options gc-keep-outputs and gc-keep-derivations are both
enabled, you can get a cycle in the liveness graph. There was a hack
to handle this, but it didn't work with multiple-output derivations,
causing the garbage collector to fail with errors like ‘error: cannot
delete path `...' because it is in use by `...'’. The garbage
collector now handles strongly connected components in the liveness
graph as a unit and decides whether to delete all or none of the paths
in an SCC.
commit 479e9172b3583cedcada90ed193cab156cdc56b5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 12 12:15:47 2012 -0400
Build hook: Pass the timeout to the remote builder
Note that this will only work if the client has a very recent Nix
version (post 15e1b2c223494ecb5efefc3ea0e3b926a6b1d7dc), otherwise the
--option flag will just be ignored.
Fixes #50.
commit 4ba47205c687772cf73a490eac3a489931d4913b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 12 11:29:10 2012 -0400
Fix test failure on Darwin
Apparently our DBD::SQLite links against /usr/lib/libsqlite3.dylib,
which is an old version that doesn't respect foreign key constraints.
So manifests/cache.sqlite doesn't get updated properly when a manifest
disappears. We should fix our DBD::SQLite, but in the meantime this
will fix the test.
http://hydra.nixos.org/build/3017959
commit 6762424e2471e3e4f9ba9b6bb883d08911d352fb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Sep 12 10:41:17 2012 -0400
Compatibility fix for WWW::Curl < 4.14
Older versions of WWW::Curl don't support scalar references for
CURLOPT_WRITEDATA directly.
http://hydra.nixos.org/build/3017188
commit d4c3b6327ff88273462cec57b0e2805d333c386e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 19:14:15 2012 -0400
Don't put results symlinks in the tests directory
commit 1f7901ec3b66fa80203bbac2cd6852eda389ba18
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 19:10:11 2012 -0400
Test hash rewriting
commit 5e2ffd0b8a857da3239015d28f3a8b803566aecc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 19:09:01 2012 -0400
Fix "non-zero padding" error
Probably it's not a good idea to pass a temporary object to
StringSource.
commit 8cf672091eb93fea5496aca2655436413f4d3c66
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 18:39:22 2012 -0400
Support building a derivation if some outputs are already valid (non-chroot case)
This uses scary hash rewriting.
Fixes #21.
commit 9dbda2b3fe98014687ae5cbbf16866ca6cf34f64
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 17:05:35 2012 -0400
Remove debug line
commit a2785b739169832f09285c81695c90a3aac3f731
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 16:59:59 2012 -0400
Support building a derivation if some outputs are already valid
This handles the chroot and build hook cases, which are easy.
Supporting the non-chroot-build case will require more work (hash
rewriting!).
Issue #21.
commit 295027f533bb5a754bfc62f934c88b43e9c100a6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 14:45:42 2012 -0400
Include config.h before any other header
"config.h" must be included first, because otherwise the compiler
might not see the right value of _FILE_OFFSET_BITS. We've had this
before; see 705868a8a96a10f70e629433cfffc2d5cd2703eb. In this case,
GCC would compute a different address for ‘settings.useSubstitutes’ in
misc.cc because of the off_t in ‘settings’.
Reverts 3854fc9b42d16b810f62b64194b699033b03aaf1.
http://hydra.nixos.org/build/3016700
commit d3004c78d9816431224f7ac0416c5bfea0cc22cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Sep 11 13:07:22 2012 -0400
Don't use -warning=no-timestamp unless we have GNU tar
http://hydra.nixos.org/build/2998485
commit 360056e174db2171c47e065ae1e5f58ccee0236f
Author: Shea Levy <shea@shealevy.com>
Date: Sun Aug 26 14:48:47 2012 -0400
Document importing from a directory in the import documentation
commit f7b650d234dffd72b2c70ee25d9e333d433feba6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 28 11:47:26 2012 -0400
Make "nix-instantiate -" interruptible
commit 15e1b2c223494ecb5efefc3ea0e3b926a6b1d7dc
Merge: a9e6752 9e2fc69
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 14:34:51 2012 -0400
Merge branch 'no-manifests'
commit 9e2fc6951ca049b15149a2c4b75d2f5bff7f07e1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 14:20:14 2012 -0400
Disable the binary cache substituter by default for now
commit cfd968dd94f35c5ef781be9bda883d8818fc1d6e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 14:17:13 2012 -0400
Fix stupid type error in calling std::max
commit f3077fd88d6ec8f05a5471687f23589e34dfeaeb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 13:45:53 2012 -0400
Add libwww-curl-perl to the Debian/Ubuntu images
commit cc8641815b018315ee444c58dd4bc6bfc38c7d0f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 11:47:49 2012 -0400
Add WWW::Curl to the RPM dependencies
commit 2688fb73f1e0bd96003a82c89ac8de12eca2b49f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 11:47:04 2012 -0400
Add perl-WWW-Curl to the RPM image
commit 8207359227740bfb2fe77cf843a81aa878fd39aa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 11:28:48 2012 -0400
Whitespace
commit 8b8fe6139e05f990b9d2a35652fd9bdb79189f90
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 11:28:34 2012 -0400
Drop dependency on List::MoreUtils
commit babe54bf97091441353f2219e7846afd0e0d9f16
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 11:11:30 2012 -0400
Add missing file
commit e94806d03098f1d6e654542500bbea1eaa0ec60b
Merge: 9c2deca a9e6752
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 27 11:09:07 2012 -0400
Merge branch 'master' into no-manifests
commit a9e6752bbd888ab8fbc1cda6e4d539b2858c4cef
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Aug 24 16:58:11 2012 -0400
Include the output name in the GC root link
Output names are now appended to resulting GC symlinks, e.g. by
nix-build. For backwards compatibility, if the output is named "out",
nothing is appended. E.g. doing "nix-build -A foo" on a derivation
that produces outputs "out", "bin" and "dev" will produce symlinks
"./result", "./result-bin" and "./result-dev", respectively.
commit 4aa1e5c55484ac02d28883292ee5c5806f5e4664
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 22 10:58:24 2012 -0400
Receive reserveSpace before calling startWork()
Otherwise we can get a SIGPOLL. Reported by Ludovic.
commit d950cfe70b2b70e938ece672dbccedfd4413c295
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 20 15:55:49 2012 -0400
Check if MS_PRIVATE is defined
http://hydra.nixos.org/build/2955671
commit 56e30e161cd309addb5aa95ba02a8d3371846228
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 20 15:27:30 2012 -0400
In the chroot, make all mounted filesystems private
This is required on systemd, which mounts filesystems as "shared"
subtrees. Changes to shared trees in a private mount namespace are
propagated to the outside world, which is bad.
commit f0eab0636b73a4f16b7639d30956d9072d5573cb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 20 15:27:00 2012 -0400
Don't bind-mount /proc since we mount our own
commit 862c4c5ec509e05815d99fb4b80558974148b8c5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 19 16:32:42 2012 -0400
Fix 1755 permission on temporary directories left behind by ‘-K’
commit 767101824af1fe41b6e50791b21112c6a8d7457f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 15:10:29 2012 -0400
Avoid concatenating lists of one string
commit e5c589d271c62f57cd2e7eb7d9841f67d8845ff4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 15:02:09 2012 -0400
Don't allocate empty lists
This saves about 4 MB when evaluating a NixOS system configuration.
commit 3e89ef597ce00dbf82a937aad9efab3c9c7b6dcf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 14:58:54 2012 -0400
Optimise concatenating a list to an empty list
More precisely, in concatLists, if all lists except one are empty,
then just return the non-empty list. This reduces the number of list
element allocations by 32% when evaluating a NixOS system
configuration.
commit 9c2d63084bd4f6a04210cd52b4fce054d248bc6b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 13:46:42 2012 -0400
Add a primop ‘elemAt’ to get an element from a list
commit 198d0338be7c105b6dbd707f98e0c223a8358240
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 01:53:10 2012 -0400
Add a primop ‘concatLists’
This can serve as a generic efficient list builder. For instance, the
function ‘catAttrs’ in Nixpkgs can be rewritten from
attr: l: fold (s: l: if hasAttr attr s then [(getAttr attr s)] ++ l else l) [] l
to
attr: l: builtins.concatLists (map (s: if hasAttr attr s then [(getAttr attr s)] else []) l)
Statistics before:
time elapsed: 1.08683
size of a value: 24
environments allocated: 1384376 (35809568 bytes)
list elements: 6946783 (55574264 bytes)
list concatenations: 37434
values allocated: 1760440 (42250560 bytes)
attribute sets allocated: 392040
right-biased unions: 186334
values copied in right-biased unions: 591137
symbols in symbol table: 18273
number of thunks: 1297673
number of thunks avoided: 1380759
number of attr lookups: 430802
number of primop calls: 628912
number of function calls: 1333544
Statistics after (including new catAttrs):
time elapsed: 0.959854
size of a value: 24
environments allocated: 1010198 (26829296 bytes)
list elements: 1984878 (15879024 bytes)
list concatenations: 30488
values allocated: 1589760 (38154240 bytes)
attribute sets allocated: 392040
right-biased unions: 186334
values copied in right-biased unions: 591137
symbols in symbol table: 18274
number of thunks: 1040925
number of thunks avoided: 1038428
number of attr lookups: 438419
number of primop calls: 474844
number of function calls: 959366
commit b9e5b908ed29bfb6cd82837f9f57293c1f63e999
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 01:05:35 2012 -0400
Provide an efficient implementation of ‘elem’
The one in Nixpkgs is O(n^2), this one is O(n). Big reduction in the
number of list allocations.
Statistics before (on a NixOS system config):
time elapsed: 1.17982
size of a value: 24
environments allocated: 1543334 (39624560 bytes)
list elements: 9612638 (76901104 bytes)
list concatenations: 37434
values allocated: 1854933 (44518392 bytes)
attribute sets allocated: 392040
right-biased unions: 186334
values copied in right-biased unions: 591137
symbols in symbol table: 18272
number of thunks: 1392467
number of thunks avoided: 1507311
number of attr lookups: 430801
number of primop calls: 691600
number of function calls: 1492502
Statistics after:
time elapsed: 1.08683
size of a value: 24
environments allocated: 1384376 (35809568 bytes)
list elements: 6946783 (55574264 bytes)
list concatenations: 37434
values allocated: 1760440 (42250560 bytes)
attribute sets allocated: 392040
right-biased unions: 186334
values copied in right-biased unions: 591137
symbols in symbol table: 18273
number of thunks: 1297673
number of thunks avoided: 1380759
number of attr lookups: 430802
number of primop calls: 628912
number of function calls: 1333544
commit 4ccd48ce2478cbe1263605838969f89d5b745f0a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Aug 13 00:28:08 2012 -0400
Add a "filter" primop
Evaluation of a NixOS configuration spends quite a lot of time in the
"filter" function in Nixpkgs. As implemented in Nixpkgs, this is a
O(n^2) operation, so it's a good candidate for providing a more
efficient (i.e. primop) implementation. Using it gives a ~10% speed
increase and a significant reduction in the number of evaluations.
Statistics before (on a NixOS system config):
time elapsed: 1.3258
size of a value: 24
environments allocated: 1980939 (50127080 bytes)
list elements: 14679308 (117434464 bytes)
list concatenations: 50828
values allocated: 2098938 (50374512 bytes)
attribute sets allocated: 392040
right-biased unions: 186334
values copied in right-biased unions: 591137
symbols in symbol table: 18271
number of thunks: 1645752
number of thunks avoided: 1921196
number of attr lookups: 430798
number of primop calls: 838807
number of function calls: 1930107
Statistics after:
time elapsed: 1.17982
size of a value: 24
environments allocated: 1543334 (39624560 bytes)
list elements: 9612638 (76901104 bytes)
list concatenations: 37434
values allocated: 1854933 (44518392 bytes)
attribute sets allocated: 392040
right-biased unions: 186334
values copied in right-biased unions: 591137
symbols in symbol table: 18272
number of thunks: 1392467
number of thunks avoided: 1507311
number of attr lookups: 430801
number of primop calls: 691600
number of function calls: 1492502
commit 62f72eb9e1a4421a9d4ea3e06f467e49869c0e51
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 12 23:41:48 2012 -0400
Add some more evaluations stats
commit e82767910c649f160d6701e47f606f3b8dde4b29
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 12 23:29:28 2012 -0400
Add some basic profiling support to the evaluator
Setting the environment variable NIX_COUNT_CALLS to 1 enables some
basic profiling in the evaluator. It will count calls to functions
and primops as well as evaluations of attributes.
For example, to see where evaluation of a NixOS configuration spends
its time:
$ NIX_SHOW_STATS=1 NIX_COUNT_CALLS=1 ./src/nix-instantiate/nix-instantiate '<nixos>' -A system --readonly-mode
...
calls to 39 primops:
239532 head
233962 tail
191252 hasAttr
...
calls to 1595 functions:
224157 `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/pkgs/lib/lists.nix:17:19'
221767 `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/pkgs/lib/lists.nix:17:14'
221767 `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/pkgs/lib/lists.nix:17:10'
...
evaluations of 7088 attributes:
167377 undefined position
132459 `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/pkgs/lib/attrsets.nix:119:41'
47322 `/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/pkgs/lib/attrsets.nix:13:21'
...
commit 325d1cfebf6c8ad391dc318f984feb3e5731aa5a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Aug 7 16:22:54 2012 -0400
Don't warn about maximum link count exceeded on 0-byte files
commit d025142f529731f05868f5397f5617011963c8b4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 5 21:45:27 2012 -0400
Handle amount of disk space saved by hard linking being negative
Fixes bogus messages like "currently hard linking saves
17592186044416.00 MiB".
commit b6c989b80198badf5f694340c07abc282365aaec
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 5 21:41:44 2012 -0400
Fix race condition when two processes create a hard link to a file in .links
This is a problem because one process may set the immutable bit before
the second process has created its link.
Addressed random Hydra failures such as:
error: cannot rename `/nix/store/.tmp-link-17397-1804289383' to
`/nix/store/rsvzm574rlfip3830ac7kmaa028bzl6h-nixos-0.1pre-git/upstart-interface-version':
Operation not permitted
commit 108e14bb189fd0fb291d3494f9f3915070a7052e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Aug 5 18:17:55 2012 -0400
Fix race condition when two processes create the same link in /nix/store/.links
commit 6763084ae53fc0228d50ab94bbbced89c1b14f1c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 22:43:03 2012 -0400
Count bytes freed deleting unused links
commit 01d56c1eeca497de247413a64a544605c53d9d41
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 22:34:46 2012 -0400
Drop the block count in the garbage collector
commit 967d066d8e452e59507ebae7585d6f34a4edf687
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 19:14:30 2012 -0400
nix-store --gc: Make ‘--max-freed 0’ do the right thing
That is, delete almost nothing (it will still remove unused links from
/nix/store/.links).
commit 1df702d34733e69599a6ae21cb366348a2534b7d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 19:01:50 2012 -0400
removeUnusedLinks(): Print stats on disk space saved by hard linking
commit 9c2decaa1935ae4bf99a9b723d4eab188f8f88ef
Merge: 5170c56 234ce61
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 18:03:49 2012 -0400
Merge branch 'master' into no-manifests
commit 5170c5691aac1bd6abc69be65cf880316e11fe24
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 17:56:11 2012 -0400
nix-channel: Use binary caches advertised by channels
Channels can now advertise a binary cache by creating a file
<channel-url>/binary-cache-url. The channel unpacker puts these in
its "binary-caches" subdirectory. Thus, the URLS of the binary caches
for the channels added by root appear in
/nix/var/nix/profiles/per-user/eelco/channels/binary-caches/*. The
binary cache substituter reads these and adds them to the list of
binary caches.
commit 79bba3782c275f03954cc9fc03f92aff487db953
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 17:21:47 2012 -0400
Doh
commit ca94b383718f2dc5f4f14ed6eddd8d04ac9d3fc2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 16:43:36 2012 -0400
nix-env: Ignore manifest.nix when recursing into ~/.nix-defexpr
Channels are implemented using a profile now, and profiles contain a
manifest.nix file. This should be ignored to prevent bogus packages
from showing up in nix-env.
commit 46f852cda013b818f113c7905f020131a44f2340
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 16:42:51 2012 -0400
Use a GNU tar flag to shut up warnings about implausibly old timestamp
commit afa7e0187815d89c8af93fa9c1081bf67ab0f10e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 16:34:17 2012 -0400
Inline unpack-channel.sh
commit 234ce610e0671410cb8a9ce4d8725e55472e8d47
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 16:09:47 2012 -0400
Doh
commit 7b10562370919947c9df748a165587ec5fc6c2ea
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 16:06:49 2012 -0400
Make ‘nix-store --optimise’ interruptible
commit 8a25d787d7f05d612521bd489510aa23d4ef2177
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 11:33:15 2012 -0400
download-from-binary-cache: Remove duplicate URLs
commit c770a2422a47526d5eb336af6af4292df68dad2b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Aug 1 11:19:24 2012 -0400
Report substituter errors to clients of the Nix daemon
commit 4d1b64f118cf6ebcbf530bea4a3c531704d7d6ba
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 31 18:56:22 2012 -0400
Allow daemon users to override ‘binary-caches’
For security reasons, daemon users can only specify caches that appear
in the ‘binary-caches’ and ‘trusted-binary-caches’ options in
nix.conf.
commit eb7849e3a281511a59abf72ae5c3133f903bbaab
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 31 18:50:32 2012 -0400
Prevent an injection attack in passing untrusted options to substituters
commit 90d9c58d4dabb370849cd523fb9ee471e8140b76
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 31 18:19:44 2012 -0400
Pass all --option flags to the daemon
commit 89a8207029e7f6d5cfe3ab972c49ea46f5b9a784
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 31 17:56:02 2012 -0400
Add an option ‘build-fallback’ (equivalent to the --fallback flag)
commit 157170059df39933d358d087d88f8b5bc4d5fde6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 22:29:42 2012 -0400
Manual: Remove reference to non-existent -I option
commit 97421eb5ecde86b75441094fda017b12b5eca2a6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 19:55:41 2012 -0400
Refactor settings processing
Put all Nix configuration flags in a Settings object.
commit d50d7a287416da2086b0b24f9d998eabb24c1734
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 17:13:25 2012 -0400
Whitespace
commit 9cd63d224468af87baf74228acc162873c649493
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 17:09:36 2012 -0400
Do some validation of URLs
commit f3eb29c6530e990b18e9f04390f6fa7bfbc58078
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 17:09:13 2012 -0400
Fix the test
commit 9de6d10d112665ba1c6d807dd3950ed4c43a4404
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 16:39:31 2012 -0400
Get rid of $NIX_BINARY_CACHES
You can use ‘--option binary-caches URLs’ instead.
commit ab42bf1dab026d10b74e857a76feff475ae8a162
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 16:11:02 2012 -0400
nix-install-package: Support binary caches
The .nixpkg file format is extended to optionally include the URL of a
binary cache, which will be used in preference to the manifest URL
(which can be set to a non-existent value).
commit d059bf48e4bd4d1f50593dbe60953de8b2d395c7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 16:09:54 2012 -0400
Pass configuration settings to the substituters
Previously substituters could read nix.conf themselves, but this
didn't take --option flags into account.
commit f9613da18033d0a9835bc57ac2142aca754983cf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 15:43:37 2012 -0400
Remove unused variables
commit 6183cf2f197edd079a0134ccb8d320bab083a624
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 30 15:42:18 2012 -0400
Fix whitespace
commit f15083c10afaebb8f2a0e7fbc95dd4cc5208c992
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Jul 29 14:37:40 2012 -0400
Document the --option flag
Pointed out by Daniel Santa Cruz on IRC.
commit 66a3ac6a56cfa70e2ffeb911c1286ba84c2fa048
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 18:16:05 2012 -0400
Allow a binary cache to declare that it doesn't support "nix-env -qas"
Querying all substitutable paths via "nix-env -qas" is potentially
hard on a server, since it involves sending thousands of HEAD
requests. So a binary cache must now have a meta-info file named
"nix-cache-info" that specifies whether the server wants this. It
also specifies the store prefix so that we don't send useless queries
to a binary cache for a different store prefix.
commit 6ecf4f13f6a71701f77018a852db2bd4bde0bb67
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 14:33:01 2012 -0400
Use "set -x" in the tests to see where a test fails
commit e6ab52cdd1df207c7a007a9cba665ee8a031d94a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 14:15:03 2012 -0400
Test "nix-env -qas" with the binary cache substituter
commit 73acb8b836affe5dfade9dd6e3339ad2f9191add
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 12:16:02 2012 -0400
Let build.cc verify the expected hash of a substituter's output
Since SubstitutionGoal::finished() in build.cc computes the hash
anyway, we can prevent the inefficiency of computing the hash twice by
letting the substituter tell Nix about the expected hash, which can
then verify it.
commit fbf59d95f66012349fdcd2b60f34b9efb32e6319
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 10:56:33 2012 -0400
Remove more tabs
commit 3a8f841612f08b9be11cc5346fa3c025413282d6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 10:47:36 2012 -0400
download-using-manifests: Don't use nix-prefetch-url
Instead call curl directly and pipe it into ‘nix-store --restore’.
This saves I/O and prevents creating garbage in the Nix store.
commit b4ea83249b40dd910daa6a8ee32f13e023e9c858
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 09:59:18 2012 -0400
Remove trailing whitespace / tabs
commit 7f8e805c8ef2d7728648553de6b762964730a09a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 27 09:57:42 2012 -0400
download-from-binary-cache: Only use the default cache for /nix/store
commit 67c6f3eded7dcb7c79243ed41f177c960f2b6aad
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 18:28:12 2012 -0400
nix-push: Support generating a manifest again
This makes all the tests succeed. Woohoo!
commit 50395b71a90314abfcc39d8343dbaa8e9aa199a6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 17:36:07 2012 -0400
Fix the substituter tests
commit e3ce54cceedb9a3144c4eccfbafd63ed765d8913
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 17:13:38 2012 -0400
nix-push: Remove the upload feature
commit 609586a16de90f8964b9c494aad3c1526feb514f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 17:13:14 2012 -0400
Add a test for the binary cache substituter
commit 7861260a5ff33689b1b8f7a89489f5d5e5e4dfcb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 17:12:42 2012 -0400
Clear NIX_STORE when running the tests
commit 7892ad15ab4b6db0eee619a1fdd14fed129db252
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 17:11:11 2012 -0400
download-from-binary-cache: Support file://
The file:// URI schema requires checking for errors in a more general
way. Also, don't cache file:// lookups.
commit dbce685e91c513341dedf8c1a916ef4c62f5650a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 17:10:28 2012 -0400
Add some .gitignore entries
commit 8c7910083976e255300efa797030448f5a1cb864
Merge: aa115e2 3a4623a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 15:14:33 2012 -0400
Merge branch 'master' into no-manifests
commit 3a4623afbbc1bff85bde33167d36e8c5a4a3df0d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 26 15:04:40 2012 -0400
Set permissions on temporary build directories to 0700
Fixes #39.
commit 2605f4f4e6a367df67bf8b33b252c350313699c9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 25 17:06:09 2012 -0400
nix-profile.sh: Don't set NIX_REMOTE on single user installations
Commit 6a214f3e06fa1c5f0a4d40e555f14d87691af297 reused the NixOS
environment initialisation for nix-profile.sh, but this is
inappropriate on systems that don't have multi-user support enabled.
commit 477b0fbeca62bf1957bc0aad26f1a844ebd22231
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 25 16:56:56 2012 -0400
Subscribe to the Nixpkgs rather than NixOS channel
commit f5954e2d940c3a41a6ed0cad45660e254eb381a3
Author: Shea Levy <shea@shealevy.com>
Date: Tue Jul 24 12:05:27 2012 -0400
prim_import: When importing .drvs, allocate the intermediate attrset on the heap just in case it escapes the stack frame.
commit 1ef2d5765be35c3d3c13a2aea8748166f576ec8b
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jul 23 13:45:51 2012 -0400
Turn tests back on
commit b1112bbef195bc8397c4e88aa8544537a6d84731
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jul 23 13:41:28 2012 -0400
import: If the path is a valid .drv file, parse it and generate a derivation attrset.
The generated attrset has drvPath and outPath with the right string context, type 'derivation', outputName with
the right name, all with a list of outputs, and an attribute for each output.
I see three uses for this (though certainly there may be more):
* Using derivations generated by something besides nix-instantiate (e.g. guix)
* Allowing packages provided by channels to be used in nix expressions. If a channel installed a valid deriver
for each package it provides into the store, then those could be imported and used as dependencies or installed
in environment.systemPackages, for example.
* Enable hydra to be consistent in how it treats inputs that are outputs of another build. Right now, if an
input is passed as an argument to the job, it is passed as a derivation, but if it is accessed via NIX_PATH
(i.e. through the <> syntax), then it is a path that can be imported. This is problematic because the build
being depended upon may have been built with non-obvious arguments passed to its jobset file. With this
feature, hydra can just set the name of that input to the path to its drv file in NIX_PATH
commit 566a30c0072690900d4d55679a2981758d6fb888
Author: Shea Levy <shea@shealevy.com>
Date: Mon Jul 23 12:51:04 2012 -0400
Disable tests temporarily
commit e98c029717016dfa3e5c618c9fc46da9b2142dcc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 18:42:18 2012 -0400
Handle platforms that don't support linking to a symlink
E.g. Darwin doesn't allow this.
commit fd63c8bfcd75624e7fbba8899365095400534e01
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 18:06:37 2012 -0400
Unlink the right file
commit 0f65793f94bd89c973482ac949be1e96e876762b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 17:40:23 2012 -0400
Add a test for Nix store optimisation
commit 680ab6f83def2b636200204542ca352631a46f85
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 15:48:30 2012 -0400
Garbage collect unused links in /nix/store/.links
Incremental optimisation requires creating links in /nix/store/.links
to all files in the store. However, this means that if we delete a
store path, no files are actually deleted because links in
/nix/store/.links still exists. So we need to check /nix/store/.links
for files with a link count of 1 and delete them.
commit 619310571002fc74e428824bd603604d1055b61b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 15:02:52 2012 -0400
Automatically optimise the Nix store when a new path is added
Auto-optimisation is enabled by default. It can be turned off by
setting auto-optimise-store to false in nix.conf.
commit 564fb7d9fa80d06397a88d69f26439727cb922c5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 12:08:34 2012 -0400
optimiseStore(): Use a content-addressed file store in /nix/store/.links
optimiseStore() now creates persistent, content-addressed hard links
in /nix/store/.links. For instance, if it encounters a file P with
hash H, it will create a hard link
P' = /nix/store/.link/<H>
to P if P' doesn't already exist; if P' exist, then P is replaced by a
hard link to P'. This is better than the previous in-memory map,
because it had the tendency to unnecessarily replace hard links with a
hard link to whatever happened to be the first file with a given hash
it encountered. It also allows on-the-fly, incremental optimisation.
commit ed59bf7a181bb382dea7dd72da52bf91f60deb8d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 17:11:12 2012 -0400
nix-build: Support the ‘-’ argument to build an expression from stdin
commit 6852289c46cdfceb07b459cd1028722ffb124ca6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 23 16:52:25 2012 -0400
Use lutimes() if available to canonicalise the timestamp of symlinks
Also use utimes() instead of utime() if lutimes() is not available.
commit 1832ab71dbb6b24965eb5a873a56a7231da7af4e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 18 17:17:23 2012 -0400
Bump version
commit 98193bb440561875d2829f9dd542e38972dbcf63
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 18 16:50:56 2012 -0400
Remove RPM builds that don't evaluate
commit b7fd2c28224a69476434d69b5d9da3d150c07226
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 18 14:59:03 2012 -0400
Use "#pragma once" to prevent repeated header file inclusion
commit 58337e0e6122a97061dcf803954f72469f67afca
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 18 11:51:27 2012 -0400
Set release date
commit aa115e22df1c80e8878237a9e704d7d70783a243
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 18 11:01:17 2012 -0400
download-from-binary-cache: Print correct URL
commit fe241ece2932492866693d268d02a7912e766ac7
Merge: a6f3485 ccc52ad
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 18 10:47:59 2012 -0400
Merge branch 'master' into no-manifests
commit ccc52adfb2121ade510d35dc9b91193af9fa731e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 18:55:39 2012 -0400
Add function queryPathFromHashPart()
To implement binary caches efficiently, Hydra needs to be able to map
the hash part of a store path (e.g. "gbg...zr7") to the full store
path (e.g. "/nix/store/gbg...kzr7-subversion-1.7.5"). (The binary
cache mechanism uses hash parts as a key for looking up store paths to
ensure privacy.) However, doing a search in the Nix store for
/nix/store/<hash>* is expensive since it requires reading the entire
directory. queryPathFromHashPart() prevents this by doing a cheap
database lookup.
commit 220818f758d2facc194f567f35ca677ef79393bd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 16:55:45 2012 -0400
queryPathInfo(): return hash in base-32 if desired
Cherry-picked from the no-manifests branch.
commit a6f348599c94d8a5f7b41c7d8e43658dc6407be7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 16:19:40 2012 -0400
Print some debug output
commit 3a9fdf2747bc7436fc3c1fd5f9accd5675d4295e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 15:55:30 2012 -0400
Return an exit code of 100 for cached failed builds
Exit code 100 should be returned for all permanent failures. This
includes cached failures.
Fixes #34.
commit 1217204c81b0b6f02df99adfc8414a181299535c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 14:07:52 2012 -0400
Remove dead code
commit 51d71ad3d7527596dc22d6dd9e9e70f2cd9faea9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 11:49:47 2012 -0400
Manual: Don't claim we support Cygwin
commit 6c01fb4d68a80f63c692492bb91c1aa2e17b5a8f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 10:06:20 2012 -0400
Update Nix 1.1 release notes
commit 53b24f351852498c52377c2f011617af04bc76fa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 17 09:40:12 2012 -0400
Allow disabling log compression
commit a7a43adb79393084a27589bc929e5a22877ba944
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jul 12 18:25:01 2012 -0400
builtins.storePath: resolve symlinks
Needed for Charon/Hydra interaction.
commit 04559a0d45ad02fc760b09132cca0d875af035e5
Merge: e4d6bcb eae8024
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 18:53:27 2012 -0400
Merge branch 'master' of github.com:NixOS/nix into no-manifests
commit e4d6bcb6cdc34d204ccf49e137dd5070f664c523
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 18:52:23 2012 -0400
Update release notes
commit f2bdc87595376efb2d05a8555b0686922a298929
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 18:52:09 2012 -0400
Update the other substituters
commit 15c15da482eb30f95f4dab04b582a45edc10815b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 18:07:41 2012 -0400
Add some missing --version switches
commit d287b62b6432ce3155e963c6471edf79ec70439a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 18:05:30 2012 -0400
Set the User-Agent header to "Nix/<version>"
commit b74d92755d1ca6a1538f292dcb5a906f66af7b51
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 17:53:20 2012 -0400
download-from-binary-cache: Use HEAD requests if possible
In "nix-env -qas", we don't need the substitute info, we just need to
know if it exists. This can be done using a HTTP HEAD request, which
saves bandwidth.
Note however that curl currently has a bug that prevents it from
reusing HTTP connections if HEAD requests return a 404:
https://sourceforge.net/tracker/?func=detail&aid=3542731&group_id=976&atid=100976
Without the patch attached to the issue, using HEAD is actually quite
a bit slower than GET.
commit 09a6321aeb7393cdb4b5af62d2e4106d83124fdf
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 17:52:18 2012 -0400
Replace hasSubstitutes() with querySubstitutablePaths()
querySubstitutablePaths() takes a set of paths, so this greatly
reduces daemon <-> client latency.
commit 58ef4d9a95584fb89ebcf6222fbac6e698aa6b0b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 11:08:47 2012 -0400
Add a function queryValidPaths()
queryValidPaths() combines multiple calls to isValidPath() in one.
This matters when using the Nix daemon because it reduces latency.
For instance, on "nix-env -qas \*" it reduces execution time from 5.7s
to 4.7s (which is indistinguishable from the non-daemon case).
commit 667d5f1936616dc829f9f92f8e5d5141ba5285a7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 10:49:04 2012 -0400
Rename queryValidPaths() to queryAllValidPaths()
commit eb3036da87659fe7cf384c2362e7f7b8b67189a1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 10:43:24 2012 -0400
Implement querySubstitutablePathInfos() in the daemon
Also removed querySubstitutablePathInfo().
commit 6586414bc70c8373faefd49afc5172881f3aad53
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 10:14:06 2012 -0400
nix-env: Determine which paths have substitutes in parallel
commit 5ee8944155f21a0ab5a100a184163d7bd0e72679
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jul 11 10:13:16 2012 -0400
Cleanup
commit eae802459d7639a69baec555264f394adad043c0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 15:49:20 2012 -0400
Pass --insecure to curl so that https works
commit 2dd3117c2723ff08c6226b71d569bcea50d58ad1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 15:48:55 2012 -0400
Inline fetchurl.sh
commit 51f9f9924bcd0c30b45e370fc69dc43e6621ef61
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 15:41:43 2012 -0400
Add a test for the fetchurl function
commit 035aa114037857b51968e62a1176f4086e2477ec
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 11:14:57 2012 -0400
Remove obsolete comment
commit a2865f6b3d2af5593a100cba5c86ba62a1330bdb
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 11:11:02 2012 -0400
corepkgs/fetchurl: Build locally and outside of the chroot
commit 53f52c2111bcf339bdaab703a263fd2c001da51c
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 11:04:11 2012 -0400
corepkgs/fetchurl: the 'system' argument can be optional
commit 543bf742c9391bc49f59c52adb042bbd3c5e2364
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:55:35 2012 -0400
corepkgs: distribute fetchurl files
commit f863673a903d17566be8a03bcf8655d9912428bd
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:33:40 2012 -0400
corepkgs/fetchurl: Call the shell directly instead of using the shebang
commit a994eb92a4e0d8744b244cd421c855d76831bdc0
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:32:12 2012 -0400
corepkgs/fetchurl.sh: Use config.nix's curl
commit 9d94a28bed39d0e9bcb3532cdac1a254a44efa97
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:29:18 2012 -0400
The fetchurl builder is now fetchurl.sh
commit fd2630e1f739c12b4a1f01159e1230d9fb7fb997
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:26:50 2012 -0400
Remove old fetchurl makefile
commit 6450f5699fa824934b92ca7ba1d345c36e9c009a
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:25:58 2012 -0400
Move fetchurl files out of their subdirectory
commit 40c01ec4671c09a6ceb61ef201dad48156000075
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:22:26 2012 -0400
corepkgs/config.nix.in: We'll need curl
commit c4df7472676cac9bf5243ee8bc7cd0017f91a28d
Author: Shea Levy <shea@shealevy.com>
Date: Sun Jul 8 10:19:17 2012 -0400
Resurrect old corepkgs fetchurl
commit 27f0c34390d6680a843e2d4fad527dc672ed35c6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 13:16:09 2012 -0400
Really fix RPM builds
commit ae72be1b8bf65e6b52bc0c9d534e55a79ca6712b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 13:11:37 2012 -0400
Add WWW::Curl as a dependency
commit a560124cdf43a08733d85336f7c8172fea1cfc5a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 11:58:12 2012 -0400
Fix RPM builds
http://hydra.nixos.org/build/2784908
commit 087dee6e1b673b1e49f7c49fa0f05eb651bb5e94
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 11:56:55 2012 -0400
Get rid of nix.conf.example
No need to duplicate the nix.conf manpage.
commit 5755a5c354c8b622fae14a32b9f8f6f901fb9529
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 11:33:38 2012 -0400
Install a nix.conf manpage
commit 099125435fc5ada63365a94ca153c711e706e225
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 10:57:28 2012 -0400
download-from-binary-cache: add nix.conf options
commit 98a423b75aa9061f0164c316f9d2481ce6d5e2f1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 9 09:59:34 2012 -0400
prim_import(): prefetch substitute info in parallel using queryMissing()
commit 425cc612ad4835d29bce081a67ad161d06063b51
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Jul 8 18:39:24 2012 -0400
build.cc: Don't use hasSubstitute()
Instead make a single call to querySubstitutablePathInfo() per
derivation output. This is faster and prevents having to implement
the "have" function in the binary cache substituter.
commit 400e556b34ff0563f34b191de5f632dc4377f0cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Jul 8 18:39:07 2012 -0400
Cleanup
commit 11800e61983677f92fd5a08f51beb9036f947d6e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 6 19:08:20 2012 -0400
download-from-binary-cache: parallelise fetching of NAR info files
Getting substitute information using the binary cache substituter has
non-trivial latency overhead. A package or NixOS system configuration
can have hundreds of dependencies, and in the worst case (when the
local info cache is empty) we have to do a separate HTTP request for
each of these. If the ping time to the server is t, getting N info
files will take tN seconds; e.g., with a ping time of 0.1s to
nixos.org, sequentially downloading 1000 info files (a typical NixOS
config) will take at least 100 seconds.
To fix this problem, the binary cache substituter can now perform
requests in parallel. This required changing the substituter
interface to support a function querySubstitutablePathInfos() that
queries multiple paths at the same time, and rewriting queryMissing()
to take advantage of parallelism. (Due to local caching,
parallelising queryMissing() is sufficient for most use cases, since
it's almost always called before building a derivation and thus fills
the local info cache.)
For example, parallelism speeds up querying all 1056 paths in a
particular NixOS system configuration from 116s to 2.6s. It works so
well because the eccentricity of the top-level derivation in the
dependency graph is only 9. So we only need 10 round-trips (when
using an unlimited number of parallel connections) to get everything.
Currently we do a maximum of 150 parallel connections to the server.
Thus it's important that the binary cache server (e.g. nixos.org) has
a high connection limit. Alternatively we could use HTTP pipelining,
but WWW::Curl doesn't support it and libcurl has a hard-coded limit of
5 requests per pipeline.
commit cd94665f38fbadde38d5d8ae5c9c14dff9aea0ac
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jul 6 00:30:40 2012 -0400
download-from-binary-cache: use WWW::Curl
Using WWW::Curl rather than running an external curl process for every
NAR info file halves the time it takes to get info thanks to libcurl's
support for persistent HTTP connections. (We save a roundtrip per
file.) But the real gain will come from using parallel and/or
pipelined requests.
commit ae60643c15a2eab2cf53230aa7c5fbc8af3430d1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 3 18:54:46 2012 -0400
download-from-binary-cache: do negative NAR info caching
I.e. if a NAR info file does *not* exist, we record it in the cache DB
so that we don't retry it later.
commit 89380c03e99dc5ae8a4dcf9edb4f14483bd2f5fc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 3 18:35:39 2012 -0400
download-from-binary-cache: in queries, preferred cached info
commit 2a8e5c8b11d23f3d56cc7548e21f47325a736b79
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 3 17:47:01 2012 -0400
download-from-binary-cache: strip trailing / from URLs
commit d694c599e2b9eee71ade8cc4befb46ed911f4a10
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Jul 3 17:29:33 2012 -0400
download-from-binary-cache: cache binary cache info in a SQLite DB
commit 8319b1ab9f1e79ad32871dae602a59df5874d1a9
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 2 18:53:04 2012 -0400
download-from-binary-cache: Verify NAR hashes
commit cf49472d601a3d9d34ba92def1eca9a2d2c7c391
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 2 18:05:57 2012 -0400
nix-push: Always generate base-32 hashes
commit 6ec7460af1103a23e4d331e0c8a56283350175c5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jul 2 12:42:58 2012 -0400
Binary caches: use a better key
Use the hash part of the store path as a key rather than a hash of the
store path. This is enough to get the desired privacy property.
commit 6b1e671ac6cc0376474dd8c1403582ae1db01576
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Jul 1 21:57:25 2012 -0400
Fix xz compression
commit 440adfbdd1c99fdf7929db66b64ccf4dcd9097e3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Jul 1 21:55:36 2012 -0400
Add an environment variable $NIX_BINARY_CACHES specifying URLs of binary caches
commit f4190c38bac1efdbfec9b1ff9c524808d23fe1cc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Jul 1 18:46:38 2012 -0400
Allow both bzip2 and xz compression
commit 000132cbd1624a681a8114a117de07a56a7eed4e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 29 18:30:28 2012 -0400
nix-push: Don't pollute the current directory with result symlink
commit 37f70984645b4fc5e6ed9f30a858ba6fbf402441
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 29 18:28:52 2012 -0400
First attempt at the manifest-less substituter
commit 91b8814f0d275bbb6c7de9546e5e8cb784dad10b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 29 17:16:00 2012 -0400
Doh
commit 4911a10a4e51102a21a5d123a852c75d2ec92dbc
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Jun 29 14:26:31 2012 -0400
Use XZ compression in binary caches
XZ compresses significantly better than bzip2. Here are the
compression ratios and execution times (using 4 cores in parallel) on
my /var/run/current-system (3.1 GiB):
bzip2: total compressed size 849.56 MiB, 30.8% [2m08]
xz -6: total compressed size 641.84 MiB, 23.4% [6m53]
xz -7: total compressed size 621.82 MiB, 22.6% [7m19]
xz -8: total compressed size 599.33 MiB, 21.8% [7m18]
xz -9: total compressed size 588.18 MiB, 21.4% [7m40]
Note that compression takes much longer. More importantly, however,
decompression is much faster:
bzip2: 1m47.274s
xz -6: 0m55.446s
xz -7: 0m54.119s
xz -8: 0m52.388s
xz -9: 0m51.842s
The only downside to using -9 is that decompression takes a fair
amount (~65 MB) of memory.
commit 49cd7387ad6546571ca31a41f208091b482defaa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Jun 28 17:19:32 2012 -0400
nix-push: create a manifest-less binary cache
Manifests are a huge pain, since users need to run nix-pull directly
or indirectly to obtain them. They tend to be large and lag behind
the available binaries; also, the downloaded manifests in
/nix/var/nix/manifest need to be in sync with the Nixpkgs sources. So
we want to get rid of them.
The idea of manifest-free operation works as follows. Nix is
configured with a set of URIs of binary caches, e.g.
http://nixos.org/binary-cache
Whenever Nix needs a store path X, it checks each binary cache for the
existence of a file <CACHE-URI>/<SHA-256 hash of X>.narinfo, e.g.
http://nixos.org/binary-cache/bi1gh9...ia17.narinfo
The .narinfo file contains the necessary information about the store
path that was formerly kept in the manifest, i.e., (relative) URI of
the compressed NAR, references, size, hash, etc. For example:
StorePath: /nix/store/xqp4l88cr9bxv01jinkz861mnc9p7qfi-neon-0.29.6
URL: 1bjxbg52l32wj8ww47sw9f4qz0r8n5vs71l93lcbgk2506v3cpfd.nar.bz2
CompressedHash: sha256:1bjxbg52l32wj8ww47sw9f4qz0r8n5vs71l93lcbgk2506v3cpfd
CompressedSize: 202542
NarHash: sha256:1af26536781e6134ab84201b33408759fc59b36cc5530f57c0663f67b588e15f
NarSize: 700440
References: 043zrsanirjh8nbc5vqpjn93hhrf107f-bash-4.2-p24 cj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13 ...
Deriver: 4idz1bgi58h3pazxr3akrw4fsr6zrf3r-neon-0.29.6.drv
System: x86_64-linux
Nix then knows that it needs to download
http://nixos.org/binary-cache/1bjxbg52l32wj8ww47sw9f4qz0r8n5vs71l93lcbgk2506v3cpfd.nar.bz2
to substitute the store path.
Note that the store directory is omitted from the References and
Deriver fields to save space, and that the URL can be relative to the
binary cache prefix.
This patch just makes nix-push create binary caches in this format.
The next step is to make a substituter that supports them.
commit 1aba0bf0fa831ffee628ae50730eade5b19a544f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jun 27 16:58:15 2012 -0400
nix-store -r: do substitutions in parallel
I.e. when multiple non-derivation arguments are passed to ‘nix-store
-r’ to be substituted, do them in parallel.
commit 42f5a2fc297f841d982f07062c653b27557a3cd5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jun 27 09:52:27 2012 -0400
Mount an empty /dev/shm tmpfs in the chroot
This ensures that whatever the builder writes in /dev/shm is
automatically cleaned up.
commit 3ee208516fbdd302b178d68a20dd44517a276a96
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Jun 27 09:52:06 2012 -0400
Check the return code of the clone() call
commit 1db38ae81bd91d781ece9c0cfb995e743e68e951
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 25 15:45:16 2012 -0400
When using chroots, use a private PID namespace
In a private PID namespace, processes have PIDs that are separate from
the rest of the system. The initial child gets PID 1. Processes in
the chroot cannot see processes outside of the chroot. This improves
isolation between builds. However, processes on the outside can see
processes in the chroot and send signals to them (if they have
appropriate rights).
Since the builder gets PID 1, it serves as the reaper for zombies in
the chroot. This might turn out to be a problem. In that case we'll
need to have a small PID 1 process that sits in a loop calling wait().
commit 5489086456ca13b2e884edecf7505235d214a594
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 25 14:12:17 2012 -0400
Use a private UTS namespace to provide a deterministic host/domain name to builders
In chroot builds, set the host name to "localhost" and the domain name
to "(none)" (the latter being the kernel's default). This improves
determinism a bit further.
P.S. I have to idea what UTS stands for.
commit 8da6772ed48e2ee7082071b31c7afeb800195cdb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jun 23 14:59:13 2012 -0400
Update release notes
commit 723a68c8262ec337e290e51265820ae90fe3ad18
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jun 23 00:57:14 2012 -0400
Improve error message
commit 7ffa523fd15fcd9ab1a0ad85db860f467869946a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jun 23 00:51:40 2012 -0400
In chroot builds, use a private SysV IPC namespace
This improves isolation a bit further, and it's just one extra flag in
the unshare() call.
P.S. It would be very cool to use CLONE_NEWPID (to put the builder in
a private PID namespace) as well, but that's slightly more risky since
having a builder start as PID 1 may cause problems.
commit df716c98d203ab64cdf05f9c17fdae565b7daa1c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Jun 23 00:28:35 2012 -0400
In chroot builds, use a private network namespace
On Linux it's possible to run a process in its own network namespace,
meaning that it gets its own set of network interfaces, disjunct from
the rest of the system. We use this to completely remove network
access to chroot builds, except that they get a private loopback
interface. This means that:
- Builders cannot connect to the outside network or to other processes
on the same machine, except processes within the same build.
- Vice versa, other processes cannot connect to processes in a chroot
build, and open ports/connections do not show up in "netstat".
- If two concurrent builders try to listen on the same port (e.g. as
part of a test), they no longer conflict with each other.
This was inspired by the "PrivateNetwork" flag in systemd.
commit 2f3f413e91620d2314be59870f4bd67292f7d2de
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Jun 18 23:01:46 2012 -0400
Support socket-based, on-demand activation of the Nix daemon with systemd
Systemd can start the Nix daemon on demand when the Nix daemon socket
is first accessed. This is signalled through the LISTEN_FDS
environment variable, so all we need to do is check for that and then
use file descriptor 3 as the listen socket instead of creating one
ourselves.
commit 02fb6323e06502e410dd5d5f8fe10589a7c938d4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 31 09:50:58 2012 -0400
Add Emacs to the disk image
commit 221626e7155c184d34c1e43ade92462b45c3992f
Author: Michel Alexandre Salim <michel@sylvestre.me>
Date: Wed May 30 08:31:59 2012 +0700
fixes to nix-worker systemd service descriptor: - remove commented-out lines - register the file for distribution in Makefile.am
commit a7ed1f67ee5dbbdbe45e15e6461b5f7c886747d8
Author: Michel Alexandre Salim <michel@sylvestre.me>
Date: Sun May 27 17:34:49 2012 +0700
On systems with SystemD, install the service descriptor for nix-worker, and enable and start it
commit 892234630594ea87a1b9bc945077c82c419af6d3
Author: Michel Alexandre Salim <michel@sylvestre.me>
Date: Sun May 27 17:04:16 2012 +0700
Major spec update: - Fix license field - Split into subpackages - Update build dependencies - Configure users and groups for multi-user mode - Fix installation location of Perl modules
commit 6a214f3e06fa1c5f0a4d40e555f14d87691af297
Author: Michel Alexandre Salim <michel@sylvestre.me>
Date: Sun May 27 16:34:57 2012 +0700
Update nix profile: - incorporate NixOS's configuration so that nix is usable by normal users - install as a data file, not a program file
commit d0308073c35799cce98bc853eba64f3922fadcfd
Author: Michel Alexandre Salim <michel@sylvestre.me>
Date: Thu May 17 12:04:56 2012 +0800
- only enable deprecated spec sections when building on systems with older RPM versions - move tests to dedicated %check section - use standard build macros
commit e545a7f9a881d9857360713d0d3b0edc54781875
Author: Michel Alexandre Salim <michel@sylvestre.me>
Date: Thu May 17 11:56:29 2012 +0800
- replace %define with %global
commit f5398d374beac34983bb639891ba3f1f50528c72
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 30 10:12:29 2012 -0400
Compress build logs on the fly using bzip2
commit 881beb170d324f392a53168e6a76e2c5cfd24789
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 30 00:00:02 2012 -0400
"nix-store -l": support compressed logs
commit 4bc4da331aae13be8a39e768524a854597addd8a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 29 22:59:12 2012 -0400
Reserve some disk space for the garbage collector
We can't open a SQLite database if the disk is full. Since this
prevents the garbage collector from running when it's most needed, we
reserve some dummy space that we can free just before doing a garbage
collection. This actually revives some old code from the Berkeley DB
days.
Fixes #27.
commit 2c26985835cf82ed5d2979c3a400f72f6aeba32f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 29 16:42:05 2012 -0400
Add option ‘build-keep-log’ to enable/disable writing of build logs
Fixes #26.
commit 8058dab26e90db54708d4c698db843dd703ecbb2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 24 12:04:07 2012 -0400
Clean up the installation section; document the generic binary tarballs
commit 0301525e6cc7443b5cba2ccf4ef3f18b2b4beedb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 22 19:40:40 2012 -0400
Fix owner/group in tar invocation
commit 6814b1dfa1efee2b801f13ec428c72b7245880ee
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 22 18:36:54 2012 -0400
Generate binary tarballs for installing Nix
For several platforms we don't currently have "native" Nix packages
(e.g. Mac OS X and FreeBSD). This provides the next best thing: a
tarball containing the closure of Nix, plus a simple script
"nix-finish-install" that initialises the Nix database, registers the
paths in the closure as valid, and runs "nix-env -i /path/to/nix" to
initialise the user profile.
The tarball must be unpacked in the root directory. It creates
/nix/store/... and /usr/bin/nix-finish-install. Typical installation
is as follows:
$ cd /
$ tar xvf /path/to/nix-1.1pre1234_abcdef-x86_64-linux.tar.bz2
$ nix-finish-install
(if necessary add ~/.nix-profile/etc/profile.d/nix.sh to the shell
login scripts)
After this, /usr/bin/nix-finish-install can be deleted, if desired.
The downside to the binary tarball is that it's pretty big (~55 MiB
for x86_64-linux).
commit 591aab7e2166f1c7208cccdda7ce50c3c362f12b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 22 14:00:08 2012 -0400
Remove $FONTCONFIG_FILE hack from nix-profile.sh
It's no longer needed because Nixpkgs' fontconfig uses
/etc/fonts/fonts.conf as a default, just like other distributions.
commit e071f87dc5476983c557cf6185fbdeab0c4c67c5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 21 09:37:49 2012 -0400
Add an experimental nix-make file
To use it, just do (e.g.) "nix-build build.nix -A nix_env".
commit cac9eb39fe36ab28519f0b59d880fbcdc705ba95
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat May 12 00:07:08 2012 -0400
Bump version number
commit dfc6a43b72e9f38dc58866c5a9e5900d0d0b66b4
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 11 23:30:47 2012 -0400
Fix the install check
commit 587b408210ee3707df78c78cca9d6082e44e0233
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 11 17:40:58 2012 -0400
Set release date
commit 8a08813d6c92e583d9ed6ccaffc80effe0dc9669
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 11 17:39:06 2012 -0400
Manual updates
commit 2b00e6990c7b6f7177bce76126c6c992f3f7a93e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 11 16:21:21 2012 -0400
CSS tweaks
commit 58d1de08d9ec4ce1bfbfb65b0b74700f066af7d0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 11 09:41:39 2012 -0400
Use perl.libPrefix to (hopefully) fix the Cygwin build
http://hydra.nixos.org/build/2602599
commit 37fa47908bff2495755410c96891623d60735464
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 10 22:12:20 2012 -0400
Build Ubuntu 12.04 packages
commit 4d383f57f42af2c9316fa82ea61cb8a109c3f680
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 10 19:29:36 2012 -0400
Document "nix-build --run-env"
commit 4f7bab7db1d0447e41f858633cddba1dcb2c9ea2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 10 19:03:23 2012 -0400
Support building with the Perl XS bindings disabled
Since the Perl bindings require shared libraries, this is required on
platforms such as Cygwin where we do a static build.
commit 6a7b24a3f25548fe2b083555cd2117dd66557ab0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 10 18:09:45 2012 -0400
Document "nix-store --add"
commit cda1fd8ec86553f2a76366ec56c3fa21788fc189
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu May 10 16:56:36 2012 -0400
Remove an obsolete hack
commit 663c06e8cd7d44443b0495b13f2bb08e2cfab889
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 9 22:14:36 2012 -0400
Disable building in chroot for Nix's corepkgs
The dependencies of the corepkgs are not necessarily in the chroot (or
in the Nix store), so don't build them in a chroot.
commit cb1248d2082ff8292e2516f124feea4427cf150a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 9 19:06:39 2012 -0400
Document some nix-store subcommands
commit 7a213ffc6912794d2cc4374bb9bf2c1f59a384a3
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 9 19:06:13 2012 -0400
Document $NIX_PATH / -I
commit a58efdb69b0c018322bb773ce14dc33cb252b165
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed May 9 19:05:30 2012 -0400
Update the release notes
commit 0c4c8f7a9d09c497d95771c894a5cc3d4276609b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 8 15:43:54 2012 -0400
Remove obsolete files (moved to release tree)
commit afa7b8a479e48c5642a796563a615314c0261a1a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 7 17:55:56 2012 -0400
nix-channel --update: allow updating only the specified channels
commit 147f10157fef48dcf3e32511e10f5ee00026b757
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon May 7 17:23:26 2012 -0400
Now *really* prevent accumulation of old manifests
commit 464089365e2c72c83e5a8edb5611e537c4898501
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 4 21:40:56 2012 -0400
Fix some 32-bit builds
Perl on some 32-bit systems needs -D_FILE_OFFSET_BITS=64. See also commit
02f1363e19b7df7cccc3523805bbf4fafe429529.
commit c6acb219f9312ee3c8e1ac83d2b490401f8b9a9d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 4 18:50:34 2012 -0400
Drop the Perl-specific CFLAGS
This fixes the Darwin build (http://hydra.nixos.org/build/2517380).
Hopefully it doesn't break other builds.
commit 56c82f3d9dec34eeaa124c61b20af4ae67f827a2
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 4 17:45:21 2012 -0400
Don't build for old Debian/Ubuntu releases that don't have a sufficiently new SQLite
commit 373e875ac2e403f1f790fbd9d2323e581a8aae21
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 4 17:25:25 2012 -0400
Don't build for old Fedora releases that don't have a sufficiently new SQLite
commit d03a295192f8d7b7ced98d5bbab91a8aa9b0ca4d
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri May 4 17:21:43 2012 -0400
Require SQLite >= 3.6.19
Nix needs SQLite's foreign key constraint feature, which was
introduced in 3.6.19. Without it, the database won't be cleaned up
correctly when paths are deleted. See
e.g. http://hydra.nixos.org/build/2494142.
commit e060c99447a445bbf1c527b8c712e3bf809ee694
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 1 16:35:18 2012 -0400
Use mkpath instead of make_path
Perl <= 5.10 doesn't have make_path. See
e.g. http://hydra.nixos.org/build/2493981.
commit e19fb7ebedabf5109379b80c5e42e89fa4437276
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 1 16:31:56 2012 -0400
Do "make installcheck" for RPM builds
commit e145ac30e32c3f2d4491c195daccdc15c722a005
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue May 1 15:48:17 2012 -0400
Do "make installcheck" for Debian builds
commit db5b86ef13026d7f034527005ab231ddc2b7d2c1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 30 19:15:34 2012 -0400
* Add an option ‘build-use-substitutes’, which can be set to ‘false’
to disable use of substitutes; i.e., force building from source.
Fixes Nix/221.
commit 59a26360c75f1cf5fe65fce5e3703df0b6645140
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 30 17:22:45 2012 -0400
Support mandatory system features in the build hook
Mandatory features are features that MUST be present in a derivation's
requiredSystemFeatures attribute. One application is performance
testing, where we have a dedicated machine to run performance tests
(and nothing else). Then we would add the label "perf" to the
machine's mandatory features and to the performance testing
derivations.
commit 82ae0e688c21794bea583f9b48bb3639f7e2601a
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 30 16:49:00 2012 -0400
Update the documentation of build-remote.pl
commit 46cdc6ad51376e2f31ce806ee38e697d00a6e5cb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 30 10:58:04 2012 -0400
Handle EPERM when creating a hard link for the chroot
There is a race condition when doing parallel builds with chroots and
the immutable bit enabled. One process may call makeImmutable()
before the other has called link(), in which case link() will fail
with EPERM. We could retry or wrap the operation in a lock, but since
this condition is rare and I'm lazy, we just use the existing copy
fallback.
Fixes #9.
commit c722193a91cb32f2696d655cf6301cf5ccfae6ce
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 26 16:52:08 2012 +0200
Don't use the build hook for unpacking channels
commit 6de5d534164d95b0c004cd4b2ed9bf97f9903029
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 24 12:56:30 2012 +0200
Fix a warning in the build hook about $progressViewer
commit 6387830c3b12722e5962a99aa81f225ea0830076
Merge: 259c6d3 85799bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 23 03:29:03 2012 -0700
Merge pull request #2 from viric/master
Again, adding the sync option
commit 259c6d3fbb1298488cc9d437ae81f313dba585fd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Apr 18 13:40:18 2012 +0200
Fix URL set by nix-channel
commit 9cd3ff1059e9daffe65e24dc826268f1e69e2593
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 17 17:19:43 2012 +0200
nix-instantiate: default to "default.nix" if no arguments are given
commit 8745fade0387b2900a98b95798d9f12be7ef97ca
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 17 17:14:14 2012 +0200
Added utility command ‘nix-instantiate --find-file’ to look up a file in Nix's search path
commit 8cf1719e3e02998c0d22ed9e505a4a98e3335627
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 16 19:52:31 2012 +0200
Hack to prevent accumulation of old manifests
commit 1132dd27eaf6b32937f1e0508c84d08f5ae90470
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Apr 16 18:47:01 2012 +0200
Fix obscure race condition in GC root creation
This should fix rare Hydra errors of the form:
error: symlinking `/nix/var/nix/gcroots/per-user/hydra/hydra-roots/7sfhs5fdmjxm8sqgcpd0pgcsmz1kq0l0-nixos-iso-0.1pre33785-33795' to `/nix/store/7sfhs5fdmjxm8sqgcpd0pgcsmz1kq0l0-nixos-iso-0.1pre33785-33795': File exists
commit 154aa7f71ade55fe5ce43503ade85fc2a107a331
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Apr 15 00:42:16 2012 +0200
Set a few more close-on-exec flags
commit 31e34fcf932e86c398a38b39facc268026736f0c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Apr 15 00:20:32 2012 +0200
Close almost all file descriptors in the builder
This regression was accidentally introduced in
35355fc1fcffbe859395e360c0a6a1463f137d63.
commit 0b5107c016080e70d30ccba3afa0f9aa7a90a891
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Apr 14 21:05:28 2012 +0200
If the (redirected) channel URL contains a version number, use it
commit 1d0bafb74d17f14778005a633ee332ad0ad9ba9e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Apr 14 21:04:22 2012 +0200
Follow redirects early to ensure consistency between the manifest and the tarball
Without this change, if the URL is a redirect that changes in between,
we can get a manifest that doesn't match the tarball.
commit ca3d9f8b31378093ecfbce493aab979c97d5ba78
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Apr 14 19:52:58 2012 +0200
Urgh, modified the wrong file...
commit ef902274fd4b1c13732851e6cbfa00d4d4e46821
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Apr 14 18:48:11 2012 +0200
Remove unnecessary "system" argument
commit e855c7e2c9a9a5cbe4406c1f9351181a9ebe6283
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat Apr 14 18:38:52 2012 +0200
nix-channel improvements
"nix-channel --add" now accepts a second argument: the channel name.
This allows channels to have a nicer name than (say) nixpkgs_unstable.
If no name is given, it defaults to the last component of the URL
(with "-unstable" or "-stable" removed).
Also, channels are now stored in a profile
(/nix/var/nix/profiles/per-user/$USER/channels). One advantage of
this is that it allows rollbacks (e.g. if "nix-channel --update" gives
an undesirable update).
commit 969a14599d2f7bfd02971475b5b2be49fb965117
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 13 14:41:33 2012 +0200
If "pv" is available at compile time, hard-code its path
commit 34a85c5405a228860a7bbe77239fb0204bf6952c
Author: Shea Levy <shea@shealevy.com>
Date: Thu Mar 29 18:58:14 2012 +0200
nix-copy-closure: Move the progressViewer directly adjacent to the ssh call so that network progress is what's measured
commit 055e803851e73bb94d341c3b4f25f52be167fef7
Author: Shea Levy <shea@shealevy.com>
Date: Thu Mar 29 18:20:31 2012 +0200
Add the '--show-progress' flag to nix-copy-closure
commit 00c98a6befb70228c7ba2b7d5dc8684289915baa
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 13 14:28:26 2012 +0200
Use Bison 2.5
commit 209927bb2785920eff455adb97ba513080c6e8c0
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 10 16:40:51 2012 +0200
Unconfuse Rob
commit 1fb30e6d50c29adcc3a3d73381cd90f5f5989c31
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Apr 10 13:52:37 2012 +0200
Handle the case where $SHELL is not set
commit 8f6146a7bc7c5a2e8c03b127366eff7d82552eef
Merge: 533250a 242a99c
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon Apr 9 00:24:08 2012 -0700
Merge pull request #5 from shlevy/doc-fix
Nix is on github now
commit 242a99c95ae9a0e829c5b34b51d29614ff2cb788
Author: Shea Levy <shea@shealevy.com>
Date: Sun Apr 8 23:59:02 2012 -0400
Nix is on github now
commit 533250a4a3f5767fdc647b133134b92e3c804025
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 6 22:54:15 2012 +0200
Fix building from the tarball
commit 831c7aa4108d56246595cfbcefdb1113f159715c
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 6 22:03:19 2012 +0200
Documentation fix
commit 5863987bba9bc4c90d0d71204933ac90ac7a710b
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 6 21:56:20 2012 +0200
Include environment variables in the manpages
commit 998b977ede9948f78a6a913ecedf3361eb14f769
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 6 21:45:00 2012 +0200
Include common options in the manpages using some XInclude hackery
commit d49ef039dd61dba160cb0b78c6b00152ff9e680e
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 6 21:43:56 2012 +0200
Update affiliation
commit 5a6d50998dffcf60b45fd35b858dbe37cf33d649
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri Apr 6 20:26:30 2012 +0200
Add a missing DocBook source file to the tarball
Reported on IRC by Adrian Siekierka.
commit f2467eb6a0070176a5b1cd76aa330b84431f8258
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu Apr 5 13:03:19 2012 +0200
On Linux, pretend we're building on Linux 2.6
Setting the UNAME26 personality causes "uname" to return "2.6.x",
regardless of the kernel version. This improves determinism in
a few misbehaved packages.
commit 3b859ead376cb0aa6c7b27774c2d82ed3ecb370a
Author: Hydra mirror <hydra-mirror@lucifer.(none)>
Date: Wed Apr 4 20:46:18 2012 +0000
nix-generate-patches: Optionally write new patches to $NIX_ALL_PATCHES
commit 34ea91b25919d795b6d322059de274ddcf778763
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Apr 4 16:22:32 2012 +0200
Include --keep-going in --help
commit 0837348049bbdd24378ad9376caad932712d5acd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed Apr 4 15:41:35 2012 +0200
Follow redirects when checking for the existence of MANIFEST.bz2
If we don't follow redirects, we might think that MANIFEST.bz2 exists
just because the HEAD request succeeds on the redirector URI.
commit b8fb0ce5634456ba987231fc755c32af6f4ada30
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 27 11:59:36 2012 +0200
Update "nix-build --help"
commit 5144abe5b67628d6968d0ab829aa52a6428a77a6
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 27 11:40:47 2012 +0200
Add an option "--exclude" to filter dependencies in "nix-build --run-env"
Sometimes when doing "nix-build --run-env" you don't want all
dependencies to be built. For instance, if we want to do "--run-env"
on the "build" attribute in Hydra's release.nix (to get Hydra's build
environment), we don't want its "tarball" dependency to be built. So
we can do:
$ nix-build --run-env release.nix -A build --exclude 'hydra-tarball'
This will skip the dependency whose name matches the "hydra-tarball"
regular expression. The "--exclude" option can be repeated any number
of times.
commit 3e94ffffd61573624883c02744f20ac3544ff9cb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 27 11:16:43 2012 +0200
Allow the command executed by "nix-build --run-env" to be overriden with --command
commit 446b827baedde7ba3ca44f9ef51940e28e13fb87
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 26 23:18:36 2012 +0200
Mac OS X fix
commit 480dda0e42e69be47434be5bce95be950bdb59b5
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 26 20:56:30 2012 +0200
Delete non-directory valid paths right away
It's unlikely that rename() is faster than unlink() on a regular file
or symlink, so don't bother.
commit 117670be570d775a18e4e35db3dae00abc24f729
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 26 20:43:33 2012 +0200
Make the garbage collector more concurrent
Make the garbage collector more concurrent by deleting valid paths
outside the region where we're holding the global GC lock. This
should greatly reduce the time during which new builds are blocked,
since the deletion accounts for the vast majority of the time spent in
the GC.
To ensure that this is safe, the valid paths are invalidated and
renamed to some arbitrary path while we're holding the lock. This
ensures that we when we finally delete the path, it's not a (newly)
valid or locked path.
commit 8be1979f1ae4b85c36988f7b3cf8240c9682dc54
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 26 20:00:02 2012 +0200
Remove the --max-links GC option
We don't need this anymore now that current filesystems support more
than 32,000 files in a directory.
commit 85799bf89ed2649d7f3e2298de0478c50a71776d
Author: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu Mar 22 20:05:54 2012 +0100
Fixing the default of sync-before-registering
Setting 'false' as default, as suggested by Eelco.
I also added a comment about the setting in the code.
commit 25de80e2b61208850c4a39d8ee44967ada8f040e
Author: Lluís Batlle i Rossell <viric@viric.name>
Date: Thu Mar 22 19:57:42 2012 +0100
Adding a nix option to sync before registering a path, for non-ext*
filesystems.
commit 19d9762ad5fc8d8db3e9a545a89309f08572cc9f
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue Mar 20 18:23:26 2012 +0100
nix-store --clear-failed-paths: Clear derivation outputs
If the argument to ‘nix-store --clear-failed-paths’ is a derivation,
then clear the failed state of its outputs.
commit cb79e91ec3f63ac46d8f4361cb4db75e76a79981
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 19 17:05:42 2012 +0100
Fix the coverage build
commit 457dd55962837fc3026686b58ad89721106356cd
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 19 15:11:22 2012 +0100
Fix the Deb builds
commit 4b83483142c7442663ffee488789ffe572ceaea1
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 19 14:30:59 2012 +0100
Fix the RPM
commit 7f38087f35e6f74a73bfdb28da8acd8930565d51
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 19 04:14:21 2012 +0100
Add a command "nix-build --run-env" to reproduce the environment of a derivation
This command builds or fetches all dependencies of the given
derivation, then starts a shell with the environment variables from
the derivation. This shell also sources $stdenv/setup to initialise
the environment further.
The current directory is not changed. Thus this is a convenient way
to reproduce a build environment in an existing working tree.
Existing environment variables are left untouched (unless the
derivation overrides them). As a special hack, the original value of
$PATH is appended to the $PATH produced by $stdenv/setup.
Example session:
$ nix-build --run-env '<nixpkgs>' -A xterm
(the dependencies of xterm are built/fetched...)
$ tar xf $src
$ ./configure
$ make
$ emacs
(... hack source ...)
$ make
$ ./xterm
commit ea402a255f9c03a644d256b0d1443a986a2bbebb
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 19 01:20:02 2012 +0100
Replace "make check" with "make installcheck"
Ensuring that the tests work from the build tree requires a growing
number of nasty hacks. The tests also don't verify that the installed
Nix actually works. Thus, the tests now require "make install" to
have been run.
commit 4b23900ff1568270c9a03ccadc1cbd0b872e4ef7
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon Mar 19 01:06:13 2012 +0100
Fix the optional dependency on OpenSSL
http://hydra.nixos.org/build/2306540
commit b006a31d52b8f1cb01f3d722a6e3411dc8b98d64
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Mar 18 23:54:57 2012 +0100
Drop the externals directory
Nix now requires SQLite and bzip2 to be pre-installed. SQLite is
detected using pkg-config. We required DBD::SQLite anyway, so
depending on SQLite is not a big problem.
The --with-bzip2, --with-openssl and --with-sqlite flags are gone.
commit 2e0322efd14df7a1658201fb443c8e90687dcfda
Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun Mar 18 22:10:59 2012 +0100
Clean up when building from a working tree
commit bd50c01972718167cf86d20dcd9c928b4c3cfbd8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 13 17:07:49 2012 +0100
Ensure that Perl processes delete their entry in the temproots directory
By moving the destructor object to libstore.so, it's also run when
download-using-manifests and nix-prefetch-url exit. This prevents
them from cluttering /nix/var/nix/temproots with stale files.
commit b461721f17d7104c7ef08a0840d80685b9ae853e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 12 21:41:45 2012 +0100
Fix tests
commit 005d1e4ccb7917d1438dd8f14ddaeeff8eab0b30
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 6 20:03:20 2012 +0100
Update bzip2 dependency
commit 605b16cd7bd9b29482d9029740c3a4595a483f21
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 22:04:40 2012 +0100
Fix compilation on FreeBSD
http://hydra.nixos.org/build/2213576
Not sure why compilation doesn't fail on other platforms...
commit d645633643ff806bff8fcd1677d6ac87509f40e9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 20:52:24 2012 +0100
nix-copy-closure: don't print copied path on stdout
We're already printing progress on stderr, so printing them on stdout
afterwards is kind of useless.
commit 35355fc1fcffbe859395e360c0a6a1463f137d63
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 20:29:00 2012 +0100
Set the close-on-exec flag on file descriptors
commit 7b22bec252a155514d811a8e2acc21562ac02bd4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 20:28:09 2012 +0100
Don't leak a file descriptor in commonChildInit()
commit 1d487dc6a682468ae00402b3720ff412b6bfb6fc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 19:19:29 2012 +0100
nix-worker: put the pid of the caller in argv[1]
This is useful for debugging.
commit 2b4964f31979b5227a7a51b646d2e4bbb5ef6579
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 18:13:44 2012 +0100
Restore progress indication during nix-copy-closure
commit 56042a120a3149ec7ddfb36c6f7d7b841ba6dfeb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 5 17:58:09 2012 +0100
build-remote.pl: don't wait forever for the upload lock
In the build hook, don't wait forever to get the upload lock. This
ensures progress if another process gets stuck while holding the
upload lock.
commit 8afd28a922c8d3a0113abad2b8071465c2d77fe9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 1 16:04:12 2012 +0100
Remove dependency on sqlite3_table_column_metadata
Not all SQLite builds have the function sqlite3_table_column_metadata.
We were only using it in a schema upgrade check for compatibility with
databases that were probably never seen in the wild. So remove it.
commit 1c94524458fda335739b163a76aedeb7bcc5f43a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 24 20:57:54 2012 +0100
Fix an uninitialised variable
The variable ‘useChroot’ was not initialised properly. This caused
random failures if using the build hook. Seen on Mac OS X 10.7 with Clang.
Thanks to KolibriFX for finding this :-)
commit 6fe13e6aba771452e2637d9a8102569c1007d919
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Feb 18 01:23:52 2012 +0100
Fix chroots builds
Chroots are initialised by hard-linking inputs from the Nix store to
the chroot. This doesn't work if the input has its immutable bit set,
because it's forbidden to create hard links to immutable files. So
temporarily clear the immutable bit when creating and destroying the
chroot.
Note that making regular files in the Nix store immutable isn't very
reliable, since the bit can easily become cleared: for instance, if we
run the garbage collector after running ‘nix-store --optimise’. So
maybe we should only make directories immutable.
commit bd013b6f987c23c3b99b639ba7cdbc7b694a13f5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 15 01:31:56 2012 +0100
On Linux, make the Nix store really read-only by using the immutable bit
I was bitten one time too many by Python modifying the Nix store by
creating *.pyc files when run as root. On Linux, we can prevent this
by setting the immutable bit on files and directories (as in ‘chattr
+i’). This isn't supported by all filesystems, so it's not an error
if setting the bit fails. The immutable bit is cleared by the garbage
collector before deleting a path. The only tricky aspect is in
optimiseStore(), since it's forbidden to create hard links to an
immutable file. Thus optimiseStore() temporarily clears the immutable
bit before creating the link.
commit 5e57047d874e0f01dcb3bbc8b809fcc1aa82755b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 15 01:00:30 2012 +0100
Fix a broken guard around utime()
Because of an outdated check for a timestamp of 0, we were calling
utime() even when it wasn't necessary.
commit 58ac7a17a43587001331e4a0379d38c369b99057
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 15 00:28:01 2012 +0100
Don't use deletePath() to delete a single file
commit e9fc91df45c28376960a6e38c8c5f04bf9312623
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 9 18:56:48 2012 +0100
Fix error message
This fixes the error message
error: file `' was not found in the Nix search path (add it using $NIX_PATH or -I)
commit d5a5a83ad4fb8aba3b334039f567267a0463ee5a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 9 18:27:45 2012 +0100
Use data() instead of c_str() where appropriate
commit ec2827f5fc4fc8081daacb197d40d22a5e429df4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 19:25:43 2012 +0100
Update .gitignore
commit 4055a3b19c826dbf487599ee24116a042e37275e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 13:22:08 2012 +0100
Remove empty ChangeLog file
commit fb95455c02c8c48d98a94fde62d666ab13b53edf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 12:31:14 2012 +0100
Set the versionSuffix to include the Git shortrev
commit 67444f5e54163702e6c5f0dd7d85c1158291fe99
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 7 13:18:20 2012 +0000
* Build Nix for the latest Fedora and Ubuntu releases (and drop some
old ones).
commit f491ae97d472bfd6305a8f3e8c58fac1fdc443a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Feb 4 13:50:25 2012 +0000
* Inline some functions and get rid of the indirection through
EvalState::eval(). This gives a 12% speedup on ‘nix-instantiate
/etc/nixos/nixos/ -A system --readonly-mode’ (from 1.01s to 0.89s).
commit 2bda12ef3b2b1d9a0fc59324d723e3fa883ab223
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Feb 4 13:27:11 2012 +0000
* Print elapsed evaluation time.
commit ce86a9a0ae928f8cdbe26021b6b757bf5b9d7693
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 2 12:25:56 2012 +0000
* nix-channel: fail if we don't have write permission to the manifests
directory. Previously in this situation we did add the Nix
expressions from the channel to allow installation from source, but
this doesn't work for binary-only channels and leads to confusing
error messages.
commit baa0501cc120619ac3b76eaa53fff10cffd02449
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 26 13:13:00 2012 +0000
* Fix importing a derivation. This gave a segfault.
commit 4c9fdd2cd63f2f3c4e87790c5cacfdf5cd88591f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 26 13:04:50 2012 +0000
* Add a test for importing derivations.
commit 330df4b4dbb363b69e10fa96d1e22f62088bfc96
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 19 23:08:47 2012 +0000
* Allow comparisons between derivations by comparing the outPath
attributes.
commit 18047d4625b46ae001abc649096ab9ecd4c54560
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 19 23:07:42 2012 +0000
* Add some debug output to print the derivation name once it's known.
This makes it easier to pinpoint the source of a crash.
commit 126c7317bc2384e64e1c6d515061141718e2688f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 19 22:10:24 2012 +0000
* Add a test case for comparing derivations.
commit ddd0ce534ad8ecf9dc57749f354ea6b88b82900f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 18 16:43:48 2012 +0000
* Don't distribute Store.cc, it's generated automatically by xsubpp.
commit 02f1363e19b7df7cccc3523805bbf4fafe429529
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 18 16:39:54 2012 +0000
* Pass the appropriate flags to GCC when building the Perl bindings.
Without these, Nix fails on 32-bit Linux with Perl 5.14, with a
rather unhelpful error message:
Not a CODE reference at /nix/store/n6kpbacn6nn7i3i735v8j3di8aqyl07v-perl-5.14.2/lib/perl5/5.14.2/i686-linux-thread-multi/DynaLoader.pm
This is likely because the lack of -D_FILE_OFFSET_BITS=64 causes
various Perl structures to not match what the Perl interpreter
expects.
commit 4e624849b686894f8a4c23a56098f4d47634a85c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 17 23:07:22 2012 +0000
* Added a command ‘nix-store --print-env $drvpath’ that prints out the
environment of the given derivation in a format that can be sourced
by the shell, e.g.
$ eval "$(nix-store --print-env $(nix-instantiate /etc/nixos/nixpkgs -A pkg))"
$ NIX_BUILD_TOP=/tmp
$ source $stdenv/setup
This is especially useful to reproduce the environment used to build
a package outside of its builder for development purposes.
TODO: add a nix-build option to do the above and fetch the
dependencies of the derivation as well.
commit 2a3f4110c54a10ebee67403a699cb8f951fca858
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 13 23:35:07 2012 +0000
* nix-build: put the temporary derivation symlink in a temporary
directory rather than the current directory.
* nix-build: --drv-link now implies --add-drv-link.
commit 7ae763e16b2a2524f50487ea7422e5412a080004
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 12 14:16:25 2012 +0000
* ‘-module’ causes the generated library to have an .so extension on
Mac OS X instead of .dylib, so don't do that.
commit 6245f0d5298f613c39f999fd68bf21aee8d72945
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Jan 11 16:58:49 2012 +0000
tests: Run `download-using-manifests' via libtool so that dlopening works.
commit c5d9ccd810e3d4c791a912767c4463f4bb44d52e
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Jan 11 16:44:42 2012 +0000
perl: Build libNixStore.la with `-module'.
commit f86fca9b708ea98be0d508db90ec25d537fba246
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 11 15:41:42 2012 +0000
* Figure out the extension of dynamic libraries; don't hard-code .so.
commit 9fe24c5a0d1e694c6338d584a101034cfbff10bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 7 17:26:33 2012 +0000
* Don't create thunks for simple constants (integers, strings, paths)
and allocate them only once.
* Move Value and related functions into value.hh.
commit d4e6b9f2d62ef77ff46397bd130350f03723ce50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 5 21:07:12 2012 +0000
* Doh!
commit a7366a764aa8d549a16b58e43181fe4ff7e598ab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 5 20:33:46 2012 +0000
* Add a -I flag to the Perl bindings to nix-build and some other
scripts.
* Include the version and architecture in the -I flag so that there is
at least a chance that a Nix binary built for one Perl version will
run on another version.
commit b52966e821b05e0d2e379ed6bbbf748f22453108
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 21:47:48 2012 +0000
* Remove dead code.
commit 35f2a6ba82419d48ed8ebce7b8c3e74e65ac74f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 21:24:11 2012 +0000
* Don't use dynamic_cast, it's very slow. "nix-instantiate
/etc/nixos/nixos -A system" spent about 10% of its time in
dynamic_cast.
commit adaf64a99b0a882249e35768c3f4fe3de104cbb2
Merge: 63227d4 9936da6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 16:22:25 2012 +0000
* Merge the multiple-outputs-sandbox branch (svn merge --reintegrate
^/nix/branches/multiple-outputs-sandbox). Multiple output support
still isn't complete, but it wasn't complete in the trunk either, so
it doesn't hurt.
commit 9936da6b546d1ce643eca21ac76c6e7d568de1c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 12:45:53 2012 +0000
* Check whether the outputName attribute works.
commit 9d43a0238235cfbe914e2051db89095699a2df95
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 12:45:40 2012 +0000
* Let --disable-gc work.
commit a0477a458fa9fd7fbe090ff8cebcfd162c090b43
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 12:00:39 2012 +0000
* currentOutput -> outputName. "current" implies some temporal
aspect.
commit b79b85ad7668783391538fe2cda2e896f4ea0c8e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 11:56:15 2012 +0000
* Export the original input attributes of the derivation in
‘drvAttrs’. This will simplify the implementation of functions such
as ‘overrideDerivation’ in Nixpkgs, which need to filter out any
added attributes such as outPath.
commit 83647f4ef14f1ecf40b9fc6099fc77864b87cf41
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 4 11:04:19 2012 +0000
* Simplify the implementation of "derivation" a bit: lift out the
common attribution so that they're evaluated only once, etc. Note
that the default output is now the first element of the "outputs"
attribute, rather than the first element of the sorted list of
outputs. This seems more user-friendly.
commit 71f3c46cf65c0638946c9bb57c36a2b5f177a672
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 15:27:18 2012 +0000
* Drop the inefficient "Path" suffix in output attribute names.
commit 921111d1972388a0aa1841c545c753cb996c9257
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 14:01:47 2012 +0000
* Move the implementation of the ‘derivation’ primop into a separate
file.
commit 6c31232e1494d1d68a31fb8433dbf593f831dff2
Merge: 502d940 63227d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 12:59:31 2012 +0000
* Sync with the trunk.
commit 502d94048ae848eda1fcda2d1e72b339eaa653aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 12:59:00 2012 +0000
* Ignore missing manifest symlinks.
commit 63227d434cefaa9faeb14afe28ebeb9b2d449ee2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 12:18:41 2012 +0000
* FreeBSD tar defaults to the tape device instead of stdout.
commit 9b7df1ef007d9209b17f7aa40a03be0250ea30d0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 09:19:40 2012 +0000
* Forgot to add.
commit 39d45a6b090b5105423b22b8ef39c2a4a000a4a1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 01:51:38 2012 +0000
* Add a test for nix-channel.
* Refactor the nix-channel unpacker a bit.
commit dadbb51d969517c1f2512015ab201dc99088d9a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 00:47:27 2012 +0000
* Use Nix::Config.
commit 48cea0d01ef48733ab38a73a20611f63aeb1b5cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 3 00:16:29 2012 +0000
* Refactoring: Get rid of a few subdirectories in corepkgs/, and some
other simplifications.
* Use <nix/...> to locate the corepkgs. This allows them to be
overriden through $NIX_PATH.
* Use bash's pipefail option in the NAR builder so that we don't need
to create a temporary file.
commit 93e71e6ab68d9662441289a02448c47069beeb2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 17:39:03 2011 +0000
* Follow our own coding conventions.
commit f2d65c9c80821616c4f5587d2bbfdec9e18bdbfd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 17:31:58 2011 +0000
* Remove a redundant dot (Nicolas Pierron).
commit 93b56acb2dd90e106413f201c8025d2ffeba98e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 17:25:19 2011 +0000
* Support multiple outputs in nix-store (specifically the ‘--query’
and ‘--realise’ actions).
commit a71d02440b03cdb5dad6e43f786c0cc86cbb87b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 17:13:25 2011 +0000
* Oops.
commit 6f5e3326cef2a2049c8f4ea757accafe4fc9d53f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 15:02:50 2011 +0000
* Move topoSortPaths() out of gc.cc.
commit b1004f40f7e4dd02feec2d0cb26bd6c95dd66dde
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 14:47:14 2011 +0000
* Reject a build if there is a cycle among the outputs. This is
necessary because existing code assumes that the references graph is
acyclic.
commit ed11b17b2e0e10b759ac051b53c29cc9f79574dc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 13:43:29 2011 +0000
* Fix doc error.
commit 254b3399ba3d7cf161fa54f9cf6cdc65c17164fb
Merge: 5679041 8c42a8c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 30 13:08:14 2011 +0000
* Sync with the trunk.
commit 8c42a8c8ff2986940a41d46b0bdaa1c2ff0f15ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 25 16:38:37 2011 +0000
* Make sure that lock files are cleaned up properly when building
through the build hook.
commit 524fa8a4f11826fdf22005f3304366856f72ffa5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 22 16:27:03 2011 +0000
* Oops.
commit b33da599c5c1b06a32a3eeac58f95481d10f821d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 22 15:55:53 2011 +0000
* In the garbage collector, delete invalid paths before deleting
unreachable paths. This matters when using --max-freed etc.:
unreachable paths could become reachable again, so it's nicer to
keep them if there is "real" garbage to be deleted. Also, don't use
readDirectory() but read the Nix store and delete invalid paths in
parallel. This reduces GC latency on very large Nix stores.
commit 58d974336c733416756e5b396928602ea8ed8df2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 22 14:33:34 2011 +0000
* Drop unnecessary call to canonPath() (nixStore is already canonical).
commit 66c99b0cf50bb1d6290f55c209e9541b50ce41e8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 22 10:58:27 2011 +0000
* ‘--disable-shared’ is no longer supported. Fortunately it's not
needed for the coverage analysis.
commit 2aac7cd0217ce3417b12574ca7f9930090da6c4c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 19:17:45 2011 +0000
* Another case of lock file permissions being too liberal.
commit 4d728bc3e60a6d07858f7a881221688ccdebb7fe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 19:11:58 2011 +0000
* Security: make sure the lock files used by build-remote.pl are not
readable to other users. Otherwise, any user can open the lock file
for reading and lock it, thus DoSing the remote build mechanism.
commit 69d6f0936a59da5cc35040407f4b667437d61add
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 18:59:25 2011 +0000
* Use a lock to ensure that only one build-remote instance can copy a
closure to a given machine at the same time. This prevents the case
where multiple instances try to copy the same missing store path to
the target machine, which is very wasteful.
commit 56790411323eada03bacf37fe6fd328a7c84d32a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 18:19:05 2011 +0000
* The ‘foo.drvPath’ feature was already broken in read-only mode.
Since it's rarely used and fixing it is too much work right now,
just document it.
commit f8e54b7874b73891e39aff11dac2a5ceabef2f02
Author: Shea Levy <shea@shealevy.com>
Date: Wed Dec 21 17:34:44 2011 +0000
Make the reference cycle in the cyclic outputs test indirect
commit b4cee3f816ad53f9762f38c28b51a78732b249f2
Author: Shea Levy <shea@shealevy.com>
Date: Wed Dec 21 17:31:34 2011 +0000
Revert previous commit
It doesn't detect indirect references
commit f3c88f297d837f73d8123cb12564d237d7d0df87
Author: Shea Levy <shea@shealevy.com>
Date: Wed Dec 21 17:14:28 2011 +0000
Detect and reject mutually-referential outputs
There is probably a more efficient way to do this.
commit b19a0f63dbb0c4910f4d9dcb391ca424ff3faeaa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 15:33:30 2011 +0000
* Simplify the context handling logic.
commit 4be5a2c096083234e62117ce6016c4c9aa573aff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 14:42:06 2011 +0000
* Add a test for unsafeDiscardOutputDependency. Not really related to
multiple outputs, but good to have anyway.
commit 179409b9112ee9d9f858a124e0b109a46fe835c9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 13:47:21 2011 +0000
* Add a test for referring to another derivation's ‘drvPath’. This
currently fails in read-only mode.
commit 38776198880d06dc6af0fbdfa7cb2c053000112a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 21 11:47:52 2011 +0000
* Add some accidentally committed files.
commit edd9359bebe012ae40e9e1538dab8f91e2d58d3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 20 17:10:39 2011 +0000
* Doing a GC after building a derivation with cyclic outputs currently
segfaults.
commit 1f3b0ede7d9b6292e054f8e5ecc52a83cbba1f09
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 20 17:08:43 2011 +0000
* Add a (currently failing) test that checks whether mutually
recursive outputs are properly rejected.
* Add a (also failing) test for "nix-build -A <output-name>".
commit 46e42c92c1444e1dd3aec871b3750bcd7391f60e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 20 17:01:02 2011 +0000
* Refactor a bit so that more tests can be added.
commit b5363810bbeea37df34a5cb0051e05161630a510
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 20 16:37:01 2011 +0000
* Fix the build.
commit 194d21f9f63ceb034f3e8294f89aa6bf6a217bc9
Merge: 3c3107d 273b288
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 16 23:33:01 2011 +0000
* Sync with the trunk.
commit 273b288a7e862ac1918064537ff130cc751fa9fd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 16 22:31:25 2011 +0000
* importPath() -> importPaths(). Because of buffering of the input
stream it's now necessary for the daemon to process the entire
sequence of exported paths, rather than letting the client do it.
commit 8d3dfa2c1782e955d2b7796d19dc0d0381596b98
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 16 21:29:46 2011 +0000
* Avoid expensive conversions from char arrays to STL strings.
commit e0bd307802d13476055f8ba99ab7808de0fd71e5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 16 19:44:13 2011 +0000
* Make the import operation through the daemon much more efficient
(way fewer roundtrips) by allowing the client to send data in bigger
chunks.
* Some refactoring.
commit 78598d06f0240a15b74720d8f987daeb702318d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 16 15:45:42 2011 +0000
* Clean up exception handling.
commit 5a1b9ed0aa3a0c240b667dbe504b61b2b68e4d16
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 16:19:53 2011 +0000
* Refactoring: move sink/source buffering into separate classes.
* Buffer the HashSink. This speeds up hashing a bit because it
prevents lots of calls to the hash update functions (e.g. nix-hash
went from 9.3s to 8.7s of user time on the closure of my
/var/run/current-system).
commit a67b8ae22450a0fe10698042b452f5f2f322e008
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 14:04:35 2011 +0000
* Typo.
commit a3e0656cbbfadba28518e0a29c324edaabb9874a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 12:32:08 2011 +0000
* Buffer reads in FdSource. Together with write buffering, this
significantly cuts down the number of syscalls (e.g., for "nix-store
-qR /var/run/current-system" via the daemon, it reduced the number
of syscalls in the client from 29134 to 4766 and in the daemon from
44266 to 20666).
commit 3a48282b0681d68147e18f7464eaddf1d188c3be
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 14 23:30:06 2011 +0000
* Buffer writes in FdSink. This significantly reduces the number of
system calls / context switches when dumping a NAR and in the worker
protocol.
commit 893cac140232478e3ce9640ccf31dbfbfc2434c0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 14 22:41:10 2011 +0000
* Remove the terminate handler, which was only really needed because
of Berkeley DB (see r8632).
commit 23bf700196b4fa05a2da55798644f8adc2e1d7b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 14 22:31:31 2011 +0000
* Oops, the daemon test wasn't actually using the daemon.
commit c8c0380744afd107611bba17127a182ecebd4e0b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 5 21:04:20 2011 +0000
* Remove unnecessary quotes. showPaths() already adds quotes.
commit 000160f5b915ce784e740c139f81e0cbeda751c4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 2 17:52:18 2011 +0000
* In ‘nix-store --verify --check-contents’, repair missing hashes
rather than complain about them.
commit 3964d95abff8af2dc88effcebf6d935805ee6265
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 2 12:09:50 2011 +0000
* nix-prefetch-url: rewritten in Perl.
commit 92d6a5ed73e043aebe5029c1ed75449873d327ac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 2 12:09:24 2011 +0000
* Add some more functions to the Perl bindings.
commit 49f59dceca37636353cf2f5f60135d7705ea154e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 2 11:47:06 2011 +0000
* Move parseHash16or32 into libutil, and use in nix-hash.
commit b12b21825c949ef9b9327c6a0c9e2d5601aaf0b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 1 16:41:43 2011 +0000
* Allow '<nixexpr>' syntax to be used in nix-instantiate, nix-build
and nix-env, e.g.,
$ nix-env -f '<nixpkgs>' -i patchelf
or
$ nix-build '<nixos/tests>' -A login.test
commit 23c38a04ccba4469b9aa98167532c236beeee0a0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 1 13:51:05 2011 +0000
* Slight improvement.
commit 24f863d86b0316c736fe9e89998cd442b8a400dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 1 13:48:48 2011 +0000
* When doing "nix-store --add-fixed" without "--recursive" via the Nix
daemon (which is an error), print a nicer error message than
"Connection reset by peer" or "broken pipe".
* In the daemon, log errors that occur during request parameter
processing.
commit be9be4c1476a46e9d0996d89613ce44d9aaa6da4
Author: Peter Simons <simons@cryp.to>
Date: Thu Dec 1 08:03:30 2011 +0000
doc/manual/nix-env.xml: fixed "nix-env -qaA" typo
commit 3c7ec8fc1b1fe3c3bf48b957c2aafa6c3ea6d846
Author: Peter Simons <simons@cryp.to>
Date: Thu Dec 1 08:02:37 2011 +0000
doc/manual/nix-env.xml: stripped trailing whitespace
commit f35c4351e5f99f1960a6ca7a3fd6dae76dcca163
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 29 22:15:07 2011 +0000
* Don't require a specific Perl version.
commit 4d0407ba087f8bc3a21865309291996084fd80eb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 29 13:38:52 2011 +0000
* Fix make check.
commit 1749a7b0ae943f6a208ffc3fd0f6e9506872c5b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 29 13:01:24 2011 +0000
* download-using-manifests: use the Perl bindings.
commit b1eb8f4249dbf666afa046c45e903566e9eb2df9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 29 13:00:41 2011 +0000
* Get rid of some superfluous error messages if a substituter fails.
* Say "fetch" instead of "substitute".
commit 216440b3ff1431beca7784c7ae76cb5e75446953
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 29 12:32:55 2011 +0000
* For consistency with "nix-store -q --hash", produce hashes in
base-32. (This affects Hydra manifests.)
commit 1df120cb05121124379676d805b8f1fb090d7e22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 29 10:51:22 2011 +0000
* Get rid of the shell in ssh calls.
commit 784083176a6c2bbda84095de97cb59126fe7c7a5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 25 17:04:26 2011 +0000
* Fix race.
commit f3bc98b0015fe333f7b1ef342143c23d0d6a2aa5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 23 15:39:54 2011 +0000
commit 10e2b2b79e77fffed95d55a4c0b8150d4a852ec4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 23 15:39:02 2011 +0000
* Document the --include-outputs option.
commit d5ac78e0d6f21dc60bd4f4f3990a18dc2bc12c4c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 23 15:29:58 2011 +0000
* Add bzip2 and xz support to nix-copy-closure.
commit 5bbd693caedd5d50994938555b3a4b535875347e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 23 15:13:37 2011 +0000
* Add an API function exportPaths() that provides the functionality of
‘nix-store --export’.
* Add a Perl module that provides the functionality of
‘nix-copy-closure --to’. This is used by build-remote.pl so it no
longer needs to start a separate nix-copy-closure process. Also, it
uses the Perl API to do the export, so it doesn't need to start a
separate nix-store process either. As a result, nix-copy-closure
and build-remote.pl should no longer fail on very large closures due
to an "Argument list too long" error. (Note that having very many
dependencies in a single derivation can still fail because the
environment can become too large. Can't be helped though.)
commit ab20af3e6f83f320232d0e5f6bcfcb279c0047c0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 23 12:21:35 2011 +0000
* build-remote.pl: drop a hard-coded reference to /nix/etc/nix.
commit 993fa94fb489f46e127ef760bea8c65ef281ef7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 22 17:28:41 2011 +0000
* Move initialisation of variables like nixConfDir from libmain to
libstore so that the Perl bindings can use it as well. It's vital
that the Perl bindings use the configuration file, because otherwise
nix-copy-closure will fail with a ‘database locked’ message if the
value of ‘use-sqlite-wal’ is changed from the default.
commit 4e1ea17052b4cc2445bc2ece2136f248112b4e45
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon Nov 21 15:19:51 2011 +0000
nix: add /etc/hosts with localhost entry to chroot builds.
commit 4de3e2a0db8d043324e9799ada181f7e73356908
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 21 13:22:34 2011 +0000
* Doh.
commit 23e933b3b3e881515993538ab774c8c7b54f8370
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 21 12:23:48 2011 +0000
* Put back the "sys_name" variable which got removed somewhere. This
broke building on Cygwin and Solaris.
commit a6abade8e832217c27fade5ab8b7c28003c2ac46
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 21 12:18:26 2011 +0000
* Escape the [ and ] characters in the sed call, otherwise autoconf
will eat them.
commit 964399c079f312312f75c41d6f58d323822b6cf0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 20 19:23:50 2011 +0000
* "sed" on FreeBSD doesn't know the "+" operator.
commit b92f76374f34068e3a41130cdba88ac2c5924804
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 18 17:25:40 2011 +0000
* In the platform, canonicalise "amd64" to "x86_64". FreeBSD 8.2's
uname reports amd64.
* Drop the FreeBSD version number, e.g. "i686-freebsd" instead of
"i686-freebsd8.2".
commit 42164d6de493fa2e0acbf1ebaf9ee0d7502b4f0b
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Nov 16 20:58:21 2011 +0000
configure: Change i*86 to i686 as has always been done.
commit 45ec69cbdf7e5e7ff19d28c8f25c7f650105b253
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Nov 16 20:39:59 2011 +0000
configure: Rely on `AC_CANONICAL_HOST' to determine the Nix system name.
This should be more robust and also plays better with
cross-compilation---it uses the host name, instead of using the build
name.
commit f8e609c3413e38d403d986020079f24a2b82c063
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 16 16:41:48 2011 +0000
* nix-pull: update the Nix manifest cache if necessary. Also, don't
read the manifest just to check the version and print the number of
paths. This makes nix-pull very fast for the cached cache (speeding
up nixos-rebuild without the ‘--no-pull’ or ‘--fast’ options).
commit d7d7910ba48d898bda2db92a4f16a6179c855f7d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 16 16:25:38 2011 +0000
* Don't decompress the manifests in /nix/var/nix/manifest. This saves
disk space, and, since they're typically only decompressed once (to
fill the manifest cache), doesn't make things slower.
commit 63ee5e4d2a46c3619c59307d7dbb08f25d32c3e8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 16 11:56:19 2011 +0000
* Remove obsolete line.
commit a5952405d2803ae0d29955fe6725cd9195327a07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 16 11:37:40 2011 +0000
* Re-use prepared statements across insertions into the manifest cache
DB. This speeds up creating the cache from 16.1s to 7.9s on my
system.
commit c0b706213dad330bd51607ff73059c87f0ec5b93
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 7 21:11:59 2011 +0000
* Boldly make SQLite WAL mode the default again. Hopefully the
intermittent problems are gone by now. WAL mode is preferrable
because it does way fewer fsyncs.
commit 3c3107da86ff71a08ce44027ee5899acf486796a
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 07:18:19 2011 +0000
There's no need to mess with drvPath at all
commit 2ab29be70c99483dbd8cf12eece4d553c7f953f3
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 07:03:14 2011 +0000
Fix faulty reversion of my changes to unsafeDiscardOutputDependency
commit ca0d47a70c37999f8cc9c2e82c76661826cfd50a
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:54:05 2011 +0000
Respect all outputs passed to the derivation, not just the last one
commit 24b65937e103c5cb1232c3cbcbffc12322cb8ae3
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:28:34 2011 +0000
Remove the unused sCurrentOutput symbol
commit 3522730316dbb3a9ee5a690188f02435e7260406
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:28:30 2011 +0000
Embed output name into the context of the *OutPath attributes and extract it for input derivations
Multiple outputs test passes!
commit 46876ff2037541613dc17c986f9b68b8f257cb3b
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:28:25 2011 +0000
Fix stupid typo in multiple outputs test
commit af2e53fd481994cca46b9c003a6a8eae50cf951c
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:28:20 2011 +0000
Include all outputs of derivations in the closure of explicitly-passed derivation paths
This required adding a queryOutputDerivationNames function in the store API
commit 981edeab7b6b415c71d3421da6967ec7fc232e54
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:28:14 2011 +0000
The 'insert output between = signs' approach was not helpful
commit f883afa1a1bc6c48bbb3d9c150e357c35e40c921
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 06:28:08 2011 +0000
The nixinstantiate and nixstore env vars are no longer set in common.sh
commit 2721e9f56f92f5bd630dcbb0104fc56159cb28d4
Merge: bffe35a a6a3f3a
Author: Shea Levy <shea@shealevy.com>
Date: Sun Nov 6 00:13:09 2011 +0000
Merge from trunk
commit a6a3f3a8c26fdd6900880c13e924e6879d6c714c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 5 21:23:01 2011 +0000
* Fix race condition in the test.
commit fa69ff57269dfd24ff04810c04d130e3e5d94154
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 5 21:06:24 2011 +0000
* Fix the broken reference to bunzip2 in the channel unpack script.
commit daed9aeac557af4ec8d3d8f00b4f3f2b8f90408a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 3 19:22:24 2011 +0000
commit d7b87bebe3ac8f47e387c79e03ceb5915e71d249
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 3 18:47:10 2011 +0000
* The Nix configuration file is usually /etc/nix/nix.conf.
commit 325b5a8aee89a12c30fbfcf74503f5105be0b230
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 2 19:14:54 2011 +0000
* Fix permission on /nix/store in the manual for multi-user installs
(reported by Silvio Frischknecht).
commit a12095d3be095ba9d88631e21ef6d43f1ddb5cee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 27 19:06:23 2011 +0000
* In printValueAsXML, handle the case where a "type" attribute is not
a string. This happens in the NixOS option system.
* Remove a bogus comparison of a unsigned integer with -1.
commit 00b41e46ed02d16aeea1375c14a84df02a91efba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 19 21:34:13 2011 +0000
* Print a consistent message.
commit f186a9141efd20b1236b9df29de1bf4b1f2098ce
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 18 21:21:22 2011 +0000
* nix-copy-closure: support ‘--dry-run’ and ‘--include-outputs’.
commit 67617574280a5db534e5b5c643a3b880d1b9336c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 15:41:13 2011 +0000
* Use the Store API bindings in nix-copy-closure.
commit d43a148204a983bf676750f50640969f8edf7350
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 13:58:47 2011 +0000
* Add a test for nix-copy-closure.
commit 2492914fbcd1d616c89b83fda0ee08551486273e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 13:06:59 2011 +0000
* Move the remote building test from the NixOS tree to the Nix tree.
commit c362e4d718cb31e532a4e2d708d07a57bc3bdf55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 11:45:36 2011 +0000
* Move SSH.pm.
commit 7d314b8c959ca5c3dda8aea9c74079f4be63e19e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 11:14:30 2011 +0000
* Work around a race condition starting the Nix daemon.
commit 5193db048e06578191ddd3085d76aab1d2e15ad3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 09:32:34 2011 +0000
* Set svn:ignore.
commit a2a317eb0bc418577461105790c70b363a10cc34
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 09:31:55 2011 +0000
* Distribute GeneratePatches.pm.
commit 5090c34ee1251dd8f0a57332feff0c99489f7faa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 10 22:40:17 2011 +0000
* Set the executable bit on scripts.
commit 8af7d766f0244d5b15d89ab2d2d66b0d63e8f576
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 10 21:32:34 2011 +0000
* Refactoring: remove unnecessary variables from the tests.
commit cd6d02c366af43bccdd2ef345193e4fdeca78a13
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 10 21:30:59 2011 +0000
commit 6fcdbcac202e40e5de7147ff64b34d6aaad16249
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 10 21:11:08 2011 +0000
* Install NixManifest.pm, NixConfig.pm and GeneratePatches.pm under
the Nix:: namespace.
commit 659c427caa39e44e5861ff1345425e4c34c9ced3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 10 18:58:49 2011 +0000
* Hopefully perl-devel contains the required headers (untested).
commit 73fe6871c479f7670f8c93b0cc9ef7bb1a851777
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 10 18:12:40 2011 +0000
* Include the Nix Perl bindings in Nix itself. This will allow the
bindings to be used in Nix's own Perl scripts.
The only downside is that Perl XS and Automake/libtool don't really
like each other, so building is a bit tricky.
commit bffe35acedafcd7c7237cb1415798362bff8a180
Author: Shea Levy <shea@shealevy.com>
Date: Mon Sep 19 04:36:49 2011 +0000
Update gitignore
commit 6c38cc9025591655b893bbd2437bfd1453c0c2fa
Author: Shea Levy <shea@shealevy.com>
Date: Mon Sep 19 04:15:26 2011 +0000
Ignore everything created during build
commit 55481c44d4767ffde561c02b039717916e0536f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Sep 17 09:53:31 2011 +0000
* Don't assume that we want a shared Nix store.
commit e81c09edbf6b352ec96668be35a68037df2f6342
Author: Shea Levy <shea@shealevy.com>
Date: Fri Sep 16 11:31:00 2011 +0000
Remove the current output metadata from the string for unsaveDiscardOutputDependency
commit bf50d6ad3271aaa6ac93b68e99f5acb1d9a158c7
Author: Shea Levy <shea@shealevy.com>
Date: Fri Sep 16 11:30:52 2011 +0000
Add information about which output is active to drvPath's context
This will break things that depend on being able to just strip away an equals sign, so those have to be updated next
commit ffa038f66dc0dfcfaf16c523830490bb606af04c
Author: Shea Levy <shea@shealevy.com>
Date: Fri Sep 16 11:30:44 2011 +0000
Add an sCurrentOutput member to EvalState
commit f3e410d4bffc109718d8a108258710a543ecfca6
Author: Shea Levy <shea@shealevy.com>
Date: Fri Sep 16 11:30:03 2011 +0000
Add a currentOutput attribute to derivations keep track of which output is active
commit 8f28a3ba25dd0dad6411a039bc01ad87c61a6e59
Author: Shea Levy <shea@shealevy.com>
Date: Wed Sep 14 05:59:29 2011 +0000
Add a test for multiple outputs
This currently fails. Yay test-driven development!
commit c172d16b00dd2126eb7c4f12c26f1e30e4356f07
Author: Shea Levy <shea@shealevy.com>
Date: Wed Sep 14 05:59:17 2011 +0000
First attempt at the output-as-derivation semantics
For each output, this adds a corresponding attribute to the derivation that is
the same as the derivation except for outPath, which is set to the path specific
to that output. Additionally, an "all" attribute is added that is a list of all
of the output derivations. This has to be done outside of derivationStrict as
each output is itself a derivation that contains itself (and all other outputs)
as an attribute. The derivation itself is equivalent to the first output in the
outputs list (or "out" if that list isn't set).
commit 0b34e57eb80dbadd8f24426c4486af97cbfe40bf
Author: Shea Levy <shea@shealevy.com>
Date: Wed Sep 14 00:41:02 2011 +0000
Create a branch for me to play around with finishing off the multiple outputs implementation
commit 13114daa3e38abc5c84987830d9276b93251592f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 12 09:07:43 2011 +0000
* Ouch. A store upgrade could cause a substituter to be triggered,
causing a deadlock.
commit 281e3ed0590f253ef717a1f82123dfc569a110a1
Author: Ludovic Courtès <ludo@gnu.org>
Date: Tue Sep 6 12:11:05 2011 +0000
bootstrap: Simplify & make more robust.
commit e6cb3d0a0dcfe13e9b493afdc4e2107668ec99ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 6 12:06:30 2011 +0000
* Added a command ‘nix-store --verify-paths PATHS’ to check whether
the contents of any of the given store paths have been modified.
E.g.
$ nix-store --verify-path $(nix-store -qR /var/run/current-system)
path `/nix/store/m2smyiwbxidlprfxfz4rjlvz2c3mg58y-etc' was modified! expected hash `fc87e271c5fdf179b47939b08ad13440493805584b35e3014109d04d8436e7b8', got `20f1a47281b3c0cbe299ce47ad5ca7340b20ab34246426915fce0ee9116483aa'
All paths are checked; the exit code is 1 if any path has been
modified, 0 otherwise.
commit 82710f96f7ea72bc0f6fcc6d736e3ad4434c1988
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 6 12:00:11 2011 +0000
* Add some -f flags, never hurts.
commit 93227ff65c73e726c4ceef0cdd9439e7a4301417
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 31 21:11:50 2011 +0000
* Eliminate all uses of the global variable ‘store’ from libstore.
This should also fix:
nix-instantiate: ./../boost/shared_ptr.hpp:254: T* boost::shared_ptr<T>::operator->() const [with T = nix::StoreAPI]: Assertion `px != 0' failed.
which was caused by hashDerivationModulo() calling the ‘store’
object (during store upgrades) before openStore() assigned it.
commit 5bcdc7e3517e6d679cad1aaba41e4deb76d5a6e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 27 16:59:32 2011 +0000
* Update the cleanup script.
commit a95ba4cdd9aa9f9c98928732dd26fba2757ade26
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 17 14:17:19 2011 +0000
* Use last_insert_id instead of sqlite_last_insert_rowid, which you're
not really supposed to use according to the DBD::SQLite docs, and
fails on some systems (e.g. http://hydra.nixos.org/build/1246662).
commit da18b11b05b6196376d5387b879d28b8da20f734
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 8 14:08:38 2011 +0000
* On FreeBSD, ‘touch’ is not in the test $PATH, so don't use it.
commit 76e0029f7ae03f30a2fa534e1eaf141437877398
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 8 14:06:10 2011 +0000
* Add perl-DBD-SQLite as a dependency of the RPM builds.
commit d374be551df964f000a04061e6ad9c81a7a8341c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 8 13:19:00 2011 +0000
* Add DBD-SQLite as a dependency to the Debian/Ubuntu builds.
* Drop some old Fedora/Debian/Ubuntu releases.
commit 2d663b502da16d6dc480bff7f58297d176d04246
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 19:45:43 2011 +0000
* Cache the result of file evaluation (i.e, memoize evalFile()). This
prevents files from being evaluated and stored as values multiple
times. For instance, evaluation of the ‘system’ attribute in NixOS
causes ‘nixpkgs/pkgs/lib/lists.nix’ to be evaluated 2019 times.
Caching gives a modest speedup and a decent memory footprint
reduction (e.g., from 1.44s to 1.28s, and from 81 MiB to 59 MiB with
GC_INITIAL_HEAP_SIZE=100000 on my system).
commit 510033e78376987ca358cebfa020754e61733543
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 18:54:29 2011 +0000
* Handle <path> syntax.
commit 9d091ee99a9b962c72b3cb9485a89ba028dd1155
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 18:45:28 2011 +0000
* Handle the case where the search path element is a regular file.
commit 00a724ebc6f049009ce0810b0ac44dd11199d88b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 18:24:43 2011 +0000
* Remove a debug statement.
commit 07340b8be742e08f1a000475eb1f389d5525d6c8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 18:23:38 2011 +0000
* Add the Nix corepkgs to the end of the search path. This makes it
possible for other Nix expressions to use corepkgs (mostly useful
for the buildenv function).
commit c7101dac0bd2631e50846194fc841ef5ef77461f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 17:48:57 2011 +0000
* Allow redirections in search path entries. E.g. if you have a
directory
/home/eelco/src/stdenv-updates
that you want to use as the directory for import such as
with (import <nixpkgs> { });
then you can say
$ nix-build -I nixpkgs=/home/eelco/src/stdenv-updates
commit 1578b2261d28003c8c1459041302e1f3c1921c43
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 16:18:54 2011 +0000
* Add lang/dir* to the distribution.
commit 1ecc97b6bdb27e56d832ca48cdafd3dbb5185a04
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 16:05:24 2011 +0000
* Add a Nix expression search path feature. Paths between angle
brackets, e.g.
import <nixpkgs/pkgs/lib>
are resolved by looking them up relative to the elements listed in
the search path. This allows us to get rid of hacks like
import "${builtins.getEnv "NIXPKGS_ALL"}/pkgs/lib"
The search path can be specified through the ‘-I’ command-line flag
and through the colon-separated ‘NIX_PATH’ environment variable,
e.g.,
$ nix-build -I /etc/nixos ...
If a file is not found in the search path, an error message is
lazily thrown.
commit 54945a2950174ded83d58336061b4a9990cdbbfd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 6 13:02:55 2011 +0000
* Refactoring: move parseExprFromFile() and parseExprFromString() into
the EvalState class.
commit c8606664abe952f74985503c831d31ae7a7369bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 20 18:26:00 2011 +0000
* Don't allow derivations with fixed and non-fixed outputs.
commit b2027f70d992bd2d088e71ee5cea7637445766f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 20 18:10:47 2011 +0000
* Fix a huuuuge security hole in the Nix daemon. It didn't check that
derivations added to the store by clients have "correct" output
paths (meaning that the output paths are computed by hashing the
derivation according to a certain algorithm). This means that a
malicious user could craft a special .drv file to build *any*
desired path in the store with any desired contents (so long as the
path doesn't already exist). Then the attacker just needs to wait
for a victim to come along and install the compromised path.
For instance, if Alice (the attacker) knows that the latest Firefox
derivation in Nixpkgs produces the path
/nix/store/1a5nyfd4ajxbyy97r1fslhgrv70gj8a7-firefox-5.0.1
then (provided this path doesn't already exist) she can craft a .drv
file that creates that path (i.e., has it as one of its outputs),
add it to the store using "nix-store --add", and build it with
"nix-store -r". So the fake .drv could write a Trojan to the
Firefox path. Then, if user Bob (the victim) comes along and does
$ nix-env -i firefox
$ firefox
he executes the Trojan injected by Alice.
The fix is to have the Nix daemon verify that derivation outputs are
correct (in addValidPath()). This required some refactoring to move
the hash computation code to libstore.
commit d2bfe1b071d0d71bb981535a53e9c5de43aaac81
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 20 12:15:40 2011 +0000
* Added a test that make sure that users cannot register
specially-crafted derivations that produce output paths belonging to
other derivations. This could be used to inject malware into the
store.
commit 4bdb51e621e2690e561b7581d5670af08e7b3170
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 20 11:50:13 2011 +0000
* Refactoring.
commit 0243eea4b92ca1598353e31b7e3c0d195c903221
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 20 11:47:00 2011 +0000
* Create a symlink to /nix/var/nix/manifests in /nix/var/nix/gcroots
if it doesn't exist.
commit d329c3ea9dde17a665b32a1716d02eb13627826d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 18 23:31:03 2011 +0000
* Support multiple outputs. A derivation can declare multiple outputs
by setting the ‘outputs’ attribute. For example:
stdenv.mkDerivation {
name = "aterm-2.5";
src = ...;
outputs = [ "out" "tools" "dev" ];
configureFlags = "--bindir=$(tools)/bin --includedir=$(dev)/include";
}
This derivation creates three outputs, named like this:
/nix/store/gcnqgllbh01p3d448q8q6pzn2nc2gpyl-aterm-2.5
/nix/store/gjf1sgirwfnrlr0bdxyrwzpw2r304j02-aterm-2.5-tools
/nix/store/hp6108bqfgxvza25nnxfs7kj88xi2vdx-aterm-2.5-dev
That is, the symbolic name of the output is suffixed to the store
path (except for the ‘out’ output). Each path is passed to the
builder through the corresponding environment variable, e.g.,
${tools}.
The main reason for multiple outputs is to allow parts of a package
to be distributed and garbage-collected separately. For instance,
most packages depend on Glibc for its libraries, but don't need its
header files. If these are separated into different store paths,
then a package that depends on the Glibc libraries only causes the
libraries and not the headers to be downloaded.
The main problem with multiple outputs is that if one output exists
while the others have been garbage-collected (or never downloaded in
the first place), and we want to rebuild the other outputs, then
this isn't possible because we can't clobber a valid output (it
might be in active use). This currently gives an error message
like:
error: derivation `/nix/store/1s9zw4c8qydpjyrayxamx2z7zzp5pcgh-aterm-2.5.drv' is blocked by its output paths
There are two solutions: 1) Do the build in a chroot. Then we don't
need to overwrite the existing path. 2) Use hash rewriting (see the
ASE-2005 paper). Scary but it should work.
This is not finished yet. There is not yet an easy way to refer to
non-default outputs in Nix expressions. Also, mutually recursive
outputs aren't detected yet and cause the garbage collector to
crash.
commit d9a5959139302781d1f4ac740b1af97c18a5fd08
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 13 15:57:44 2011 +0000
* Show the default for --with-store-dir (Nix/211).
commit d5d4dcd4c988363beb2bb408ac31750e4c027176
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 13 15:53:24 2011 +0000
* Allow attribute names to be strings. Based on the
allow-arbitrary-strinsg-in-names patch by Marc Weber.
commit e649f3168bb03053c8201489ca52f9077c0d8b17
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 13 14:05:54 2011 +0000
* Fix concurrency issues in download-using-manifests' handling of the
SQLite manifest cache. The DBI AutoCommit feature caused every
process to have an active transaction at all times, which could
indefinitely block processes wanting to update the manifest cache.
* Disable fsync() in the manifest cache because we don't need
integrity (the cache can always be recreated if it gets corrupted).
commit 0a623a10c7e89a80b6dc74445a0ae6240f65723e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 13 12:19:57 2011 +0000
* Allow a default value in attribute selection by writing
x.y.z or default
(as originally proposed in
https://mail.cs.uu.nl/pipermail/nix-dev/2009-September/002989.html).
For instance, an expression like
stdenv.lib.attrByPath ["features" "ckSched"] false args
can now be written as
args.features.ckSched or false
commit 2b9e29b1c8b6b8e4884a46a3ba71ee795f1f97cd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 6 12:28:57 2011 +0000
* Change the right-hand side of the ‘.’ operator from an attribute to
an attribute path. This is a refactoring to support default values.
commit 5580f3817c37135dcc633d84d1360a17a8878a58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 6 10:58:53 2011 +0000
* Test case.
commit 56370378023fc84eb0153b991f4138f6acd011e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 6 10:58:17 2011 +0000
* In the ‘?’ operator, allow attribute paths. For instance, you can
write ‘attrs ? a.b’ to test whether ‘attrs’ has an attribute ‘a’
containing an attribute ‘b’. This is more convenient than ‘attrs ?
a && attrs.a ? b’.
Slight change in the semantics: it's no longer an error if the
left-hand side of ‘?’ is not an attribute set. In that case it just
returns false. So, ‘null ? foo’ no longer throws an error.
commit 34f4b91820796381d04c6e00ea5e805cf53d25da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 4 14:44:53 2011 +0000
commit 1ea6e064454d10b722c2fd9361f00e6cf3561f08
Author: Ludovic Courtès <ludo@gnu.org>
Date: Thu Jun 30 15:48:40 2011 +0000
doc: Fix typo.
commit 5c9e9f732df6d95d712f25de9880b7461c53d6ca
Author: Ludovic Courtès <ludo@gnu.org>
Date: Thu Jun 30 15:19:13 2011 +0000
Add support for the `build-timeout' and `--timeout' options.
commit 9c99aa2620b8f86c0e7f99ebfe868e8ccb306f71
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 27 09:01:09 2011 +0000
commit e4d814858559f10900eff26bb7a87fb986a87c48
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 27 08:04:54 2011 +0000
commit 4891b21f34548a362df842e5d88914f6a70b5a39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 3 16:17:24 2011 +0000
* Use SQLite 3.7.6.2.
commit d94cb02bfe4119a91948d31b1b9082328955dae1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 19 10:52:35 2011 +0000
* nix-install-package: unset NIX_REMOTE because $NIX_MANIFESTS_DIR
doesn't work when building through the Nix daemon. This also
ensures an error message when the user doesn't have sufficient
privileges to do nix-pull.
commit 8c69dac8a1d25c043ddb27d5c8dde5b072030667
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 19 10:44:44 2011 +0000
* Handle error messages from the Nix worker containing the `%'
character. (Nix/216)
commit 4ba6afaf48db8d4cece83a6e22de26829907834f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 16:27:05 2011 +0000
* `nix-env -ub' (`--prebuilt-only') didn't really work because it
checked too soon whether substitutes are available. That is, it did
so for every available package, rather than those matching installed
packages. This was very slow and subject to assertion failures. So
do the check much later. Idem for `nix-env -qab' and `nix-env -ib'.
commit 412914d004462977e869e610172305d33fb4d335
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 13:16:54 2011 +0000
* Read manifests directly into the database, rather than first reading
them into memory. This brings memory use down to (more or less)
O(1). For instance, on my test case, the maximum resident size of
download-using-manifests while filling the DB went from 142 MiB to
11 MiB.
commit 08c89714984ca64b9ddfe53c99254c70a784e81c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 12:40:13 2011 +0000
* Lock the database during updates.
commit b2c11b9ed05d33bb938d83fbcb367256427450f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 10:23:15 2011 +0000
commit 3cbf680f5d2bfb2ed4592dd24ff8ce2b7e5765bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 10:13:53 2011 +0000
* configure: detect whether DBD::SQLite is present. If necessary the
location to DBI and DBD::SQLite can be passed with --with-dbi and
--with-dbd-sqlite.
commit 83252b4ca9cb9de45bf4a069b20d1c2d1412396e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 08:21:30 2011 +0000
* Subtle bug: if you import File::stat in one module, it affects other
modules as well. So use symbolic field names everywhere (which is
nicer anyway).
commit b1882c3ef75afdaa7b0926cd146aa2857ba0d40a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 08:06:14 2011 +0000
* Create $manifestDir if it doesn't exist.
commit 5591fcc5292616e99d9d2478ffeb4f1b51f1899e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Apr 10 23:22:46 2011 +0000
* Cache the manifests in /nix/var/nix/manifests in a SQLite database.
This significantly speeds up the download-using-manifests
substituter, especially if manifests are very large. For instance,
one "nix-build -A geeqie" operation that updated four packages using
binary patches went from 18.5s to 1.6s. It also significantly
reduces memory use.
The cache is kept in /nix/var/nix/manifests/cache.sqlite. It's
updated automatically when manifests are added to or removed from
/nix/var/nix/manifests. It might be interesting to have nix-pull
store manifests directly in the DB, rather than storing them as
separate flat files, but then we would need a command line interface
to delete manifests from the DB.
commit 1e7e4f21ba910bcf9da89b14cf2424a4b0955bed
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 6 09:16:22 2011 +0000
* Remove the localPaths feature in manifests since it's no longer used
and redundant anyway.
commit 0423d0692abebf16a19b65b37d4926de2539bf1c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 16 15:55:57 2011 +0000
* Print a better error message.
commit 48bdbbf07042f130996c0d9116893cc9f8ed2488
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 13:12:59 2011 +0000
* Fix a bug in the documentation (reported by Olexiy Buyanskyy,
Nix/215).
commit 802c2651c84b73a54b2a89484aa463f1f0df3b94
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 15:08:33 2011 +0000
commit e945b52a31ab339b253df40e35828582eff77e54
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 13:26:33 2011 +0000
* nix-push: handle the case where the hash is not set in the DB.
commit c3cee5395bec0dd9db3fb60662a170ebb7453ee1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 14:56:02 2011 +0000
* Build for Ubuntu 10.04.
commit 8fcaf3e9c6d820175d124be0af06c481104222a1
Author: Florian Friesdorf <flo@chaoflow.net>
Date: Mon Feb 14 03:11:56 2011 +0000
make nix-mode provide 'nix-mode
this enables (require 'nix-mode)
commit 538b7caab013e6ec78bed2b65a7c5d345f1c737e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 10 14:31:04 2011 +0000
* Don't allocate a big initial GC address space on machines with
little RAM. Even if the memory isn't actually used, it can cause
problems with the overcommit heuristics in the kernel. So use a VM
space of 25% of RAM, up to 384 MB.
commit 5a6b0398026a8a24b206a4b4d43894f9c683792c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 22:59:50 2011 +0000
* Don't call GC_expand_hp unless we're actually using the garbage
collector.
commit f1462c208ba5d4efda864875f814c268366f4803
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Feb 9 21:23:13 2011 +0000
Use $BDW_GC_LIBS instead of a custom variable.
commit 1876ab764f5b6e42fce67bdb46a8b03131653900
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 14:13:09 2011 +0000
* A better fix. $boehmgc isn't set anywhere, we should use the flags
returned by pkg-config.
commit dfc4117e901f27276ea1ce81c852bf4d52959961
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 14:08:32 2011 +0000
* The GC library can't be found on Solaris
(http://hydra.nixos.org/build/890714), so don't build with GC
support for now.
commit d159ea1b7ec007fa5e4d4bef540453c9c09c3984
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 14:03:16 2011 +0000
* Urgh, FreeBSD doesn't have a "seq" command.
commit 3087b3f7513ce713e0b759f63b9a4e9142e46f82
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 12:48:54 2011 +0000
* Obsolete.
commit eb94581d399b8d0945b883b14c4a892fdab95dfc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 12:43:44 2011 +0000
* Remove obsolete directory.
commit 7bba67c4013c1eb17c3f2f0a7015dbb57aae8ac8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 12:42:15 2011 +0000
* Remove obsolete file.
commit d0eda1f3e9b2030e373038fd8997f033f2d7aedd
Merge: 3854fc9 5439885
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 12:41:54 2011 +0000
* Merged the SQLite branch.
commit 543988572e2abc85767da315b2acc1f971c5d07f
Merge: c0340ee 3854fc9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 12:25:53 2011 +0000
* Sync with the trunk.
commit c0340eec5ac175f7b757d883aca71d1a4382c641
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 8 12:30:28 2011 +0000
commit 0304fda3cfdbd1e0cbc939b667cbe833eb726be1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Feb 5 16:40:15 2011 +0000
* Propagate the CC setting.
commit aeae0beba49e98655861c5c50e573bd7d9cfb5c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Feb 5 16:29:10 2011 +0000
* Clang compatibility fix. Clang actually checks template definitions
when they are defined
commit 3854fc9b42d16b810f62b64194b699033b03aaf1
Author: Ludovic Courtès <ludo@gnu.org>
Date: Fri Jan 14 13:55:58 2011 +0000
Remove useless <config.h> inclusion from public header.
commit 9db190eb31d4adc412d50bc03574951f9a1f9dae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 12:47:10 2011 +0000
* builtins.substring: if "start" is beyond the end of the string,
return the empty string.
commit d6c8b995c5c08a6c6a6b18f0b2cf5b4b95cfc1b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 22 10:32:32 2010 +0000
* In Hydra manifests the Size field is missing, so don't rely on it.
This caused a lot of "Use of uninitialized value" warnings from
Perl.
commit c931a7aec5ccb2209d3c4bcf4452c807fe894d94
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 17 17:23:15 2010 +0000
* Do a short sleep after SQLITE_BUSY.
commit b1eb25217217087cb70a730da5311bd0890cf6ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 17 11:28:26 2010 +0000
* Propagate the "100" exit status for failed builds through the Nix
daemon.
commit eac93d6efeba68d9da95f01e10cd859eef6d85dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 17 09:28:51 2010 +0000
* Use the right `make'.
commit a0be433fec792216ac5d9af68ec1fea6c21c7c1d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 15 14:25:54 2010 +0000
* Disable X11 forwarding, it's not needed.
commit f1a6b97639474dbb13a1f96b4adf77c987a97d07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 15 08:39:37 2010 +0000
* nix-copy-closure: make sure that the shell doesn't do globbing of
`+' and `?' in filenames. This is very slow if /nix/store is very
large. (This is a quick hack - a cleaner solution would be to
bypass the shell entirely.)
commit 3dd02580e324d04ebfe999779978b4aa0f999ccd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 14 13:25:20 2010 +0000
* I forgot to catch SQLiteBusy in registerValidPaths(). So
registerValidPaths() now handles busy errors and registerValidPath()
is simply a wrapper around it.
commit d787285af997a607bb678f39f340e663fafd3122
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 16:53:23 2010 +0000
* nix-instantiate: return exit status 100 to denote a permanent build
failure. The build hook can use this to distinguish between
transient and permanent failures on the remote side.
commit 5833243c92f28759ff0fc1ff9266535a3230e2d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 13:42:34 2010 +0000
* Create /nix/var/nix/db if it's missing.
commit 100becf8d1b95055c73a024f1a2b318690de72f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 13:32:58 2010 +0000
* createDirs(path): if path already exists, make sure it's a
directory.
* Provide a C++ wrapper around lstat().
commit d7ca6f44eb506ec315db2ba59216de59de2758b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 13:19:46 2010 +0000
* Update some comments.
commit 542fc6906297fcb72cbcb01d688c2f27819e0cf7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 08:39:10 2010 +0000
* When doing a query (e.g. `nix-store -r --dry-run'), don't make a lot
of expensive calls to `nix-store --check-validity'.
commit 4d5777681309947041ecc297074f4ce537547553
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 10 11:45:56 2010 +0000
* Use SQLite 3.7.4.
commit e4720b1a79f549b3bcb0e33fe999d02d12e3ed23
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 8 18:19:15 2010 +0000
* Ignore the result of sqlite3_reset().
commit 7d0444e2446c71e79e49f46f371c62f6d20488d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 7 12:33:42 2010 +0000
* Bad things happen when a filehandle has the same name as a module.
commit 8062d3af30b27eb4d617c14856d4f3a173f8012e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 6 15:29:38 2010 +0000
* `nix-store --verify --check-contents': don't hold the global GC lock
while checking the contents, since this operation can take a very
long time to finish. Also, fill in missing narSize fields in the DB
while doing this.
commit de79d23f76c13da820f7167cd980264b2de28bd2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 5 18:23:19 2010 +0000
* Retry a transaction if SQLite returns SQLITE_BUSY. This can happen
even with a very long busy timeout, because SQLITE_BUSY is also
returned to resolve deadlocks. This should get rid of random
"database is locked" errors. This is kind of hard to test though.
* Fix a horrible bug in deleteFromStore(): deletePathWrapped() should
be called after committing the transaction, not before, because the
commit might not succeed.
commit 365f3028ddfb5487f35ebbb9adc42ddf9459113d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 5 17:50:29 2010 +0000
* Use CamelCase for the Perl modules.
commit f42a505ab71ba421797ac511e1221ccbefef8ab9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 5 17:36:02 2010 +0000
* Add a script `nix-generate-patches'.
* Fix the binary patching test.
commit 77f7a6d591e32a4a475552f3e67e3e67b7f71a10
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 17:07:04 2010 +0000
* Quick hack around one of the pathological cases in bsdiff
(namely, when there is a long region of 0s). On one 86 MiB
case, this cut patch generation time from 44m to 2m.
commit d3bba0c2d8b879950d55d508ef3fc8dec3559f8f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 15:26:28 2010 +0000
* Move the patch generator into a module.
commit 9737a7eba0844e317591f16092879696c4f3feae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 09:26:05 2010 +0000
* Don't generate patches if the system type differs.
commit bd48fd97f646f068ae2725b5b2f048d45866119b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 09:15:45 2010 +0000
* Impose a configurable time limit on patch generation. This is
necessary because bsdiff has some pathological worst-case behaviour,
e.g. O(n^2) on files consisting only of 0s.
commit 703e5a2ce2f111c5329a8448ba47a7fbe11ad6cd
Merge: d92ccbf 812fae4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 25 14:09:13 2010 +0000
* Sync with the trunk.
commit 812fae424ee7139cf9bc0d17815ee68aa3cab517
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 25 13:47:34 2010 +0000
* DrvInfo contains pointers to expressions, so DrvInfos should be
traced by the garbage collector. Otherwise "nix-env -u" can crash
randomly.
commit d92ccbf1ac5ab68937a0e411f4daee7e427865bd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 18:01:37 2010 +0000
* Test whether sequences of patches work.
commit 1a211d812f1808a5a9128cbfd74bb59d07487b1c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 17:54:49 2010 +0000
* Oops.
commit a4f0365b2dfc95b60c42a702937fc801dcc8d81b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 17:41:59 2010 +0000
* When checking whether a patch is applicable, for efficiency, use
`nix-store -q --hash' to get the hash of the base path rather than
`nix-hash'. However, only do this for estimating the size of a
download, not for the actual substitution, because sometimes the
contents of store paths are modified (which they shouldn't, of
course).
commit 3d38a498404bf842ca479d42d18def1f472a6fb0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 17:32:25 2010 +0000
* In the download size indication, take binary patches into account.
Hopefully this doesn't slow things down too much.
commit f69626ed3eb9314bbdf9b0fe5497a0c3a3465d31
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 15:45:09 2010 +0000
commit a07c68f05edd754e389e0757ed2deefd70aad364
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 15:30:07 2010 +0000
* Finally, a test for the binary patch functionality.
commit bf658f016ff16af79535358c8e609a933b86e6d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 14:39:02 2010 +0000
* Test that download sizes are shown correctly.
commit 1e24cbaba3a7b553569c72afddeb825001ae1dd7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 14:35:14 2010 +0000
* Fix the test.
commit bdf089f46362b8c9defefa0a14e3198582e12818
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 14:31:42 2010 +0000
* Before a build, show the disk space that the downloaded store paths
will approximately require.
commit 06699d4219019182d9e45ebc613ae1a1df23f257
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 12:57:52 2010 +0000
* Store the NAR size in the manifest.
commit 5693b8a7e246af352c26c258e2af6402601839ed
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 12:51:54 2010 +0000
* nix-push: no need to compute the NAR hash, since the Nix database
already has it (`nix-store -q --hash').
commit e60c962fb8dd3d8be37c1f4ae08d5247901fa129
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 12:40:52 2010 +0000
* Add an operation `nix-store -q --size'.
commit 1db6259076b1b8f667451da8d2e44a55ece19056
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 17 12:08:01 2010 +0000
* Implement RemoteStore::queryPathInfo().
commit a3883cbd28057a3dd2573f77dcda9a26faaac555
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 16 17:11:46 2010 +0000
* Store the size of a store path in the database (to be precise, the
size of the NAR serialisation of the path, i.e., `nix-store --dump
PATH'). This is useful for Hydra.
commit fb9368b5a0b2457b28f19d4902bc0790123338a2
Merge: 64fd298 4aced7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 16 12:49:47 2010 +0000
* Sync with the trunk.
commit 4aced7f8d0d5d2c1057b0f46a70a37a577f81fa5
Merge: 8dadced 26def53
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 29 15:04:39 2010 +0000
* Merge the GC branch.
commit 26def5392f6f6364aa0939a2d4fc7705e786d38d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 29 14:44:02 2010 +0000
* Document Boehm GC support.
commit 3d71c8013efa5d347b9767af54160b3d0fd9127b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 29 14:00:47 2010 +0000
* Use pkgconfig to locate the Boehm GC (as suggested by Ludo), if
--enable-gc is given.
commit 14fbf85380b23efcc19c8479b65336fc7275d90b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 29 13:11:50 2010 +0000
* Set libgc's initial heap size to 384 MiB to prevent garbage
collection in most cases (and therefore its performance overhead).
commit 0c4828ea05798b9e070e233884739736115a830d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 28 12:50:01 2010 +0000
* new(UseGC) is inexplicably slower than GC_MALLOC, so prefer the
latter.
commit e11e6fb1c6709ca3f0e596a7b1fb988df2fbd9b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 28 12:29:40 2010 +0000
* Handle out of memory condition.
commit 8a788e38ac7efc785ffe4fcf49a4e031c7784216
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 10:47:02 2010 +0000
* Install config.h.
commit 11ccd44e95c16b9f7fcf51e75b511b1b6587397b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 24 21:48:59 2010 +0000
* We need Bison 2.4 now.
commit 43535499f38acc04367eeb4dd0d9938e9f8666f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 24 20:09:37 2010 +0000
* When allocating an attribute set, reserve enough space for all
elements. This prevents the vector from having to resize itself.
commit e0b7fb8f2710ec3012afe6b9d2096f770429a389
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 24 19:52:33 2010 +0000
* Keep attribute sets in sorted order to speed up attribute lookups.
* Simplify the representation of attributes in the AST.
* Change the behaviour of listToAttrs() in case of duplicate names.
commit 2dc6d5094183edee523a48d449eab1a376e839a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 24 14:20:02 2010 +0000
* Don't create thunks for variable lookups (if possible). This
significantly reduces the number of values allocated (e.g. from 8.7m
to 4.9m for the Bittorrent test).
commit 0b305c534f989dbc3645ff03e070b0e4665fdeb7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 24 00:41:29 2010 +0000
* Store attribute sets as a vector instead of a map (i.e. a red-black
tree). This saves a lot of memory. The vector should be sorted so
that names can be looked up using binary search, but this is not the
case yet. (Surprisingly, looking up attributes using linear search
doesn't have a big impact on performance.)
Memory consumption for
$ nix-instantiate /etc/nixos/nixos/tests -A bittorrent.test --readonly-mode
on x86_64-linux with GC enabled is now 185 MiB (compared to 946
MiB on the trunk).
commit a247d20604a97ff6e84b87f66e3338714e7964f0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 23 22:58:24 2010 +0000
* Fix compiling without Boehm.
* Fix the stats.
commit 02934b12000d5a837ef4cac78025cb531330c2b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 23 22:55:30 2010 +0000
* Regression test for listToAttr's behaviour if an attribute name
occurs multiple times.
commit b2ba62170cc8359d2f8bbbd9dbacf331b98151fe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 23 21:11:59 2010 +0000
* Optimise string constants by putting them in the symbol table.
commit 8ac06726b92fff66714ceee8af89068ac876875a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 23 20:07:47 2010 +0000
* Make Value smaller by not storing redundant PrimOp info.
* Clear pointers in Values after overwriting them to make sure that no
objects are kept alive unnecessarily.
commit 3f66cfb96b6f4bbddc8bf3b15e364fd522e028bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 23 18:18:07 2010 +0000
* Remove allocValues().
commit 4dee289550d11950d6d17482484061a4792b2eef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 22 15:51:52 2010 +0000
* In environments, store pointers to values rather than values. This
improves GC effectiveness a bit more (because a live value doesn't
keep other values in the environment plus the parent environments
alive), and removes the need for copy nodes.
commit cf7e645a48a31e04428778a8d39924a3da8a30f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 22 15:15:12 2010 +0000
* Regression test for __overrides.
commit 41c45a9b319a5578e2731505ca3de2b9c50b4988
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 22 14:47:42 2010 +0000
* Store Value nodes outside of attribute sets. I.e., Attr now stores
a pointer to a Value, rather than the Value directly. This improves
the effectiveness of garbage collection a lot: if the Value is
stored inside the set directly, then any live pointer to the Value
causes all other attributes in the set to be live as well.
commit 64c3325b0bef8c0234bf797033e129323b36ad1e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 22 13:39:15 2010 +0000
* Make building against the Boehm GC a configure option.
commit 76feaf016a7e9a9b019148df5ff84a63e48dbda7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 20 15:48:00 2010 +0000
* Keep some more stats.
commit e879a0371ba7ef99da2d82547823c3f96b445fdb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 20 11:38:30 2010 +0000
* Use the Boehm garbage collector to reclaim unused memory in the Nix
expression evaluator.
commit b0c11cda7ef9eaef46f9868e3f3736aa72fa641c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 20 09:08:39 2010 +0000
* Evaluator garbage collection branch.
commit 64fd29855a8ae49cacdaff424679821b4fd3bf57
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 14 15:55:51 2010 +0000
* Wrap deleteFromStore() in a transaction. Otherwise there might be a
race with other processes that add new referrers to a path,
resulting in the garbage collector crashing with "foreign key
constraint failed". (Nix/4)
* Make --gc --print-dead etc. interruptible.
commit 8dadcede65c75488da4cc5e5d8266c4b176cb7e5
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed Oct 6 19:04:04 2010 +0000
nix manual: fix 'install' -> 'uninstall' in garbage collection section of introduction
commit 7119d38287659ec665a1a542c23edd1758ad3a1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 22:26:38 2010 +0000
* In the referrers test, lower the nesting depth from 2500 to 1000 to
prevent hitting a stack overflow bug in the garbage collector.
commit 705868a8a96a10f70e629433cfffc2d5cd2703eb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 17:55:38 2010 +0000
* Make sure that config.h is included before the system headers,
because it defines _FILE_OFFSET_BITS. Without this, on
OpenSolaris the system headers define it to be 32, and then
the 32-bit stat() ends up being called with a 64-bit "struct
stat", or vice versa.
This also ensures that we get 64-bit file sizes everywhere.
* Remove the redundant call to stat() in parseExprFromFile().
The file cannot be a symlink because that's the exit condition
of the loop before.
commit 95f4f2cf6102f95abf6948d74907c44c3540eddd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 16:16:19 2010 +0000
* If std::tr1::unordered_set is unavailable, use std::set.
commit 36a23e86b6ab1265bbf883dd71bc844f7c9183f3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 15:50:08 2010 +0000
* "type -P" isn't portable.
commit bfa6ee7d919b84a105f6376116e82240e44b990d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 12:30:46 2010 +0000
* Don't use SSH's `-tt' flag because it doesn't seem to work
on OpenSolaris when using connection sharing. Instead have
the remote side check for disconnection and kill the process
group when that happens.
commit 71dfe4b90bec29075f01cfbc45f8f521535bf460
Merge: e490741 450837b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 11:44:47 2010 +0000
* Sync with the trunk.
commit 450837bcc887a47260817611d01c22e35aba92b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 11:23:07 2010 +0000
* In printMsg(), ignore failing writes to stderr if we're in an
exception handler, otherwise throw an exception. We need to ignore
write errors in exception handlers to ensure that cleanup code runs
to completion if the other side of stderr has been closed
unexpectedly.
commit 4aa92450832e87018513a2453e39858fab00833a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 4 10:51:16 2010 +0000
* Hack needed for GCC 4.3.2 on OpenSolaris.
commit 923736df38c1415150afbe62983daf3fee8726b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 14 12:47:19 2010 +0000
* Doh. Remove debug message.
commit e4907411c2d902215d1a18456ce8b0c653650461
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 1 11:36:22 2010 +0000
* Only do "pragma journal_mode = ..." if the current journal mode
differs from the desired mode. There is an open SQLite ticket
`Executing "PRAGMA journal_mode" may delete journal file while it is
in use.'
commit bf0dde959771661c6893001a7e0779b65d7be490
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 31 12:36:24 2010 +0000
* Always print hook output on stderr, even if --no-build-output is
set.
* In the build hook, print a trace message to allow Hydra to pick up
the name of the remote machine used for the build.
commit e2e168f7c27f5239badf6e8705264bd907d6b82c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 31 11:47:31 2010 +0000
`nix-store --verify' improvements:
* If a path has disappeared, check its referrers first, and don't try
to invalidate paths that have valid referrers. Otherwise we get a
foreign key constraint violation.
* Read the whole Nix store directory instead of statting each valid
path, which is slower.
* Acquire the global GC lock.
commit 80e722278ca03bf303961e2f27487dc98d042803
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 30 14:53:03 2010 +0000
* When using the build hook, distinguish between the stderr of the
hook script proper, and the stdout/stderr of the builder. Only the
latter should be saved in /nix/var/log/nix/drvs.
* Allow the verbosity to be set through an option.
* Added a flag --quiet to lower the verbosity level.
commit 20acd43c25a388f5c31c2ee601f1cac88cf12f7b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 30 14:11:57 2010 +0000
* Disable the GC reachability check for now (when creating new roots),
as it's hopelessly inefficient.
commit 766f7084188d8c0dd0595bbbfc50fbc4f9d67a50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 27 13:18:13 2010 +0000
* Experimental feature: allow a derivation to tell the build hook that
it requires a certain feature on the build machine, e.g.
requiredSystemFeatures = [ "kvm" ];
We need this in Hydra to make sure that builds that require KVM
support are forwarded to machines that have KVM support. Probably
this should also be enforced for local builds.
commit df50916e46d80e640a36076f1c38c355b89999d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 27 12:10:56 2010 +0000
* Oops - "null" was displayed as "true".
commit e41ecbf7303a181fd37026edb72f2f23dde7e73b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 27 11:09:04 2010 +0000
commit e437b0825018b1935f9a849382c12b1df0aeae06
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 25 20:44:28 2010 +0000
* Made the build hook mechanism more efficient. Rather than starting
the hook every time we want to ask whether we can run a remote build
(which can be very often), we now reuse a hook process for answering
those queries until it accepts a build. So if there are N
derivations to be built, at most N hooks will be started.
commit 1a396f3789feefc20bdcd8a355939eb1ec5126c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 25 12:19:30 2010 +0000
* Don't call "cat".
commit 95deba581dc3a93874b13406fb5c4dfb6747bbc3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 25 11:54:11 2010 +0000
* In the build hook, temporarily register the derivation and its
output as GC roots. This prevents a race if the garbage collector
is running during the build.
commit 1e5f5ea2e9f522397c05e710ae32ff7c0b0f1611
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 24 14:27:07 2010 +0000
* Correctly handle SSH failing to establish a connection. Because
this didn't work right, the build hook wouldn't fall back to using
other machines of the desired type.
commit 034f608e004c3206ff99c55c107139c38bfe9408
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 24 14:25:33 2010 +0000
* Don't complain if the stored hash of a path is zero (unknown).
commit f58f51f38007f8bfb1089c3b4c88b6e66da15f39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 24 11:45:44 2010 +0000
* Handle the unlikely case where a derivation has no dependencies at
all.
commit 955d11aae738f7f9c56c51e8ab2eabdf8732aab1
Merge: 5c5ab2b c67eccc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 24 09:56:28 2010 +0000
* Sync with the trunk.
commit c67eccc26d42bce9496024ac77eaa7e4ff725d01
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 24 09:21:59 2010 +0000
* nix-build: pass --cores.
commit 2c8e070e5d75e1d1f610c8493b359a194c30e3b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 17 15:39:35 2010 +0000
* Bump the version number.
commit ed133e6e6443646a21d87cf9a8eb0263f7c3f3fc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 17 14:08:44 2010 +0000
* rpmBuild already includes the disk image in the output name.
commit 2de17f4edcd7ee66b1094d777cdb62ec4a786a8c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 17 10:06:26 2010 +0000
* Update date.
commit 86f65edf4e519224eaa35ebc6bcf98bffe04b3d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 17 07:22:05 2010 +0000
* Document --cores in the manual.
commit b75e1043a3a4bd72086e4007a53f0a1c3211c9fa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 16 13:23:45 2010 +0000
* Typo.
commit 8ec6594d6d77d73c7f961881f6575a56d81ca77f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 16 13:01:31 2010 +0000
* Remove the "tarball" jobset argument.
commit 12721a3a9a5b6f64b9150833a2e682daf9c03e4d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 16 12:38:32 2010 +0000
* Nix 0.16 release notes.
commit 5fb824e896630741b6ca2c1c27d5f293f7d1f84e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 12 13:36:56 2010 +0000
* Urgh, this was supposed to go in the trunk...
commit 5c5ab2bc12472f63a33cc841dcdc57f1ed8ddea5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 12 13:34:34 2010 +0000
* Don't link against pthreads. This was added way back in r211
because Berkeley DB needed it on some platforms, but we don't use
BDB anymore.
On FreeBSD, if you link against pthreads, then the main thread gets
a 2 MB stack which cannot be overriden (it ignores "ulimit -s"):
http://www.mail-archive.com/freebsd-hackers@freebsd.org/msg62445.html
This is not enough for Nix. For instance, the garbage collector can
fail if there is a pathologically deep chain of references
(http://hydra.nixos.org/build/556199). 2 MB is also not enough for
many Nix expressions.
Arguably the garbage collector shouldn't use recursion, because in
NixOS unprivileged users can DOS the garbage collector by creating a
sufficiently deeply nested chain of references. But getting rid of
recursion is a bit harder.
commit 6846ed8b442c20430b816a6b2ec926c841e38e0d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 12 09:21:50 2010 +0000
* Make --cores work when building through the Nix daemon.
commit 5f9aad44caff5b2a2fb22fcf93d6ca129656984d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 11 15:28:02 2010 +0000
* nix-build: recognise --cores.
commit d7875d164884b1a42d9b5ed0d92b55beeeb89a99
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 6 07:51:27 2010 +0000
* Use SQLite 3.7.0.1.
commit 587dc8aa003cc5f676cc7d01b4fea984f5033107
Merge: fd9c77d 750be19
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 17:48:29 2010 +0000
* Sync with the trunk.
commit fd9c77dfc7b90d447e6bfdb4f0d5b521184aeddb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 17:35:59 2010 +0000
* Use SQLite 3.7.0's write-ahead logging (WAL mode). This is a lot
faster than the old mode when fsyncs are enabled, because it only
performs an fsync() when doing a checkpoint, rather than at every
commit. Some timings for doing a "nix-instantiate /etc/nixos/nixos
-A system" after modifying the stdenv setup script:
42.5s - SQLite 3.6.23 with truncate mode and fsync
3.4s - SQLite 3.6.23 with truncate mode and no fsync
32.1s - SQLite 3.7.0 with truncate mode and fsync
16.8s - SQLite 3.7.0 with WAL mode and fsync, auto-checkpoint
every 1000 pages
8.3s - SQLite 3.7.0 with WAL mode and fsync, auto-checkpoint
every 8192 pages
1.7s - SQLite 3.7.0 with WAL mode and no fsync
The default is now to use WAL mode with fsyncs. Because WAL doesn't
work on remote filesystems such as NFS (as it uses shared memory),
truncate mode can be re-enabled by setting the "use-sqlite-wal"
option to false.
commit 750be19ae865da3ee03c132a287148f2402ad72b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 12:23:59 2010 +0000
* Remove "auto" and "guess" as synonyms for 0 in the handling of
build-cores and --cores. They're superfluous and just complicate
the parsing.
commit 7f893b7a43fdca728fd1f7a72e51d31d2a6e7147
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 12:13:58 2010 +0000
* Allow derivations to hint that they should not be built remotely
using the build hook mechanism, by setting the derivation attribute
"preferLocalBuild" to true. This has a few use cases:
- The user environment builder. Since it just creates a bunch of
symlinks without much computation, there is no reason to do it
remotely. In fact, doing it remotely requires the entire closure
of the user environment to be copied to the remote machine, which
is extremely wasteful.
- `fetchurl'. Performing the download on a remote machine and then
copying it to the local machine involves twice as much network
traffic as performing the download locally, and doesn't save any
CPU cycles on the local machine.
commit 315d8fbd7570532e008b03d50226f53fa9e460db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 09:32:42 2010 +0000
* Set the default system filter to "*". This ensures that (for
instance) "nix-env -i wine" works on x86_64-linux, even though Wine
is built on i686-linux. In the event that there are multiple
matching derivations, prefer those built for the current system.
commit 6d6200f37afe10e8da3b08582a926245538af5d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 2 16:31:05 2010 +0000
* Optimisation in the // operator: if one of the sets is empty, return
the other set.
commit 7af6a2fd71e95bdc28e0015b1e89a9b81ef32711
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 2 11:54:44 2010 +0000
* intersectAttrs: optimise for the case where the second set is larger
than the first set. (That's usually the case with callPackage.)
commit 532d766c279daf190728b4815b92f04623e7fb7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 21 11:30:23 2010 +0000
* Don't barf if the source NAR for a patch has disappeared.
commit 7e043d28a64b38e18511140a9a42494977ca6015
Author: Peter Simons <simons@cryp.to>
Date: Thu Jul 15 14:35:20 2010 +0000
src/bsdiff-4.3/Makefile.am: include the 'compat-include' directory in distribution tarballs
commit 60b632b173e633cc5346f8a5491ef637e1f78166
Author: Peter Simons <simons@cryp.to>
Date: Fri Jun 25 14:05:37 2010 +0000
tests/build-hook.hook.sh: prefer more portable `...` syntax over $(...) for running sub-shells
The /bin/sh interpreter on Solaris doesn't understand $(...) syntax for running
sub-shells. Consequently, this test fails on Solaris. To remedy the situation,
the script either needs to be run by /bin/bash -- which is non-standard --, or
it needs to use the ancient but portable `...` syntax.
commit a0d29040f79b365598fe75d01f72d29ab538206b
Author: Peter Simons <simons@cryp.to>
Date: Thu Jun 24 22:22:24 2010 +0000
Revert "configure.ac: make flex and bison required programs"
This reverts commit 22405. Apparently, these programs aren't necessarily
required when building from a release archive.
commit af09fe12ddf356d93855cfe7b84d607e3103103a
Author: Peter Simons <simons@cryp.to>
Date: Thu Jun 24 17:51:31 2010 +0000
Fix build of bsdiff-4.3 on machines that don't have <err.h>, such as Solaris.
commit d63375d52998e91c4d79563727baa29eb0753251
Author: Peter Simons <simons@cryp.to>
Date: Thu Jun 24 17:51:24 2010 +0000
configure.ac: Incredibly enough, tr(1) on Solaris doesn't understand A-Z syntax for ranges.
commit 4c21c016c578ced9d612ea3040ea225e57c477ec
Author: Peter Simons <simons@cryp.to>
Date: Thu Jun 24 17:51:19 2010 +0000
configure.ac: make flex and bison required programs
The build fails if these tools aren't available.
commit bcec46057c0a99be3f0094cddfe0b06f27919f74
Author: Peter Simons <simons@cryp.to>
Date: Thu Jun 24 17:51:13 2010 +0000
src/libutil/util.cc: include <limit.h> to ensure that PATH_MAX is defined
commit a17071fef15115dc0e7052ebe091ffe8457f77d0
Author: Peter Simons <simons@cryp.to>
Date: Thu Jun 24 17:51:04 2010 +0000
Include <cstring> to ensure that strcpy(), strlen(), and memset() are declared.
An "using namespace std" was added locally in those functions that refer to
names from <cstring>. That is not pretty, but it's a very portable solution,
because strcpy() and friends will be found in both the 'std' and in the global
namespace.
commit 560ab22f7db8238672ed3117ef8bf0de8baf9155
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 23 21:11:33 2010 +0000
* Ignore packages that don't have a version.
* Work on a manifest instead of a channel directory.
commit 8b7f8b56f11145c1be5188113cbcdbea27e99525
Author: Peter Simons <simons@cryp.to>
Date: Wed Jun 23 14:34:08 2010 +0000
Added support for passing an (impure) NIX_BUILD_CORES variable to build expressions.
This patch adds the configuration file variable "build-cores" and the
command line argument "--cores". These settings specify the number of
CPU cores to utilize for parallel building within a job, i.e. by passing
an appropriate "-j" flag to GNU Make. The default value is 1, which
means that parallel building is *disabled*. If the number of build cores
is specified as 0 (synonymously: "guess" or "auto"), then the actual
value is supposed to be auto-detected by builders at run-time, i.e by
calling the nproc(1) utility from coreutils.
The environment variable $NIX_BUILD_CORES is available to builders, but
the contents of that variable does *not* influence the hash that goes
into the $out store path, i.e. the number of build cores to be utilized
can be changed at will without requiring any re-builds.
commit 87ef5907e97f455bd4064f4d6e5f3c972402a8b9
Merge: 3e5e0fa 819548d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 14:42:34 2010 +0000
* Sync.
commit 819548d92f45d8aea671ca9a3e938ff928679063
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 14:41:22 2010 +0000
* Pass `--fallback' to the remote build to ignore failing
substituters.
commit 3e5e0faf9cf93c01fb621774c0c3c50ce51bdd91
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 11:08:09 2010 +0000
* Okay, putting a lock on the temporary directory used by importPath()
doesn't work because the garbage collector doesn't actually look at
locks. So r22253 was stupid. Use addTempRoot() instead. Also,
locking the temporary directory in exportPath() was silly because it
isn't even in the store.
commit bf87cc44b4484df74388b526c89884fea166ab7f
Merge: d1f6c0c b571891
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 07:55:38 2010 +0000
* Sync with the trunk.
commit b57189174f6e11c3e9e0f7c65c08a72f689fe194
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 14 08:34:48 2010 +0000
* In importPath() and exportPath(), lock the temporary directory to
prevent it from being deleted by the garbage collector.
commit f16fe2af8d59fef156c29077a240a832d3e60ef2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 10 10:29:50 2010 +0000
* builtins.toXML: propagate the string context. This is a regression
from the old ATerm-based evaluator.
commit d1f6c0cbe39b509545f809f08cbd580859f38e34
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 8 13:38:28 2010 +0000
* Replacing ValidPath rows doesn't work because it causes a constraint
violation of the Refs table. So don't do that.
commit 07ca66cf242eef3c7a6396e9353e48037034498b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 4 13:56:11 2010 +0000
* Applied a patch from David Brown to prevent `nix-store --optimise'
from failing on rename() on BtrFS.
commit 1ab67cf437704f51f514e2ab7856e3c87f3c88b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 2 09:43:04 2010 +0000
commit 89865da76d87292e5bc61f324b1ac892d40236e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 1 11:19:32 2010 +0000
* Turn build errors during evaluation into EvalErrors.
commit a443c7573b3d76a6db107e6de974205e605a2738
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 1 10:01:14 2010 +0000
* Hack to allow derivations to disable chroot builds by setting the
attribute "__noChroot = true" (requested by Rob).
commit 8bcdd36f10c5adfd312493c822c95c6fa5fbd110
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon May 31 16:36:24 2010 +0000
Add XML output to `nix-store'.
* src/nix-store/Makefile.am (nix_store_SOURCES): Add `xmlgraph.cc' and
`xmlgraph.hh'.
* src/nix-store/help.txt (Operations): Document `--xml'.
* src/nix-store/nix-store.cc (opQuery): Handle `--xml'.
* src/nix-store/xmlgraph.cc, src/nix-store/xmlgraph.hh: New files.
commit da52f8bea0620cd55e10a8ec90306fa169f2d14f
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon May 31 16:36:20 2010 +0000
Comment out dead code in `nix-store'.
* src/nix-store/dotgraph.cc (pathLabel): Move within #if 0 section.
commit 7343e6c8ae6d18f38f42a0714212ca5deb957c39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 30 20:29:56 2010 +0000
* Remove an accidentally committed debug statement.
commit b92a2e5cc2c4f6a14ceea75dfd3bcf5f64743b2f
Merge: 32539e4 93cd5a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 20 12:36:03 2010 +0000
* Sync with the trunk.
commit 93cd5a4a13742b48bb1db0cafe36dd90b7abc10d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 18 10:36:37 2010 +0000
* The << operator on values should be const.
commit 32539e41d5aac3daef4a02ad47da785cbaa651e2
Merge: aa45027 b2235d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 16 17:16:00 2010 +0000
* Sync with trunk.
commit b2235d81d1b3733a93fdd1397a62d0f49409dcb0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat May 15 08:10:12 2010 +0000
* Restore the __overrides feature that was lost somewhere in the
fast-eval branch.
commit aa45027818af8976dc73e6a299d5d918e5c51df1
Merge: a0e3b84 8032f26
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 22:13:09 2010 +0000
* Sync with the trunk.
commit 8032f26ca0bd2233de066ce5786ff976bbd641ae
Merge: 4750065 bd25ac2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 13:59:36 2010 +0000
* Merged the `fast-eval' branch.
commit bd25ac2260267abd2181324e1650820da70e5e60
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 12:15:49 2010 +0000
* Print attributes in sorted order.
commit 81a4b4e49bf82f17eef20d78c4f505874cf5532e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 11:23:44 2010 +0000
* Implemented tryEval, the last missing primop in the fast-eval
branch. Also added a test for tryEval.
commit 1a8eb6e3ec9329ee7b61ac2345c6e1d994905813
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 7 15:26:33 2010 +0000
commit 83dfa898706e1faa491b3a50ea20baf60abda387
Merge: 01e58ad 4750065
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 7 14:46:47 2010 +0000
* Sync with the trunk.
commit 01e58adce0767f1a484d80fcbcf67c7945cbc146
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 7 12:43:57 2010 +0000
* Store position info for inherited attributes.
commit 83d7b89660ebb942ad844b9be260492b2ea9fb24
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 7 12:33:14 2010 +0000
* Updated addErrorContext.
commit e2d5e40f4fdd98e5d2ad7b77c00fb97caa3aa259
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 7 12:11:05 2010 +0000
* Keep track of the source positions of attributes.
commit 84ce7ac76feab6e9a5c074bd1b9550ae543d1db8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 6 16:46:48 2010 +0000
* Store attribute positions in the AST and report duplicate attribute
errors with position info.
* For all positions, use the position of the first character of the
first token, rather than the last character of the first token plus
one.
commit 4750065ada362bd46e85879975a3148e18df5b0c
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed May 5 20:46:41 2010 +0000
buildenv: Special-case Python's `site.py' and `site.pyc'.
* corepkgs/buildenv/builder.pl.in (createLinks): Skip `site.py' and
`site.pyc' files.
commit a0e3b84fac56cad6377ecd1462058a6b29bb1ea8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 12:42:58 2010 +0000
* Revert r15436. This was a workaround for a bug in btrfs which seems
to have been fixed now.
commit f92c9a0ac585d30e245c6667cbce4b035659cb11
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 10:45:10 2010 +0000
* Allow unprivileged users to do `nix-store --clear-failed-paths' and
`nix-store --query-failed-paths'.
commit 4bab25a28d32f0551ac20b8b9b33e79af5decf0a
Author: Ludovic Courtès <ludo@gnu.org>
Date: Mon May 3 13:13:38 2010 +0000
buildenv: Special-case Python's `easy-install.pth' files.
* corepkgs/buildenv/builder.pl.in (createLinks): Skip `easy-install.pth'
files. Comment the hack.
commit 7fa338f4bac16f83b65b95fb0397b534d5ba5d5b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 2 21:27:50 2010 +0000
* Don't use smart quotes where normal ASCII quotes are intended.
Actually, don't use quotes at all. (Reported by Howard B. Golden.)
commit c82782f9a5190c7489fb8e9bd6876b247b0de0bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 27 09:05:11 2010 +0000
commit c778ed17687a506c46c107a7adb1f3173d8136da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 13:39:55 2010 +0000
* Fix the copy-from-other-stores substituter.
commit ef337f7089e484929be92114dac5455d00cebb45
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 12:58:12 2010 +0000
commit 6199f9b93ee234139906792c8c1b4908a35df146
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 12:56:42 2010 +0000
* Added a command `nix-store --clear-failed-paths <PATHS>' to clear
the "failed" status of the given store paths. The special value `*'
clears all failed paths.
commit 2398af13c53217b5de5821bac0f0c44e9081c23d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 12:43:42 2010 +0000
* Add an command `nix-store --query-failed-paths' to list the cached
failed paths (when using the `build-cache-failure' option).
commit d77331d32f33cc17398d3e1422d0114309ef62de
Author: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Sun Apr 25 20:52:49 2010 +0000
Fixing a typo in the nix-store manual, that could confuse a bit too much (--delete/--gc)
commit 2be6118f4c7e909f36d5563ad0ea70780f30cc10
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 23 09:09:32 2010 +0000
* Don't need the test program anymore.
commit 0bc468f195e37a8a5f4f8b36ae6c92459e8ca652
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 22 15:08:09 2010 +0000
* Simplify the implementation of `with'. This gives a 7% speedup in
evaluating the NixOS system configuration.
commit ee0384fb966b7a9bd202fa6fb447788be30c4ce4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 22 11:34:15 2010 +0000
commit ebade9ff8b8557bdae7cdaf9f70c12ceeb3dc02c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 22 11:02:24 2010 +0000
* Check for duplicate attribute names / function arguments. `make
check' now succeeds :-)
* An attribute set such as `{ foo = { enable = true; };
foo.port = 23; }' now parses. It was previously rejected, but I'm
too lazy to implement the check. (The only reason to reject it is
that the reverse, `{ foo.port = 23; foo = { enable = true; }; }', is
rejected, which is kind of ugly.)
commit 2d7636529f782b552b634497fd8ac876aae72fcc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 22 09:54:11 2010 +0000
* String equality tests should take the context into account. All the
evaluation test cases now succeed.
commit 6bbfe95e3012effa0df79066ae129ce9828a8ff2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 19:25:50 2010 +0000
* Don't use an ostringstream in unparseDerivation(), because it's
slow. A `nix-env -qa --drv-path \*' on Nixpkgs was spending 40% of
its time in unparseDerivation() because of this (now 11%).
commit 7148df797174ff742fdd8cee3c2d92e6340ee930
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 16:22:03 2010 +0000
* Update the expected test output (no longer an ATerm).
commit 6f0f16497a8ce671c2aa9ff3cd9a27eb1f931cf2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 16:18:27 2010 +0000
* Fix the interpretation of ''\<character> in indented strings.
commit cae4efdca3a207b97244aef96161ad2974ec4e50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 16:02:12 2010 +0000
* Because --parse-only no longer produces an ATerm, don't check the
output. Whether it parses at all should be enough.
commit 0777448ca68175b6daf3d8f5374cf43523828c47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 15:57:11 2010 +0000
* Fixed builtins.genericClosure.
commit fe2d869e04372de69719c3989a75247ff44b8fd4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 15:08:58 2010 +0000
* Store user environment manifests as a Nix expression in
$out/manifest.nix rather than as an ATerm.
(Hm, I thought I committed this two days ago...)
commit d66ea83a763a36e7e7b9558b90abcfe09bec1b85
Merge: f71ea9c aac5fcf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 20 09:20:29 2010 +0000
* Sync with the trunk.
commit f3b8833a48472c3545ea8673d687ea9cadcedd61
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 19 14:51:58 2010 +0000
* Drop the dependency on the ATerm library.
commit efc7a579e880ec15ebe9afc0d8766c85c7d53ec2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 19 13:46:58 2010 +0000
* Don't use the ATerm library for parsing/printing .drv files.
commit 55b5ddd3ca1ff4dfe4cfbfab92a4025d88ef6443
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 19 12:10:04 2010 +0000
* Added parsing of manifests in ATerm format.
commit b7ff69eb7c3f97c33ec18c51ab87b7f3dd967052
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 19 10:47:56 2010 +0000
* Refactoring: move the user environment stuff into its own module.
commit 5c31995bb8adb9189152ebd4f3c41ca9e8049749
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 16 15:13:47 2010 +0000
* Updated some more primops.
commit 8bb0210fea89f2df70b3c10c431b1383e74093df
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 16 14:07:52 2010 +0000
* _combineChannels shouldn't be an integer.
commit 8ca4a001cb9e8ca2556c26a1b559b0322a8fb46a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 16 14:03:26 2010 +0000
* Improve sharing a bit.
commit 497e4ad12650e27ecbaf0e056fe0c54bc12a138b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 16 13:51:01 2010 +0000
* Remove some redundant tests.
commit 02c1dac90934e1b833c4d6bd9280bda27c146d80
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 16 13:44:02 2010 +0000
* In an nested `with' where the inner with is a variable (`with ...;
with someVar; ...'), the contents of the variable would be
clobbered. (The attributes in the outer `with' were added to the
variable.)
commit 04c4bd3624b094043ff0f2410c1e376a51f457f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 15 00:37:36 2010 +0000
* Store lists as lists of pointers to values rather than as lists of
values. This improves sharing and gives another speed up.
Evaluation of the NixOS system attribute is now almost 7 times
faster than the old evaluator.
commit e41b5828db0c154e4a3f0ed6299a987fde5bc03f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 23:48:46 2010 +0000
* Better stats.
commit d39d3c6264707c466b21dfadd4d48653842a9156
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 23:25:05 2010 +0000
* Implemented inherit.
commit 267dc693d2ca8dea13199f92c265fc35fdb047f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 22:59:39 2010 +0000
* Fix builtins.
commit 81de12bc8fa09a89dae958a3ffc93e7a4c245db1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 15:14:23 2010 +0000
* Refactoring: move variable uses to a separate class.
commit 110d1557782fac4f8cafa27e5cbbcdebefb7a4c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 15:01:04 2010 +0000
* Implemented withs.
commit 9985230c00226826949473c3862c0c3afea74aaf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 14:42:32 2010 +0000
* After parsing, compute level/displacement pairs for each variable
use site, allowing environments to be stores as vectors of values
rather than maps. This should speed up evaluation and reduce the
number of allocations.
commit 816dd3f0612111718c338842283c1ee6577b9f0a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 12:49:05 2010 +0000
* Remove more obsolete code.
commit 011b5da0f46e9796fc68bc5daf5fe4dd4b57f933
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 09:39:06 2010 +0000
* Get nix-env to compile again.
commit 85d13c8f93c8b251f5883d9b38051b33bab1ad3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 08:37:08 2010 +0000
* Change the semantics of "with" so that inner "withs" take
precedence, i.e. `with {x=1;}; with {x=2;}; x' evaluates to 2'.
This has a simpler implementation and seems more natural. There
doesn't seem to be any code in Nixpkgs or NixOS that relies on the
old behaviour.
commit 816f9c0f6fae0229961bb573dfa0f75ff42c14eb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 13 14:34:11 2010 +0000
* Use std::tr1::unordered_set instead of std::set for the symbol
table. This gives a 10% speed increase on `nix-instantiate
/etc/nixos/nixos -A system --readonly-mode'.
commit 7d47498b5ea1ad4685bad954e5407f628f7f5595
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 13 13:42:25 2010 +0000
* Evaluate lets directly (i.e. without desugaring to `rec { attrs...;
<let-body> = e; }.<let-body>). This prevents the unnecessary
allocation of an attribute set.
commit ac1e8f40d4a5c380d68bb6f1c7cef6f1e7987c1a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 13 12:25:42 2010 +0000
* Use a symbol table to represent identifiers and attribute names
efficiently. The symbol table ensures that there is only one copy
of each symbol, thus allowing symbols to be compared efficiently
using a pointer equality test.
commit 10e8b1fd15d59dc541c15f6da56f8baf58eb3aa3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 23:33:23 2010 +0000
* Finished the ATerm-less parser.
commit 0d272fca799f7e6da955875b2935c19542cd6b4d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 23:31:47 2010 +0000
* Remove some obsolete functions.
commit d4f0b0fc6cdb9ae2fd5fc057d621bc80b36a7b18
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 22:03:27 2010 +0000
* Indented strings.
commit a60317f20fbc8be8e339060d932946f6d99ece6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 21:21:24 2010 +0000
* More missing constructs.
commit 4d6ad5be1738c64b1de4274cafbd4b8f23ca287c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 18:30:11 2010 +0000
* Don't use ATerms for the abstract syntax trees anymore. Not
finished yet.
commit ed711f73bce8786b1a37bd718eb97276d0916484
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 10:38:18 2010 +0000
* Don't use ATerms to represent integers in the lexer.
commit db90b88e655a0d8e501beddee966a124b2f097d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 09:50:20 2010 +0000
* Hack to support builderDefs expressions.
commit 4e490025767093e287a8b7b01de52fee7ae36830
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 09:45:00 2010 +0000
* Doh.
commit c3f228f296321991ef54e46fc621a292824b13e1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 12 09:14:27 2010 +0000
commit aac5fcfbb54ff64c593d8919f7f52025415ea996
Author: Ludovic Courtès <ludo@gnu.org>
Date: Fri Apr 9 21:30:55 2010 +0000
Re-add `drvPath' and `outPath' attributes to <derivation> XML nodes.
This fixes a regression introduced in r20882 ("Add source location
information to the XML output.").
* src/libexpr/expr-to-xml.cc (nix::printTermAsXML): Dereference the
attribute RHS from "drvPath" and "outPath".
commit f3dc7ab877c736ec1500f6b503ab71a62ce90305
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 9 12:00:49 2010 +0000
* Keep more statistics about stack space usage.
* Reduce stack space usage.
commit b7b3dd55f9e30e2eccb54aca22830852c5c2b514
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 8 11:41:19 2010 +0000
* Remove a lot of dead code.
commit 7e048eddf55637b9e81d704f6b9f1fdeca98a5ea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 8 11:25:14 2010 +0000
* Fix blackholing. If evaluation fails due to an assertion failure,
then the blackhole has to be removed to ensure that repeated
evaluation of the same value gives an assertion failure again rather
than an "infinite recursion" error.
commit af2a372bb000d4d5aeec37e43ee0f6245c1bba54
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 7 15:47:06 2010 +0000
* Update autoCallFunction() and findAlongAttrPath().
commit 9a64454faae2ab4ccedeeaad85a0e094726b4765
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 7 13:59:45 2010 +0000
* expr-to-xml -> value-to-xml.
commit fc92244ba81d884e099d467a3b82fbdcbff7fc40
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 7 13:55:46 2010 +0000
* Implemented the primops necessary for generating the NixOS manual.
commit a353aef0b157e7c628fd18640bd6c45215f3e606
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 6 14:15:29 2010 +0000
* In eval(), don't use the target value `v' as a temporary.
Overwriting `v' breaks when the expression evaluation to an
assertion failure or throw.
commit a5ece7d016e72a61ca69a401e833314f538518f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 1 16:59:07 2010 +0000
* Removed the `~' operator.
commit c172274e170a87a30420842ee07ed1f7226d7f2e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 1 14:35:03 2010 +0000
* Quick hack to make coerceToString work more or less correctly on
nested lists. `nix-instantiate' can now evaluate the NixOS system
derivation attribute correctly (in 2.1s on my laptop vs. 6.2s for
the trunk).
commit 7b851915bfbad1c561191a037a2924d2b3d2d398
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 1 12:04:57 2010 +0000
* Improve sharing.
commit 95cc417d76f7d374ef63e0b49a2f83e7b9202b0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 1 10:55:36 2010 +0000
* Functions are incomparable.
commit 71f026292ba1b401237a16ab6e0fb57c36c93df5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 1 09:55:57 2010 +0000
* Make `derivation' lazy again for performance. It also turns out
that there are some places in Nixpkgs (php_configurable /
composableDerivation, it seems) that call `derivation' with
incorrect arguments (namely, the `name' attribute missing) but get
away with it because of laziness.
commit dc31305b381f69de5ac5fd4776df1a802045ff00
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 20:09:20 2010 +0000
* Fixed the trace primop and path comparison.
* Removed exprToString and stringToExpr because there is no ATerm
representation to work on anymore (and exposing the internals of the
evaluator like this is not a good idea anyway).
commit 979f163615745db74f3a94a71818e66c75baf9ac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 19:52:29 2010 +0000
* Handle string contexts. `nix-instantiate' can now correctly compute
the `firefoxWrapper' attribute in Nixpkgs, and it's about 3 times
faster than the trunk :-)
commit d8cd3115d8e1acc9e866c67265668d5268f2c1ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 19:12:08 2010 +0000
* Get nix-env to compile.
commit 55e207b2dc43e426bd0dfbc2065b8853a1fc59b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 16:14:32 2010 +0000
* Cache parse trees to prevent repeated parsing of imported Nix
expressions.
commit 3d94be61ea562dea2098b6570f711386179913ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 15:38:03 2010 +0000
* Implemented derivations.
commit 51876789131e81dca9807c00773158160c3824c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 15:14:23 2010 +0000
commit f061086a93400c34f19eb54f0b34637af9f0d9cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 13:35:29 2010 +0000
* Fix the broken test for listToAttrs.
commit 09381cccffe675ccbc8d183f043788f99dc018cd
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Mar 31 12:38:31 2010 +0000
Make source location info in the XML output optional.
* src/libexpr/expr-to-xml.cc (nix::showAttrs): Add `location'
parameter. Provide location XML attributes when it's true. Update
callers.
(nix::printTermAsXML): Likewise.
* src/libexpr/expr-to-xml.hh (nix::printTermAsXML): Update prototype;
have `location' default to `false'.
* src/nix-instantiate/nix-instantiate.cc (printResult, processExpr): Add
`location' parameter; update callers.
(run): Add support for `--no-location'.
* src/nix-instantiate/help.txt: Update accordingly.
* tests/lang.sh: Invoke `nix-instantiate' with `--no-location' for the
XML tests.
* tests/lang/eval-okay-toxml.exp, tests/lang/eval-okay-to-xml.nix: New
files.
commit 13c2adc897b7f18e9a7784efbd46fabd995d2798
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 11:05:39 2010 +0000
* Implemented `rec { inherit ...; }'.
commit 4c53ca2692f0a1325ec2d085ac3a6ee313b3cdb2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 31 09:54:12 2010 +0000
* Compare nulls.
commit 471419d1fac21412dea9a47eff200d44cd75d825
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Mar 31 08:29:05 2010 +0000
Add source location information to the XML output.
* src/libexpr/expr-to-xml.cc (nix::showAttrs): Dereference the attribute
RHS. Add "path", "line", and "column" XML attributes to the node when
source location information is available.
(nix::printTermAsXML): Likewise for functions.
commit eb07a4f1ee532833407b40a9992bfe65c8a4d1d2
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Mar 31 08:29:01 2010 +0000
Escape `>' signs in the XML output.
* src/libutil/xml-writer.cc (nix::XMLWriter::writeAttrs): Escape `>'.
commit 7f19e03c65693ae6a5eefc7e681b3003676d38eb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 22:39:48 2010 +0000
* More primops.
commit 47df476daa568af9f645b6a039c028e602a7e44b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 18:05:54 2010 +0000
* More operators / primops.
commit c9170be2bd2e735b37db7e7b4ccaca86835cb5c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 15:18:20 2010 +0000
* More primops.
commit c3aa615a5f4a8bdde5d836ce91d5daa743ded065
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 14:39:27 2010 +0000
* More primops.
commit 5b72d8a749e6718986f6e2bfef2ae725981a26ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 13:47:59 2010 +0000
* Implemented `map'.
commit d78a05ab4014d75fd1e394961376f02cff20ed88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 09:22:33 2010 +0000
* Make `import' work.
commit 31428c3a0675f7223470af726bc697dc7a228927
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 29 14:37:56 2010 +0000
* Started integrating the new evaluator.
commit 52090d24185f5092bfd5f8f1fdf0d0890e19a09d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 29 10:13:51 2010 +0000
commit e3f32ac5af69641d12ad07a52f3ab495f61938f1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 29 09:43:55 2010 +0000
commit 807a67bc7430f13e23f28d70780da0e9090e5cf2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 29 09:43:39 2010 +0000
commit 392811eb8fb8125a6ae9661d5a0fb2a8ced31a94
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 28 18:27:07 2010 +0000
* Strings.
commit d96cdcea6b910b9ca169bea0b0b71e65532e70cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 28 16:57:16 2010 +0000
commit 3d2b835f30bf97f2e9ac8a76c4e19be384803219
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 28 16:37:39 2010 +0000
* Implemented multi-argument primops.
commit 45d822f29c84644d1b795bd36999e97f30cfb8ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 26 15:45:53 2010 +0000
* Primops (not yet finished).
commit cad8726b2c7fcefae6b629320283b0f1ee4072a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 26 13:27:26 2010 +0000
* Implemented the `==' and `!=' operators. These now use a deep
equality test, so they also work for (finite) attribute sets and
lists.
commit 8da118e4d03a9ecbd2116eadabd992cfef0479c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 16:35:24 2010 +0000
* Measure stack usage.
commit c2ba4313fb7f2e257f6205eb3fa366376c3010b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 15:38:37 2010 +0000
* Implemented lists.
commit 25eedf085d9b3a1ad7d0e6969b050a2f73234ae3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 14:51:04 2010 +0000
* Quick and dirty implementation of `with'. `with e1; e2' is
basically desugared to `let <with> = e1; e2', and `lookupVar' looks
in each <with> in the environment chain for an attribute with the
specified name.
commit 3c9f8fc9b609b13986a1d59d08a7a79ad42d0bd5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 13:10:04 2010 +0000
* Don't convert variable names to strings.
commit f450384ded92cb68cf4b60b5bd9be64556aff339
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 12:51:14 2010 +0000
* Implement blackholing.
commit ef8bd919fc8e895df402502ffb1727bad0db07b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 12:45:23 2010 +0000
* Implement `...' and default function arguments.
commit 8a10360c912bc344ea9ce7f8871a47a6e036552f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 25 12:19:41 2010 +0000
* Simplify @-patterns: only `{attrs}@name' or `name@{attrs}' are now
allowed. So `name1@name2', `{attrs1}@{attrs2}' and so on are now no
longer legal. This is no big loss because they were not useful
anyway.
This also changes the output of builtins.toXML for @-patterns
slightly.
commit 7482349fe8ba9f285f6c7e53d8573fc367ecff8b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 24 23:40:00 2010 +0000
* Implemented attribute set pattern matches.
commit 0fd3648d34b3ce52d4b55c7d7aedcc81ae32754d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 24 12:41:08 2010 +0000
* Store values in environments.
commit b70bd8fe566a40f3b7c1b4dd96a7d5032d6da9c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 24 12:11:38 2010 +0000
* Reduce the number of value allocations in eval() by moving
responsibility for allocation of the result to the caller.
commit d31c59eb17d181082c955391f4e83a2cff1850a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 24 11:06:05 2010 +0000
* Plain lambdas.
commit e8f7978274708a8e0c29903910f4942da955c926
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 23 19:19:52 2010 +0000
commit 0910ae95680011915211769577a4219384b695af
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 23 17:30:50 2010 +0000
* Start of an evaluator that uses call-by-need (with thunk updating)
instead of (memoised) call-by-name.
commit 90039e0863469da7892830b122ccab017b29e2c8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 23 15:09:29 2010 +0000
* Branch for experimenting with faster / less memory-hungry
Nix expression evaluation.
commit 71be50cc25544f742db2275b4621b92c4e938400
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 23 14:51:32 2010 +0000
* Doh.
commit 3bfd3a4e9511e16d8a826cb271fc95acc2fb9845
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 23 14:26:27 2010 +0000
* Test "with as; with bs;" since nobody knows what its semantics is.
commit f71ea9c911294ec72f52137175ad088a2f50ab97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 23 10:38:59 2010 +0000
* Use SQLite 3.6.23.
commit 141294ff38fb3623ae24c2d47cf0c3180cc363d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 19 11:36:34 2010 +0000
* Clean up error messages in killUser().
commit 74299c1cfb770fee1860e62701cd093faffa0119
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 17 12:12:45 2010 +0000
* Bump version number.
commit c4cfb392d381dd68122d0fcbba71e192d0d11690
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 17 10:08:34 2010 +0000
commit 8e3d98eb41ab0516814fa34cba6198d2472bdd3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 16 13:12:18 2010 +0000
* Release notes for Nix 0.15.
commit f0c473c5f70b8d6dc072da3d6d53a898766546a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 16 13:01:52 2010 +0000
* Fix building on Cygwin (http://hydra.nixos.org/build/325071).
commit fe1b8781ae310bfa6baea80ed475b6c3ae00d991
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 16 12:58:20 2010 +0000
* Fix a broken link (reported by Peter Koppstein).
commit 741b7577c14911fed71b6d52d8d90e88ef2e05ef
Author: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun Mar 14 11:58:07 2010 +0000
Merge r20344 & r20346.
commit 2fb0df83e960d6b39dd43b47cc6168cad3732746
Author: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Thu Mar 11 21:22:52 2010 +0000
Uh. somehow a Makefile tab got in as spaces. Fixing.
commit 13cce8ec45fd59bd8a1f1101a92576796cba97d2
Author: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Thu Mar 11 20:56:25 2010 +0000
Making 'bin2c' to be built with the compiler for the local system.
I copied the configure.ac code about CC_FOR_BUILD from libX11.
commit e020d80e4e7b9c8850fbee378e7bd2118a351a50
Merge: 070057c 05e1504
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 11 15:45:05 2010 +0000
* Sync with the trunk.
commit 05e15049a5f42ca7222c7557d7257352fe711d2e
Author: Ludovic Courtès <ludo@gnu.org>
Date: Thu Mar 11 14:47:04 2010 +0000
Show the build user's group in /etc/group in chroots.
* src/libstore/build.cc (nix::DerivationGoal::startBuilder): Create
/etc/group showing the build user's group.
commit 070057c1b9335ef2c5ff0fe12adb76e214f945ba
Merge: 03afc34 c752c9f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 11 10:52:52 2010 +0000
* Sync with the trunk.
commit c752c9f41aa88ff2129cdc0863fe74f76328835c
Author: Ludovic Courtès <ludo@gnu.org>
Date: Thu Mar 11 10:33:04 2010 +0000
Fix thinko in r20547.
* src/libstore/build.cc (nix::DerivationGoal::startBuilder): Fix the GID
of the build user in /etc/passwd.
commit 2e8eaca573ccda707ff42c136a6f38a34f2975b4
Author: Ludovic Courtès <ludo@gnu.org>
Date: Thu Mar 11 10:21:23 2010 +0000
Clear supplementary groups of `nixbld' in /etc/passwd in chroots.
* src/libstore/build.cc (nix::DerivationGoal::startBuilder): Don't
display any supplementary groups for `nixbld' in /etc/passwd.
commit 03afc34805c0dbd5f354b823cb8391fed99c6539
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 10 13:07:37 2010 +0000
* Simplify.
commit 1a65142ec40c92b2df9973a1fc8d948e146e05d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 10 12:46:25 2010 +0000
* Remove a debug statement.
commit 4c356acd044dffbf459ac895b483b49959042931
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 9 14:32:03 2010 +0000
* In `nix-store --export', abort if the contents of a path has
changed. This prevents corrupt paths from spreading to other
machines. Note that checking the hash is cheap because we're
hashing anyway (because of the --sign feature).
commit 44f6e6de77dd318800775d594b1f33cffa2be9a5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 8 21:31:42 2010 +0000
* Set `gc-keep-outputs' or `gc-keep-derivations' to false with
`--delete --ignore-liveness'.
commit 2e4ef03aa3247782339f3d5af8547b448d38b8d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 8 10:35:45 2010 +0000
* Increase the sqlite timeout.
commit 05fbf61f0e4f2670d23929235e2da5342599d447
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 5 18:26:47 2010 +0000
* nix-prefetch-url depends on sed (see
http://hydra.nixos.org/build/311170).
commit 04791840f4dd4d6bcc96aea133e9fda7c03897de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 5 12:54:58 2010 +0000
* Emit warning='1' or error='1' attributes for lines marked as
warnings or errors with \e[w or \e[e.
commit bc6f7fc139b5a72306a54c89db74bf126cca9ca7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 4 13:03:26 2010 +0000
* Remove some unused functions.
commit fb6e223ddce9b7ff157c5b89569a54562e9eabd1
Merge: 5ff87c9 84a4dd5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 4 12:15:00 2010 +0000
* Synced with the trunk.
commit 5ff87c982e913d14adeba1c4ee833738a6b58293
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 3 16:17:09 2010 +0000
commit e14e2399ed5b1ffc30f08d1f30f19d2ceb24dabb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 20:23:42 2010 +0000
* Prevent a potential memory corruption problem if an ATerm garbage
collection happens during fixAttrs().
commit 158aa8931776c61e19cec62e7cea7c45961fdcc7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 20:22:46 2010 +0000
* Ensure that `make install' works without a prior `make'.
commit 56af8e86e3e00d8417838f582221e60e1d5f5fdb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 20:09:12 2010 +0000
* Protect the `true', `false' and `__overrides' constants. Without
an ATprotect call, these could be garbage collected, leading to
weird crashes or wrong results.
commit 3f9e647ae8c4928a8fc4de0d704119245f58ff45
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 19:04:17 2010 +0000
* checkInterrupt() shouldn't be called from a destructor.
commit d8c5745c41de1a1217cfeac2d4af85146cb87e0f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 17:12:47 2010 +0000
* Support static builds.
commit e07d7284a221a11ceda340dea80ed392e0a8a381
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 16:55:07 2010 +0000
* Fix DESTDIR builds.
commit 5414b3b2dbb539a5d1f3cd48c59178ff1bb3aa08
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 16:40:40 2010 +0000
* Remove the --enable-static-nix flag.
commit 594eaddd1157db8abe2e1c47cdf2180f027559ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 2 15:58:13 2010 +0000
* When using the included sqlite/aterm libraries, build with
--enable-shared.
* In libutil/libstore/libexpr etc., link against sqlite and aterm.
* Some more header file hygiene.
commit 966ffb29a7a7de00f3521da05f325ae8c7e8e35e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 26 13:10:57 2010 +0000
* Update the Valgrind suppressions for ATerm 2.5.
commit 24035b98b155dd2d35414bdf015b3d7ab9a57af7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 26 12:05:01 2010 +0000
* Implement RemoteStore::queryValidPaths().
commit e42401ee7b0c0b166677595d4fd1255176ba33c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 25 15:52:22 2010 +0000
* Implement RemoteStore::queryDerivationOutputs().
commit af565c348a286fb55ad17f8c3c4233465d32a9f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 16:44:43 2010 +0000
* Support read-only access to the database.
commit e33f67ff0b02cc8fc2e0024dd87a6d61467df177
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 16:30:20 2010 +0000
* Refactor the upgrade / database initialisation logic a bit.
commit 84a4dd5ff08ceb7894d8dce662265d7d188e615c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 15:46:06 2010 +0000
* Don't use fdatasync since it doesn't work on Snow Leopard.
* Don't refer to config.h in util.hh, because config.h is not
installed (http://hydra.nixos.org/build/303053).
commit cfe742cfc50e40b590e75200179013dd62b07bde
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 15:07:23 2010 +0000
* A function to query just the database id of a valid path.
commit 6baa2a2f5ef5b11859b95f453338efaf7c5b2724
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 14:39:52 2010 +0000
commit 9fd85c94de90ec91ccf8a4bf04e8911e6e3e483b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 14:22:34 2010 +0000
* Use `truncate' journal mode, which should be a bit faster.
commit fefd467539683e45e3682a54cefc67ead33eb346
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 13:24:27 2010 +0000
* `helpText' is now zero-terminated.
commit 21b134b4e5d150690bc56ede1da3790705d637aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 13:13:39 2010 +0000
commit a3c63d0d6c2570ce3218be809f67dddc5239cdff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 13:12:57 2010 +0000
* Disable fsync() in SQLite if the fsync-metadata option is set to
false.
* Change the default for `fsync-metadata' to true.
* Disable `fsync-metadata' in `make check'.
commit 90b6352d0a5d08dc7feabcfde92653dd1f6e324b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 12:48:00 2010 +0000
* Do registerValidPaths() in one transaction, which is much faster.
E.g. it cuts the runtime of the referrers test from 50s to 23s.
commit fae0427324269e420d8ea5774f2fab2330acda9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 12:25:48 2010 +0000
* ADDITIONAL_NETWORK_LIBS -> LIBS.
commit fa6a4fcb11fa6db1c35cd1199ce8d1dc794e6cd4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 12:18:48 2010 +0000
* Add ${sqlite_lib} everywhere. Just adding it in `libstore' doesn't
work on x86_64 when sqlite is compiled statically.
commit 5954eadf6741e0b4cdab23c414d7a6b470cd06db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 12:16:50 2010 +0000
* Remove the fdatasync check since it's no longer needed.
commit bb82310dba8a70b539122db20712fbd8fd9e840e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 11:06:17 2010 +0000
* Set the path to sqlite3 properly.
commit 69d9df7fe6a0c4043e6f913137b5322bc5c48073
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 11:04:03 2010 +0000
* Don't fork so much.
commit 462bd50aefca3d70e76ccf17f42c2aef4714c95b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 10:57:57 2010 +0000
* Use normal (rather than full) synchronous mode, which I gather from
the description at http://www.sqlite.org/atomiccommit.html should be
safe enough.
commit 8520de4720a798701a41b6ab3e6cf8d6cc71caa3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 24 10:48:57 2010 +0000
* Include the sqlite tarball in the Nix tarball.
commit dc6d1ec67ea7af4e509c171852620befb9184441
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 23 23:24:49 2010 +0000
commit 63b09c5e414f9592f52d4f3a19185df6f8c00e42
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 23 22:31:38 2010 +0000
commit 0efc986ba1c0de97fd0bdb97db2ca6b7a77ee7d4
Merge: b4e6d98 7db2831
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 23 22:14:33 2010 +0000
* Sync with the trunk.
commit b4e6d98fc33df055c8230903bb7d9633042a6374
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 23 22:12:46 2010 +0000
* configure: flag --with-sqlite.
commit 7db2831d3a76bc239bb7a9f7573152ce12413c29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 23 16:17:21 2010 +0000
* Use ATerm 2.5.
commit 5ccb6f64f44671a01d457bcd3afd863055347363
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 23 12:26:35 2010 +0000
* Run ATerm's `make check'.
commit 2b20318b0e968432438a7528b2d11d05585877c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 22 14:24:37 2010 +0000
commit 9cda61694957f2f0428779319f85f626578d0cf0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 22 14:18:55 2010 +0000
* The database needs a trigger to get rid of self-references to
prevent a foreign key constraint violation on the Refs table when
deleting a path.
commit c4d388add4942f6f99a8df12f4e49149005047e2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 22 12:44:36 2010 +0000
* Get derivation outputs from the database instead of the .drv file,
which requires more I/O.
commit 103cfee056cbc8f002929fd5958e305c1a75fe45
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 22 11:44:17 2010 +0000
* Revert r19650 (implement gc-keep-outputs by looking for derivations
with the same name as the output) and instead use the
DerivationOutputs table in the database, which is the correct way to
to do things.
commit 299ff64812ce166d230f1b630f794be226c7a178
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 22 11:15:50 2010 +0000
* Put the derivation outputs in the database. This is useful for the
garbage collector.
commit 1930570ad96e47de9e8557a7734c7bfd9f36f942
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 19 17:15:22 2010 +0000
* Foreign key support in SQLite is not a persistent setting, so enable
it at startup.
* Implement negative caching. Now `make check' passes.
commit 9c9a88e9e25bdc4456368a40691e61acf5d3b330
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 19 16:43:25 2010 +0000
* Implement more stuff.
commit 762cee72ccd860e72c7b639a1dd542ac0f298bb2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 19 16:04:51 2010 +0000
* Implement registerValidPath().
commit 268f9aaf286294c05f34be338ac4ec75e20d1442
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 16:51:27 2010 +0000
* Implemented queryValidPaths() and verifyStore().
commit 836e5b6f5741c845da08490a6fd8ad9a3f37726e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 16:21:59 2010 +0000
* Implemented queryReferrers().
commit 77cb9e3fb19005a40724cb42773d2b11e2528858
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 15:52:57 2010 +0000
* Implement queryPathInfo().
commit 885e22b16e3a6ea2a94014d33de31d756fa32eda
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 15:11:08 2010 +0000
* Implement isValidPath().
commit cfb09e0fadf7db240f4f8c35c35c13b192456b89
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 14:40:07 2010 +0000
* Automatically abort transactions if they go out of scope without
committing.
commit e0305bb7a8b24fe1ea8b36cc2e5fe77ab151ae2f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 14:30:42 2010 +0000
* Some wrapper objects to ensure that SQLite objects are properly
destroyed.
commit a053d2d8e53f2967c64ab2b204727e4c27f06c0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 13:48:18 2010 +0000
* Add the deriver to the ValidPaths table. In principle we could now
store all the derivers of a path efficiently. But that opens a big
can of worms with respect to garbage collector semantics.
commit dbddac0fe91072b402ccb3801c952e3159f0cba4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 13:40:46 2010 +0000
* Assign an integer id to every row in the ValidPaths table in order
to make the Refs table more space-efficient. For instance, this
reduces the size of the database on my laptop from 93 MiB to 18
MiB. (It was 72 MiB with the old schema on an ext3 disk with a 1
KiB block size.)
commit c1a07f94451cfa93aa9ac986188d0e9a536e4b9f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 13:16:59 2010 +0000
* Convert the Nix database to SQLite.
commit eaaa13ce475687ac0d0e2d3c22c7de73a9a83a49
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 18 13:14:51 2010 +0000
* Experimental branch for using SQLite to store the Nix database.
commit 68e55cd9da7902ac8c8859507657cb013e234da4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 16 00:10:39 2010 +0000
* Since Hydra now escapes `+', `=' and `?' to %NN in URIs,
nix-prefetch-url should unescape them, because `%' is not a valid
character in store path names.
commit 3b3e1025c3d94dacb4c19c89f02e6a8684f93e58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 12 10:50:30 2010 +0000
* Typo. Reported by Peter Koppstein.
commit 20186a40791f662696857720d414dd7cd2ace8a2
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Feb 10 15:55:50 2010 +0000
Don't rely on `PATH_MAX' on GNU.
commit d0bf4adb1f8c72640c9e80dee30f96e173dfab87
Author: Ludovic Courtès <ludo@gnu.org>
Date: Wed Feb 10 15:55:46 2010 +0000
Add `.gitignore'.
commit e08dbff9a891ad2ba29c65612780f2a6c7e88750
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 5 10:17:13 2010 +0000
* Fix a broken link (reported by Bjorn Buckwalter).
commit e1e91a37316b97627705864cb4828c17b2e2bfce
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 15:46:04 2010 +0000
* Bump.
commit 817f4f7908c4f4a77a9bcd05aeef1b600a115300
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 14:43:43 2010 +0000
* Grmbl. Timing-sensitive tests are evil.
commit f36b7e7579a72d145ce84a654c5d95a315bb6115
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 14:00:47 2010 +0000
commit 719cebcac2e31e6c9e4f747ae35b8e6800952e0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 09:38:09 2010 +0000
* "Fix" incorrect help message.
commit 443673620d908cb35c569c929701ba6b4c9dfc69
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 02:38:40 2010 +0000
* Don't use ssh's -f flag since it leads to lots of lingering ssh
processes.
commit 7ec5a659252148ad87191108622e9ab7e9712605
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 02:18:29 2010 +0000
* Doh! The scope of $slotLock should extend to the end of the script,
because otherwise the lock will be released at the end of the while
loop.
commit c9b2d80bcda33e3e26c1a2afc7b76e3bc0a8489d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 02:05:34 2010 +0000
* Typo.
commit 3cfe65e516a75696addcf0281674f644a0933ea5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 02:05:22 2010 +0000
* Doh! Calling `system' in an END block causes the exit status in $?
to be changed to 0.
commit e51a276907f46daf8dbc177829f8db05c0e43372
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 01:39:23 2010 +0000
* Remove the `cat' calls when not using --gzip.
commit 408913bbafefdd5a4058013ce1d8791e6c3123f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 4 00:12:57 2010 +0000
* Revert r19796 for now.
commit 4e17be7981026f0317fb12f166282be2d972889e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 21:38:41 2010 +0000
* Revert r19797, and use a simpler solution: just don't monitor build
hooks for silence. It's unnecessary because the remote nix-store
command is already monitoring the real build.
commit f859a8d3c33cc275f41d983bfeff2a21a9f88f1b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 21:22:57 2010 +0000
* While waiting for a lock, print a sign of life every 5 minutes.
This prevents remote builders from being killed by the
`max-silent-time' inactivity monitor while they are waiting for a
long garbage collection to finish. This happens fairly often in the
Hydra build farm.
commit c45de33c67a7273fc87a654696d15010df0f5c6d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 21:13:37 2010 +0000
* Respect @sysconfdir@.
commit d0c32dc135f147ad352e28ff8c648e611516edec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 20:35:37 2010 +0000
* In the build hook, if connecting to a machine fails, try the other
machines of the right type (if available). This makes the build
farm more robust to failures.
commit f56a039775930d4ba2b4504440b7ab37dfefeb75
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 20:12:18 2010 +0000
* Use SSH connection sharing in the remote build script.
* Removed the Cygwin password hack since the problem is apparently
fixed in Visual Studio.
commit bc1e478db160059753c4bf4cb28dd50437a76b27
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 15:34:52 2010 +0000
* nix-copy-closure: start only one SSH connection to the server, or
recycle an already existing connection (using OpenSSH's connection
sharing feature).
commit 4d8a85b8f56625616c993d0bace0a4e856e7f2c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 3 11:00:35 2010 +0000
* Updated the release notes.
commit 3ce5f07793c22c95ebc8b0ddc9b105f5e72623f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 2 17:01:16 2010 +0000
* Ugly hack to make `nix-channel' work on Cygwin.
commit e839802720af75e5af321b46a3921695ed696e79
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 2 15:29:18 2010 +0000
* Don't do a chdir to $tmpDir. It's not necessary, and Windows doesn't
support deleting the current directory.
commit 4bbbe25802ee5d625d05b9566bcc488b93974692
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 2 15:28:36 2010 +0000
* Remove most Cygwin-specific code. Cygwin 1.7 implements advisory
POSIX locks, and simulates Unix-style file deletion semantics
sufficiently. Note that this means that Nix won't work on Cygwin
1.5 anymore.
commit 2723d9b56e2ea15c0c753ae579849806102f4ce0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 2 11:57:49 2010 +0000
* If fdatasync() isn't available, use fsync().
commit 07ffdc28629e537c3811f86b83a93655b73909ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 29 12:22:58 2010 +0000
* Added an option "fsync-metadata" to fsync() changes to
/nix/var/nix/db.
* Removed the function writeStringToFile since it does (almost) the
same thing as writeFile.
commit ad529fb89fb34bea9762eccfc9c2ee6f1f2865c0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 29 11:53:58 2010 +0000
* Don't consider a store path valid if its info file exists but is
zero bytes long. That makes Nix more robust in case of crashes
(especially on ext4).
commit fdcaf37361126793a1416ef5b348e5bf2f0fd1a0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 25 17:18:44 2010 +0000
* Made `nix-store -qR --include-outputs' much faster if there are
multiple paths specified on the command line (from O(n * m) to O(n +
m), where n is the number of arguments and m is the size of the
closure).
commit 50e34891f0e11f400bd50390ede3b7700a2b4db9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 25 16:14:45 2010 +0000
* Disable gzip compression in build-remote.pl because it puts too much
load on the Hydra build farm (where it's unnecessary anyway because
it has a fast connection to the build machines). In any case,
compression can be enabled by using the `-C' option to ssh.
commit 5388944e8d1ca61e23d42a6a0769b925f099f4e1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 25 16:04:32 2010 +0000
* Make the garbage collector do the right thing when `gc-keep-outputs'
is enabled by not depending on the deriver.
commit f0c0277970f8283428b599d8da8089756583a26c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 12 12:22:38 2010 +0000
* On startup, set the default SIGCHLD handler. This is so that Nix
works correctly in weird environments where the SIGCHLD handler is
set to "ignore".
commit ef92a14bfea7a16102b04711c9c18ad717e82ea1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 17 14:12:44 2009 +0000
* Include config.h before the C library headers, because it defines
_FILE_OFFSET_BITS=64. Without it, functions like stat() fail on
large file sizes. This happened with a Nix store on squashfs:
$ nix-store --dump /tmp/mnt/46wzqnk4cbdwh1dclhrpqnnz1icak6n7-local-net-cmds > /dev/null
error: getting attributes of path `/tmp/mnt/46wzqnk4cbdwh1dclhrpqnnz1icak6n7-local-net-cmds': Value too large for defined data type
$ stat /tmp/mnt/46wzqnk4cbdwh1dclhrpqnnz1icak6n7-local-net-cmds
File: `/tmp/mnt/46wzqnk4cbdwh1dclhrpqnnz1icak6n7-local-net-cmds'
Size: 0 Blocks: 36028797018963968 IO Block: 1024 regular empty file
(This is a bug in squashfs or mksquashfs, but it shouldn't cause Nix
to fail.)
commit 945d8218fbcab4e546213f420125bf521ff3306d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 16 15:29:50 2009 +0000
* Build correctly against newer ATerm releases. Fixes "error: 'union'
tag used in naming 'struct _ATerm'".
commit d8a5dc02fc2efbbd386edb4be960d741c0650b8a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 10 13:14:22 2009 +0000
* Build on Fedora 12.
commit 3a78af1e2435074292eb0694afe66ccd64448099
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 9 21:02:24 2009 +0000
* Release notes.
commit 7ca997263680025a7cf5386a44efcb0a9949315e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 9 19:36:54 2009 +0000
* When doing a nix-pull, remove old manifests downloaded from the same
URL. This prevents lots of old cruft accumulating in
/nix/var/nix/manifests.
commit c4c84d1edb4e0dd4ed77a9b2d1386834cdfaaa34
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 9 18:08:28 2009 +0000
* nix-build: be less verbose.
commit bcd6cdf0d8d52bb5d459911bc552260d67c1bb38
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 9 17:45:22 2009 +0000
* Give a better error message when trying to build something and
readOnlyMode is set.
commit 13618b191e923a7ccc861a46be378fd85b0c8412
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 24 13:28:46 2009 +0000
* Grrr.
commit aa5a768720f92076b024c551527e2abfd7ad9848
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 24 12:56:26 2009 +0000
* GCC 4.4 is stricter about the EOF macro
(http://hydra.nixos.org/build/156340).
commit 9b8fda796b620a5476e8a50edcc29a3462667fc3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 24 12:26:25 2009 +0000
* Templatise getIntArg / string2Int.
commit 80220155523fb21c938d595e96597f6511aa7bd0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 24 10:51:52 2009 +0000
* In the garbage collector, don't count files with a link count > 1 in
the "bytes/blocks freed" statistics.
commit f9e766db9875e7ab390df8d405d9719b279efe3c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 24 09:53:18 2009 +0000
* Randomise the order in which we delete entries to make the collector
less biased towards deleting paths that come alphabetically first
(e.g. /nix/store/000...). This matters when using --max-freed etc.
commit ca50c83fbb8f3bfbbcc60203a518d4e5a7aa8349
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 23 21:21:29 2009 +0000
commit 3d55f1eb57c04efc10a093379ea38d6c0aefa588
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 23 18:16:25 2009 +0000
* A command `nix-store --query --roots <paths>' to find the garbage
collector roots that point (directly or indirectly) to the given
paths.
commit ae6bf87273b30258408dc292611f3f50015b843c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 23 17:23:12 2009 +0000
* `nix-store --gc --print-roots': also print the path of the actual
root symlink, not just its target. E.g.:
/nix/var/nix/profiles/system-99-link -> /nix/store/76kwf88657nq7wgk1hx3l1z5q91zb9wd-system
commit c364d5d1e36a9f790b0d610aae1d30d8732b58ce
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 23 16:34:24 2009 +0000
* Made the garbage collector a lot faster. It no longer computes the
complete set of live and dead paths before starting the actual
deletion, but determines liveness on demand. I.e. for any path in
the store, it first tries to delete all the referrers, and then the
path itself. This means that the collector can start deleting paths
almost immediately.
commit 4f7e5f5810380ba4bcdd3c32c37dafb75d8e2f8d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 23 12:48:54 2009 +0000
* Don't create /nix/var/nix/gcroots/{tmp,channels}, since they don't
seem to be used anymore.
commit 8824d60fe549e2fc9b5a852fc1b967eca241ea77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 20 17:12:38 2009 +0000
* Remove the --use-atime / --max-atime garbage collector flags. Many
(Linux) machines no longer maintain the atime because it's too
expensive, and on the machines where --use-atime is useful (like the
buildfarm), reading the atimes on the entire Nix store takes way too
much time to make it practical.
commit 997db91e07882f0555e224a2687189a362567577
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 17 16:22:39 2009 +0000
* Don't pass -K. It should really inherit the setting of the calling
Nix though.
commit 3392d32e8b4202da8d3b013edd6f585e98aa7b02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 13 10:08:31 2009 +0000
* In nix-pull/nix-channel, create the manifests directory if it
doesn't exist. The Debian packages don't include the manifests
directory, so nix-channel would silently skip doing a nix-pull,
resulting in everything being built from source. Thanks to Juan
Pedro Bolívar Puente.
commit 327a232c85de3faa56f9a6117c86e1aa22f88bd6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 6 01:15:44 2009 +0000
* Remove support for old (before Nix 0.12pre12020) databases.
commit c60d796f04f81b17330fbfc1e438ed207b1047f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 5 22:23:38 2009 +0000
* Version bump.
commit e8bad77c7cd3ab11e0c131f138c3d18cdf80dbba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 5 15:20:19 2009 +0000
commit 7680904839bcf6a68c2e772d5d7c4e6e28d952e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 5 14:53:01 2009 +0000
* Build on Karmic.
commit 58f3338bfafe27795995ffc35dc0ecd3ec331197
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 5 14:40:42 2009 +0000
* The Nix .deb package depends on curl.
commit 268d90a03eaab95d13c1326d58fb2287c628aedc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 5 09:07:43 2009 +0000
* Various updates.
commit 1ff8758f762367ffd2517ce7d9d63c6c9746a0ee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 4 16:52:35 2009 +0000
* Manual updates.
commit 8520542071d9ec4c5cc088f9a604d051f4880796
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 22 08:28:33 2009 +0000
* When building in a chroot, make a copy of a file if hard-linking
fails. This is likely to happen after a `nix-store --optimise',
because some files may have 32000 links (NIX-111).
commit 6b9f6b02225035c016cf73868a12aa26bc0ad225
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 22 08:12:38 2009 +0000
* Remove a prototype for a function that no longer exists.
commit deb342fb08fb7b366af482664f44e52f749e63b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 22 08:10:12 2009 +0000
* builtins.trace: in the common case that the value is a string, then
show the string, not the ATerm, so we get `trace: bla' instead of
`trace: Str("bla",[])'.
commit 437077c39dd7abb44b2ab02cb9c6215d125bef04
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 21 15:05:30 2009 +0000
* Added a primop unsafeDiscardOutputDependency needed by Disnix to
pass derivation paths to a builder without actually building them.
commit 6f7d7bc1de110c49e7b41926e4669ce44bc86617
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 13 09:30:17 2009 +0000
* Give a useful error message when an evaluation error occurs while
trying to upgrade a package.
commit 53a4981fa28a9f13758554b643c06e871ede8dbd
Author: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Thu Oct 8 14:50:37 2009 +0000
Added optional parameter which adds -lnsl -lsocket to make the Nix package manager work on OpenSolaris
commit 18f0ff003d711f88a8682131108b101debec3737
Author: Peter Simons <simons@cryp.to>
Date: Tue Oct 6 09:14:06 2009 +0000
configure.ac: use AC_SYS_LARGEFILE to determine how to enable 64-bit file size support
Defining -D_FILE_OFFSET_BITS=64 works on most platforms, but not on all (i.e.
Solaris). Also, the Autoconf macro offers the user a switch to disable the
functionality in case of problems.
commit 96f151783153c62bb19f39d9675b35601003f4d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 30 11:32:04 2009 +0000
* Support platforms that don't have O_ASYNC (e.g. OpenSolaris
apparently).
commit 1a8f8fd86fb89222f6fadab0d9f8a0fb850c8f6f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 30 09:54:29 2009 +0000
* OpenSolaris compatibility.
commit 0f79ad47c5af646ad7a42f86759170df8081899c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 25 12:36:03 2009 +0000
commit c7057fc1f2232a530709a1596b2fe8722ed19aef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 24 07:39:55 2009 +0000
* And some more.
commit 193f59e0771f35e977a4b4606c91c90d5c50ae0a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 24 07:21:29 2009 +0000
* Fix a build failure on Fedora 11. rename() needs <stdio.h>.
commit 0ae2be56927729c251c7a4a45130eba672821af0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 24 07:05:06 2009 +0000
commit 1332dd1ed34b45b7e970111da561f20ffe6bc6b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 23 19:19:26 2009 +0000
* tryEval shouldn't catch all exceptions of type Error, since not all
of them leave the evaluator in a continuable state. Also, it should
be less chatty.
commit 63a17d4bd5e0a9c0f896221017ab518a6cc4c79b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 23 18:52:18 2009 +0000
* Don't build against BDB on Cygwin, it's been broken for unknown
reasons for a while (e.g. http://hydra.nixos.org/build/79164).
commit 676e07902e175666208b5c644ed8427f7684d3d9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 23 18:04:55 2009 +0000
* Darwin hack.
commit 64e89980e880826fec3e973e50edebf24278c7b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 23 17:05:51 2009 +0000
* Create some state directories automatically as a convenience.
commit 48b58617e9e84fd1a0e4bd11798bd6b9d04a1633
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed Sep 23 12:57:15 2009 +0000
* include wait.h for WEXITSTATUS
commit 51ad64cc0791f797c936d8d7b1cef0dec64c0ce3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 18 11:45:56 2009 +0000
* Use xmllint (>= 2.7.4) for RelaxNG validation instead of Jing.
commit df05a759e4b73058ade82b6008c405cc5c75b104
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 18 11:01:30 2009 +0000
* In "make init-state", ignore errors creating /nix/store. Hack to
get the Debian VM builds to work (where /nix/store is a mount point
containing the store of the host).
commit d3de71efc935ac5744dedf22528a6f0c4e38aaf4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 17 17:44:13 2009 +0000
commit e1df4ef73c442ad0fa175a19341bcbab0c2b6450
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 17 17:02:14 2009 +0000
commit 86408b3f47d7b77067c8d35f1488ccdddb0f304b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 17 15:48:17 2009 +0000
* build-remote.pl: Pick machines in a round-robin order, rather than
giving jobs to the first machine until it hits its job limit, then
the second machine and so on. This should improve utilisation of
the Hydra build farm a lot. Also take an optional speed factor
into account to cause fast machines to be preferred over slower
machines with a similar load.
commit 57e0d73c776ef672afe2a20b1f7b39a495894c4a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 17 13:51:04 2009 +0000
* build-remote.pl: allow the system type to be a comma-separated list
of system types. Don't treat the x86_64-linux system type
specially.
commit 0dbd4638e07d224e642b52c1dd0468c3752e2479
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 15 13:01:46 2009 +0000
* Two primops: builtins.intersectAttrs and builtins.functionArgs.
intersectAttrs returns the (right-biased) intersection between two
attribute sets, e.g. every attribute from the second set that also
exists in the first. functionArgs returns the set of attributes
expected by a function.
The main goal of these is to allow the elimination of most of
all-packages.nix. Most package instantiations in all-packages.nix
have this form:
foo = import ./foo.nix {
inherit a b c;
};
With intersectAttrs and functionArgs, this can be written as:
foo = callPackage (import ./foo.nix) { };
where
callPackage = f: args:
f ((builtins.intersectAttrs (builtins.functionArgs f) pkgs) // args);
I.e., foo.nix is called with all attributes from "pkgs" that it
actually needs (e.g., pkgs.a, pkgs.b and pkgs.c). (callPackage can
do any other generic package-level stuff we might want, such as
applying makeOverridable.) Of course, the automatically supplied
arguments can be overriden if needed, e.g.
foo = callPackage (import ./foo.nix) {
c = c_version_2;
};
but for the vast majority of packages, this won't be needed.
The advantages are to reduce the amount of typing needed to add a
dependency (from three sites to two), and to reduce the number of
trivial commits to all-packages.nix. For the former, there have
been two previous attempts:
- Use "args: with args;" in the package's function definition.
This however obscures the actual expected arguments of a
function, which is very bad.
- Use "{ arg1, arg2, ... }:" in the package's function definition
(i.e. use the ellipis "..." to allow arbitrary additional
arguments), and then call the function with all of "pkgs" as an
argument. But this inhibits error detection if you call it with
an misspelled (or obsolete) argument.
commit 3bca8931e8861fa4694b1ca31ecc023149e7aa81
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Tue Aug 25 16:06:46 2009 +0000
Adding tryEval builtin. It allows to catch presence of errors in an expression.
commit 5e9a4e5101a76655dd7f1bcd2c1c3afc200552b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 3 13:32:13 2009 +0000
commit 9b46d1ae6fe37f4caf24a39541553c07b5c07342
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 3 12:24:20 2009 +0000
commit 20b6f94b65204f3a7b2e93c31b35f7554f2823a1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 15 09:10:38 2009 +0000
* nix-build: pass the --show-trace flag.
commit d413612029ee44628dea3598f3a67042acf05d50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 14 14:58:12 2009 +0000
* Remove the redundant <sections> around refentries.
commit 1f169f43b31d02c1fad39df16bb4e61c8cb593df
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 10 13:42:12 2009 +0000
* Leave out the collaborators / revision history page.
commit 5e2e2f10efab3ba3e0504fb4d1b374a57dfaeb0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 10 11:48:49 2009 +0000
commit c6890d6b5cf6bb57afd6431382a6459eee47f5b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 2 08:52:12 2009 +0000
* Replace newlines in table output with spaces.
commit 749dd97a54f50467d266dde2b833f272cb556145
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 30 15:53:39 2009 +0000
* Support integers and lists of strings in meta fields. This is
useful for fields like meta.maintainers, meta.priority (which can be
a proper integer now) and even meta.license (if there are multiple
licenses).
commit f2c3fc519190b021f0bb3b66f58d0fe7fc40b0e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 30 13:28:29 2009 +0000
* Don't show trace information by default (`--show-trace' to enable).
NixOS evaluation errors in particular look intimidating and
generally aren't very useful. Ideally the builtins.throw messages
should be self-contained.
commit a2fc3a53ba87d3688dae0554bfdb2fe3fb3dbf2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 18 10:04:14 2009 +0000
* Highlight URLs containing "=" properly.
commit d53603c928ae98eee54bdd06241e898e02efef0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 18 09:56:50 2009 +0000
* Attributes names in attrsets can contain dots now.
commit 14bc3ce3d6d5745717fa19b8b43b5fdd117ff757
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jun 13 16:30:58 2009 +0000
* Canonicalise timestamps in the Nix store to 1 (1970-01-01 00:00:01
UTC) rather than 0 (00:00:00). 1 is a better choice because some
programs use 0 as a special value. For instance, the Template
Toolkit uses a timestamp of 0 to denote the non-existence of a file,
so it barfs on files in the Nix store (see
template-toolkit-nix-store.patch in Nixpkgs). Similarly, Maya 2008
fails to load script directories with a timestamp of 0 and can't be
patched because it's closed source.
This will also shut up those "implausibly old time stamp" GNU tar
warnings.
commit f24cf5d303dac3e82068f80091d2f312455ba8cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 10 11:30:34 2009 +0000
* nix-build: if nix-instantiate or nix-store fails due to a signal
(e.g. out of memory or a segfault), print an error message.
Otherwise the user doesn't see anything.
commit c6cb792d48a8b4290df15202ec30b06a3383dc6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 26 16:32:02 2009 +0000
commit a64bbe049e19618c33a878154f2e69029d45ecd7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 15 13:46:13 2009 +0000
* Change the scoping of "inherit (e) ..." in recs so that the
attributes of the rec are in scope of `e'. This is useful in
expressions such as
rec {
lib = import ./lib;
inherit (lib) concatStrings;
}
It does change the semantics of expressions such as
let x = {y = 1;}; in rec { x = {y = 2;}; inherit (x) y; }.y
This now returns 2 instead of 1. However, no code in Nixpkgs or
NixOS seems to rely on the old behaviour.
commit d407d572fdc72f4eb14cc0f37d7d61446425b663
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 15 12:35:23 2009 +0000
* Some syntactic sugar for attribute sets: allow {x.y.z = ...;} as a
shorthand for {x = {y = {z = ...;};};}. This is especially useful
for NixOS configuration files, e.g.
{
services = {
sshd = {
enable = true;
port = 2022;
};
};
}
can now be written as
{
services.sshd.enable = true;
services.sshd.port = 2022;
}
However, it is currently not permitted to write
{
services.sshd = {enable = true;};
services.sshd.port = 2022;
}
as this is considered a duplicate definition of `services.sshd'.
commit e42975490fa96e811c9fd80435ce20c26f8603f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 14 14:29:45 2009 +0000
* Check for duplicate attributes in fixAttrs, rather than doing a
separate traversal after parsing. Likewise, check for duplicate
pattern variables right away.
commit 50d11b90caf6545556fc090858c694e19f3c7683
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 12 11:06:24 2009 +0000
* Allow unsafe (unspecified) comparisons between attrsets unless
NIX_NO_UNSAFE_EQ is set, for now.
commit c34e6d71bc62bb83f3bfed69f781ded4d5a46d3a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 11 15:50:14 2009 +0000
* Disallow equality tests between attribute sets. This was always
broken, but now the evaluator checks for it to prevent Nix
expressions from relying on undefined behaviour. Equality tests are
implemented using a shallow pointer equality test between ATerms.
However, because attribute sets are lazy and contain position
information, this can give false positives. For instance,
previously
let y = {x = 1;}; in y == y
evaluated to true, while the equivalent expression
{x = 1;} == {x = 1;}
evaluated to false. So disallow these tests for now. (Eventually
we may want to implement deep equality tests for attribute sets,
like lib.eqStrict.)
* Idem: disallow comparisons between functions.
* Implemented deep comparisons of lists. This had the same problem as
attribute sets - the elements in the list weren't evaluated. For
instance,
["xy"] == [("x" + "y")]
evaluated to false. Now it works properly.
commit 9536ba19d437a82d4b521709b49ef6977321b692
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 13:22:26 2009 +0000
commit 83bd320b39c5d12ff4a40bea47177011fa1c7599
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 13:12:46 2009 +0000
* Build a PDF version of the manual in the tarball job (it's not
included in the tarball though).
commit f751c2966b98d14bbb0337abeca1cb1106e09136
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 13:11:58 2009 +0000
* Don't have a bugs section in the manual. Bugs should be kept in the
bug tracker.
commit 404996ca1f2089511b90666ce092377ade830139
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 12:57:04 2009 +0000
* Produce the manual in the tarball job.
commit 7660e2a0684e57c2f7f014a6f457b7866e2b9e22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 11:35:52 2009 +0000
* Remove a right recursion that causes the parser to barf on very long
lists. The comment about ATreverse requiring unbounded stack space
was unfounded anyway.
commit 52a9ba96f53be0a36f8229a14126302c5de966a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 11:34:08 2009 +0000
* Include the version file.
commit 6a5599fd014af87ccffd20e5fa172d8b561636d1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 7 11:33:57 2009 +0000
* Typo.
commit 098cb9d233ff7e1568b55e88dacf52e1dc8eebab
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Mon May 4 08:10:24 2009 +0000
Add an ftruncate call paired with fallocate to play safe with some FSes (namely, BtrFS fallocate sets file size to allocated size, i.e. multiple of block size)
commit c710fe540e3763d821eab74621b43d9422cb7e92
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 21 12:42:47 2009 +0000
* Machines of type x86_64-linux can do i686-linux builds.
commit d5eab2fc8293e0d14c7fd297bf7512257442295b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 21 11:52:16 2009 +0000
* Use foreach in a lot of places.
commit 8f1bf28505e6ba8fae35859391cbab7264b0014a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 21 11:06:27 2009 +0000
* nix-store --verify: don't bail out if a referenced path is missing.
(It can't fix it though.)
commit 4e646b0ddb81e1fbf1159ad66a41de848fe93930
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 16 12:03:17 2009 +0000
* Fix a few "comparison is always false/true due to limited range of
data type" warnings on 64-bit platforms. The one in parser.y is
likely to be a real bug.
commit 0460ea4c395cc45e510d13fbf12930dd3d221305
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 16 09:27:33 2009 +0000
* Cleanup.
commit dfb863f3339ee7e43c83803ade2d9fdf418399b7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 15 06:25:02 2009 +0000
* Don't cache transient build hook problems.
commit 435a93b5d845a6fa90675675060ca3cc2d2a650d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 14 13:03:27 2009 +0000
* Remove references to __XXX primops.
commit 8b2a01a8c238f36a71157e4c2f8e6cf6ee6f5309
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 14 12:02:22 2009 +0000
* Release notes.
commit 50cb6f978218c00f2fee52cef8939f2ef8d4f2b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 2 08:16:15 2009 +0000
* Debian packages: use /etc, not /usr/etc.
commit 351bf658f99e91b41d2b11f994f799dd34a600e2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 31 21:14:07 2009 +0000
* Do a substitution even if --max-jobs == 0.
commit cff2b2a13aea7cf30c0ef5be449e355594dc80c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 31 15:50:03 2009 +0000
* Doh!
commit 160a60d663039cc26e73d0359fcbce12b30a7d3d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 30 19:35:55 2009 +0000
commit 805144b705305fc6ba22645cebf52daaf835ca49
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 30 11:34:03 2009 +0000
* Make the poll interval configurable.
commit 096affb55b06c1280df9ff6b1fd5111d5745b57a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 29 18:40:44 2009 +0000
* Update the mtime on the lock file to make it easy to see when a slot
was last used.
commit cbc1f57b48dc9b8f0c679e004ee407d3cf27d5c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 29 18:08:32 2009 +0000
* Undocument the "system" option. No sane person would use it :-)
commit 7377195297e66c02e91caab700e7984e4c6a904a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 29 18:06:00 2009 +0000
* With `--max-jobs 0', print a nicer error message than "Assertion
`!awake.empty()' failed."
commit 737423a89c4b5f666fb4daf61775764b66911cf1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 29 18:00:45 2009 +0000
* Use polling to wait for a remote build slot when using a build hook
(that is, call the build hook with a certain interval until it
accepts the build).
* build-remote.pl was totally broken: for all system types other than
the local system type, it would send all builds to the *first*
machine of the appropriate type.
commit 47706e3924cf592a4e0085eb2e45f0e84b67f933
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 28 21:10:29 2009 +0000
* nix-copy-closure: compute the closure in one call to nix-store,
which is much faster.
commit 6e946c8e72e0fd2baa58cab484a34debd2ae906d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 28 20:51:33 2009 +0000
* Scan for references and compute the SHA-256 hash of the output in
one pass. This halves the amount of I/O.
commit c7152c8f97d01dda4eeb70869a0d28cc9a04df1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 28 19:41:53 2009 +0000
* Don't use the non-standard __gnu_cxx::stdio_filebuf class.
commit 3a2bbe7f8ad7ec8b2896ff5e666b8f5525691c6f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 28 19:29:55 2009 +0000
* Simplify communication with the hook a bit (don't use file
descriptors 3/4, just use stdin/stderr).
commit 7fb548aa2621375559f980b4627955dbc6fe9914
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 28 16:12:46 2009 +0000
* Clean up the output a bit.
commit f54e800366b3c8540c60f0a35c407ad701e2f622
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 28 16:12:27 2009 +0000
* The `fixedOutput' variable didn't get initialised when using a build
hook, causing negative caching to fail randomly.
commit 38f98b32822efa35a050b26d7ab5bbd561c9e529
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 27 22:40:22 2009 +0000
* Argh, stupid timing sensitive tests...
commit e23a7a8b7b37f493327b7f73350140811cccdb37
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 27 14:20:03 2009 +0000
* Debian 5.0, Ubuntu 8.10 builds.
commit cb85bc396e7ee291bfd5c22b2a9edf3c85b49c5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 27 14:19:04 2009 +0000
* Create /nix/store if it doesn't exist.
commit 61686926d12e55052480bd0ff2297e69cd6c364f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 26 14:12:42 2009 +0000
* A job for creating a fully statically linked binary tarball.
commit 9856efc7b0d5653aea17f1f7e58c6ff97a0b6b35
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 26 12:22:08 2009 +0000
* Support doing a fully static build. Statically linked Nix binaries
will be useful as a fallback on platforms for which there are no
RPMs/Debs available.
commit 5dd8fb20691c375778fd73bf613d4988df72fb50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 26 11:02:07 2009 +0000
* Don't use ULLONG_MAX in maxFreed - use 0 to mean "no limit".
18446744073709551615ULL breaks on GCC 3.3.6 (`integer constant is
too large for "long" type').
commit 92f525ecf4ea8a9bd356acd1d3845074b1e5b918
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 25 21:05:42 2009 +0000
* Negative caching, i.e. caching of build failures. Disabled by
default. This is mostly useful for Hydra.
commit 7024a1ef076cedf4596c9f4b107e85d315242cea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 25 16:43:38 2009 +0000
* Removed the locking.sh test; it's redundant because of the extended
parallel.sh test. Also, don't call multiple nix-builds in parallel,
since they can race creating .nix-build-tmp-derivation.
commit 8146a0c7313b95b4cc24776cc609efc846b0a38e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 25 16:11:04 2009 +0000
* Use bash in the tests.
commit a046858a22751ce87014aa5cc2a619ea83668ed9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 24 23:40:24 2009 +0000
* Doh.
commit 12c8c64efaefd36d32e5e7c028496c5ae9172acc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 24 14:07:37 2009 +0000
commit 7aedcf946043468c169ab9b0a131be908804789b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 23 15:16:36 2009 +0000
* Make this test a bit more robust. It's still timing dependent
though.
commit 3a87163b2480eaf47d626580d20049387d942066
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 23 13:52:52 2009 +0000
* Shut up a GCC warning.
commit cacff1be886ed975bbef1b17151b25c633711256
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 23 01:05:54 2009 +0000
* No longer block while waiting for a lock on a store path. Instead
poll for it (i.e. if we can't acquire the lock, then let the main
select() loop wait for at most a few seconds and then try again).
This improves parallelism: if two nix-store processes are both
trying to build a path at the same time, the second one shouldn't
block; it should first see if it can build other goals. Also, it
prevents the deadlocks that have been occuring in Hydra lately,
where a process waits for a lock held by another process that's
waiting for a lock held by the first.
The downside is that polling isn't really elegant, but POSIX doesn't
provide a way to wait for locks in a select() loop. The only
solution would be to spawn a thread for each lock to do a blocking
fcntl() and then signal the main thread, but that would require
pthreads.
commit 58969fa2bf9d5e662c372bdf970470b8226bd4c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 22 23:53:05 2009 +0000
* Refactoring.
commit d7b2d11255d048dd9aa59e49848baa5977b718e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 22 23:16:18 2009 +0000
* Test case (currently fails): multiple Nix builds shouldn't block
waiting on the same lock when there are other builds that can be
done.
commit 7a57b2920b7f04ab0cdd42687dd183217231549e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 22 17:51:45 2009 +0000
* Better error message when nix-store --import is applied to garbage
(previously it would likely say "implementation cannot deal with >
32-bit integers").
commit 77d272623fb4fd57cf27d4b92a7dc1713a2d4098
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 22 17:36:43 2009 +0000
* NAR archives: handle files larger than 2^32 bytes. Previously it
would just silently store only (fileSize % 2^32) bytes.
* Use posix_fallocate if available when unpacking archives.
* Provide a better error message when trying to unpack something that
isn't a NAR archive.
commit 7e05b8b75e0f4b370cc7d4b78b3fb18a3678b360
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 19 10:02:02 2009 +0000
* Future proofing: assume we can read manifests up to version 10
(which should therefore be backwards compatible).
commit b88460bcbc05ec7c164cb6ce6015b193d3c2d6c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 19 09:47:34 2009 +0000
* Disregard the Hash field in manifests.
commit 28972864879a63c4110211d9852b692672869a2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 18 17:36:42 2009 +0000
* Unify exportReferencesGraph and exportBuildReferencesGraph, and make
sure that it works as expected when you pass it a derivation. That
is, we have to make sure that all build-time dependencies are built,
and that they are all in the input closure (otherwise remote builds
might fail, for example). This is ensured at instantiation time by
adding all derivations and their sources to inputDrvs and inputSrcs.
commit e530e0a35041b3135b521f1b2dbc21fabfb00d47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 18 16:36:13 2009 +0000
* Improve the test.
commit 9485ec31ea3b4ad9f2b31c350cd24f2fa6ec5484
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 18 16:35:35 2009 +0000
* Better cleanup after tests.
commit 13df3915ef7b967b3889e2bf5f66ca8de1adc8b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 18 16:23:29 2009 +0000
* Missing file.
commit c183ee5c79dd356262c3d7c31e3aace09045671f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 18 14:48:42 2009 +0000
* Acquire the locks on the output paths before trying to run the build
hook. This fixes a problem with log files being partially or
completely filled with 0's because another nix-store process
truncates the log file. It should also be more efficient.
commit 1dcf208f562d853909ad53772c208dcb2a73de88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 18 13:15:55 2009 +0000
* Clean up some tests (use nix-build where appropriate).
commit 93b6926054b0b339d310a3075a677a65676c7c11
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 17 17:38:32 2009 +0000
* Regression test for exportBuildReferencesGraph. It currently fails.
commit 51e7e32c3bf7c2fb5045b0655c2edc1fbf347455
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 17 17:11:55 2009 +0000
* Refactoring: renamed *.nix.in to *.nix.
commit 2d5114452d8a8f73c858f9beb6bfaafe35e7bf9a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 17 16:33:48 2009 +0000
* Regression test for the `exportReferencesGraph'
derivation attribute.
commit 33ecb4299107da91f5d61131ead37afabe496649
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 17 11:42:55 2009 +0000
* Cleanup.
commit be88248add7ac96137a323acb111a301048e37bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 9 15:05:08 2009 +0000
* Make the version available to release.nix.
commit a96cac0d18e291057e79dab36d3e2030d1bbafc9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 6 17:00:58 2009 +0000
commit d4753c944f62cd92ee05947a5881b8ae4dc0aa21
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 6 11:01:45 2009 +0000
commit 0e6f6041784ed6d3a3851b20a1d93604e3ae27aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 5 14:57:50 2009 +0000
* Install some headers in the right location.
commit 7f254706b065889c444a555ab13fbf75c1c3feee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 3 14:47:39 2009 +0000
* Allow the channel to declare a name for itself.
commit 1273d355ac91f502654aba0df07068d330064e83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 27 14:06:38 2009 +0000
* nix-install-package: don't pollute /nix/var/nix/manifests.
commit d4ca5c395290da9a517df99dfbb79d2186930c83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 27 13:55:11 2009 +0000
* Use the regular progress bar; the hash bar isn't very useful when
the size of the download isn't known in advance.
commit fd2e14b3c886c4ff6a702f22bb7f4494b1fbec39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 27 12:09:30 2009 +0000
* nix-build: support --option.
commit 60cb7de336035768089cc764a3fd7e8867a8d298
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 27 11:04:41 2009 +0000
* Allow options from the Nix config file to be overriden from the
command line (e.g. "--option build-use-chroot true").
commit 8ab6bc5a49686aedf85adffe322c4f016764af5f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 27 11:01:03 2009 +0000
* nix-channel: use nix-build.
commit f052c10eedf8701e746bbacac63a8ac0d4a8bc0f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 27 09:53:58 2009 +0000
* Check the manifest version.
commit a7cee528c5967ffe20e50fb9dc329987843d42ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 26 21:12:35 2009 +0000
* Handle base-16 hashes in manifests.
commit 041717eda399de5ddbe2a147bafedf1a39993f8e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 19 23:46:37 2009 +0000
* download-using-manifests: don't check the cryptographic hash of
downloaded files; rather, check the hash of the unpacked store
path.
When the server produces bzipped NAR archives on demand (like Hydra
does), the hash of the file is not known in advance; it's streamed
from the server. Thus the manifest doesn't contain a hash for the
bzipped NAR archive. However, the server does know the hash of the
*uncompressed* NAR archive (the "NarHash" field), since it's stored
in the Nix database (nix-store -q --hash /nix/store/bla). So we use
that instead for checking the integrity of the download.
commit 621093cb1c142e125ed1c534fc0c23c1e8404a66
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Thu Feb 19 20:46:45 2009 +0000
Replace wrong (w.r.t. PATH) sed call with in-shell substitution
commit 824b154ce82a76bfc604b3084b18e06af4e3d007
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 16 09:24:20 2009 +0000
* Release output locks as soon as possible, not when the destructor of
the DerivationGoal runs. Otherwise, if a goal is a top-level goal,
then the lock won't be released until nix-store finishes. With
--keep-going and lots of top-level goals, it's possible to run out
of file descriptors (this happened sometimes in the build farm for
Nixpkgs). Also, for failed derivation, it won't be possible to
build it again until the lock is released.
* Idem for locks on build users: these weren't released in a timely
manner for failed top-level derivation goals. So if there were more
than (say) 10 such failed builds, you would get an error about
having run out of build users.
commit 2ef579d1aa62501d59957783665f997e3c6f475b
Author: Marc Weber <marco-oweber@gmx.de>
Date: Thu Feb 5 19:35:44 2009 +0000
documentation for previous commit
commit 1407a1ec99163bf3323fbd223396a124336a861a
Author: Marc Weber <marco-oweber@gmx.de>
Date: Thu Feb 5 19:35:40 2009 +0000
added primop functions __isBool, __isString, __isInt
commit 1bb0f1e84b7c9444a2fd922a658d721da3da00fd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 3 10:34:15 2009 +0000
* Build hook: compress the transferred data.
commit b682fae9d93037af65282e02b88a9ce34129026e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 2 17:24:10 2009 +0000
* Build hooks: use nix-store --import. This prevents a redundant
scan for runtime dependencies (i.e. the local machine shouldn't do a
scan that the remote machine has already done). Also pipe directly
into `nix-store --import': don't use a temporary file.
commit 6f8c96d12399b747b5f41b5211a635d2801247c8
Author: Marc Weber <marco-oweber@gmx.de>
Date: Wed Jan 28 12:14:53 2009 +0000
vim syntax: support for indented strings ('' .. '')
commit 110606d470c22928a505296b694751c7d17a5c03
Author: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Tue Jan 27 14:36:44 2009 +0000
Add the "addErrorContext" builtin to add more information in the stack trace.
commit 061141e63256842bd72160a30302b31463222411
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 27 13:36:59 2009 +0000
* Make it compile on Debian 4.0 (which doesn't define PER_LINUX32_3GB
in sys/personality.h).
commit 019176137f49eba826e08c6b0f0a5c35ecdde81d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 13 11:39:09 2009 +0000
* When using a build hook, distinguish between transient failures
(e.g. an SSH connection problem) and permanent failures (i.e. the
builder failed). This matters to Hydra (it wants to know whether it
makes sense to retry a build).
commit 4ce692df88b4a9b32767ee6c0223d789d83712cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 13 10:42:13 2009 +0000
commit c504d90c1159bd0fadd37bb3098ecf8622d0b13c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 12 16:30:32 2009 +0000
* Support i686-linux builds directly on x86_64-linux Nix
installations. This is implemented using the personality() syscall,
which causes uname to return "i686" in child processes.
commit 8e39d9bdb30cbe2e7c3f7d9b30ac64c3a2e32684
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 12 12:51:28 2009 +0000
* Make Nix build with Bison 2.4.
commit 28355dafcf49dddf707499fc99b18c5071cf8eb6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 5 12:14:43 2009 +0000
* Removed reference to losser.st-lab.cs.uu.nl, which is RIP after 9
years of loyal service :-)
commit 8fce03e0adc719930de4f4aebd5dd17b7d59402a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 16 13:28:18 2008 +0000
* nix-store --verify: repair bad hash fields in the metadata file.
commit 60ec75048ae0e0bc72ea2fe47e8b48fcf40a2b86
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 16 12:23:35 2008 +0000
* Pass --use-atime / --max-atime to the daemon.
commit 6f6bb1fdea9dcd4c6f6c0b8059b05d56ea7c16f3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 15 23:55:11 2008 +0000
* Delete the chroot if it already exists (e.g. left over from an
interrupted build).
commit 92cb7c4dfe036ed4c13d45128a21838a039d840f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 17:14:57 2008 +0000
* Put chroots in the Nix store. This ensures that we can create hard
links to the inputs.
commit 0008b0006db59ea8fccfe041cf8d87f05abb427d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 17:03:18 2008 +0000
* Simplify deleting .lock files in /nix/store: just don't delete them
if they belong a path that's currently being built. This gets rid
of some Cygwin-specific code.
commit ac36c6cd44e8f46573ce3df0749d2f062fa35f3b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 15:36:18 2008 +0000
* Some hackery to make "make check" succeed on Cygwin.
commit 2b70a8e7c98adebdac1e546e17ee1d909b4e5989
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 13:41:36 2008 +0000
* Detect whether unshare() is available.
commit 9122dcecbba9d5268d1087918ffe5a3b970625b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 12:59:27 2008 +0000
* We can't use string objects in signal handlers because they might
allocate memory, which is verboten in signal handlers. This caused
random failures in the test suite on Mac OS X (triggered by the spurious
SIGPOLL signals on Mac OS X, which should also be fixed).
commit 6776a52bb380bb2567847c6e50e1d7880ad7847a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 11:49:42 2008 +0000
* Use a PathSet for the chroot directories so that we don't
accidentally bind-mount a directory twice.
commit d86bd22d247227e36de9577f25ad35f8fd4c65e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 12 10:20:19 2008 +0000
* Define _GNU_SOURCE. Hopefully this fixes the build on Debian 4.0
(http://hydra.nixos.org/nixlog/384/1).
commit ac5478eb525f85e560d822ab3b5cb6ccb664d56e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 11 18:57:10 2008 +0000
* Don't provide the whole Nix store in the chroot, but only the
closure of the inputs. This really enforces that there can't be any
undeclared dependencies on paths in the store. This is done by
creating a fake Nix store and creating bind-mounts or hard-links in
the fake store for all paths in the closure. After the build, the
build output is moved from the fake store to the real store. TODO:
the chroot has to be on the same filesystem as the Nix store for
this to work, but this isn't enforced yet. (I.e. it only works
currently if /tmp is on the same FS as /nix/store.)
commit 652817046b2f999e29de8109fce9c61b5b18d22c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 11 17:52:34 2008 +0000
* Revert r13150: now that we use private namespaces for the chroot, we
don't have to put the chroot in /nix/var/nix/chroots anymore.
They're back in /tmp now.
commit 5a569509b491d43bfcb5c72e85a6d7374a583228
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 11 17:44:02 2008 +0000
* Provide a minimal /etc/passwd in the chroot to keep some builders
happy.
commit 7c54f1603f0c793bfc1f191aaa0ec71441038515
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 11 17:00:12 2008 +0000
* Do chroot builds in a private namespace. This means that all the
bind-mounts we do are only visible to the builder process and its
children. So accidentally doing "rm -rf" on the chroot directory
won't wipe out /nix/store and other bind-mounted directories
anymore. Also, the bind-mounts in the private namespace disappear
automatically when the builder exits.
commit 07cdfb09fb74cf8e1c3c70c070ad20b5d1119fcf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 11 14:30:25 2008 +0000
* Open the connection to the daemon lazily (on demand) so that
read-only operations (like nix-env -qa) work properly when the
daemon isn't running.
commit a0766eca270390c2181c7f31f27f93629b19f4a5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 21:07:29 2008 +0000
* Build on Debian 4.0 (GCC 4.1.1).
commit cd16d5dc3d86c6c877514c291ce56b09746708af
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 17:56:12 2008 +0000
* Doh.
commit 5b949241a59c417b05dcbde3d65bd02cbcdf7d84
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 17:54:14 2008 +0000
* Build some 64-bit RPMs/Debs.
commit 67958f21df2cac2adfb8b8ae33a4200f49d6add6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 16:55:22 2008 +0000
* Be sure to clean up the daemon if the test fails.
commit d91dc086bb61613f42fa5c2663e1c82e0567f78a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 16:51:36 2008 +0000
commit 9ac3f5df9c29e35b38539c3dca753eacc9b1393d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 16:51:16 2008 +0000
* Propagate --max-silent-time to remote machines.
commit bcfe98acffbefea734f51523b386868ae443c111
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 16:35:47 2008 +0000
* Prefer building on a remote machine over a local machine. This
makes more sense for the build farm, otherwise every nix-store
invocation will lead to at least one local build. Will come up with
a better solution later...
commit 9850262a72d1eb77c8f36cf44a9a4aaffedc5d6b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 15:25:28 2008 +0000
* Build RPMs, Debs, coverage analysis.
commit 909fbb9de1e3e2d020a3dd000b9009a5ff1aaeca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 14:29:41 2008 +0000
* When using build hooks, for any nix-store -r build operation, it is
necessary that at least one build hook doesn't return "postpone",
otherwise nix-store will barf ("waiting for a build slot, yet there
are no running children"). So inform the build hook when this is
the case, so that it can start a build even when that would exceed
the maximum load on a machine.
commit 5dfba0b4db24f4943c5b529eb3b092a64bcd6b18
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 13:36:52 2008 +0000
* Force allocation of a pseudo-terminal to clean up the remote
nix-store process when the connection is interrupted.
commit 9ccdb80de32cf8ff4e0f84c7011b5fbbfaf73c01
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 13:13:31 2008 +0000
* Don't ignore errors from writing to stderr. That way, when
nix-store -r (or some other operation) is started via ssh, it will
at least have a chance of terminating quickly when the connection is
killed. Right now it just runs to completion, because it never
notices that stderr is no longer connected to anything. Of course
it would be better if sshd would just send a SIGHUP, but it doesn't
(https://bugzilla.mindrot.org/show_bug.cgi?id=396).
commit 9fd9c4c63559e21dde62b719a1665f9bc6c2155e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 12:20:06 2008 +0000
* Support multiple system types per remote machine, e.g. a machine
list like
root@example.org x86_64-linux /root/.ssh/id_buildfarm 1
root@example.org i686-darwin /root/.ssh/id_buildfarm 1
This is possible when the Nix installation on example.org itself has
remote builds enabled.
commit 63b8f09d8d8532e67009b7233f8f81e9326353ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 10:45:47 2008 +0000
commit f8713e1287e2641c3d2550f7af1a445c77b8552a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 4 10:40:41 2008 +0000
* Dirty hack to make nix-push work properly on derivations: the
derivation should be a source rather than a derivation dependency of
the call to the NAR derivation. Otherwise the derivation (and all
its dependencies) will be built as a side-effect, which may not even
succeed.
commit 82ae85de2759eaa68bb2411a1f0a640cf9f8e76a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 18:05:14 2008 +0000
* addToStore() in nix-worker: don't write the NAR dump received from
the client to a temporary directory, as that is highly inefficient.
commit 5eaf644c99c78ed89b2cab1d10d630435fd55d28
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 17:30:32 2008 +0000
* A simple API for parsing NAR archives.
commit cdee3174190c237bbf36955a5faa3896f564b7a1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 17:02:29 2008 +0000
* Backwards compatibility.
commit d95b68fde32ab9f6b6aac052604b90b5ce4523d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 16:15:38 2008 +0000
commit ff762fb499be220ccd680f3bf68dca44a902a5ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 16:10:17 2008 +0000
* Pass HashType values instead of strings.
commit 1307b222239da8e503d22ad9316789e30b4e2431
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 15:51:17 2008 +0000
* Made addToStore() a lot more efficient: it no longer reads the path
being copied 3 times in the worst case. It doesn't run in constant space,
but it didn't do that anyway.
commit 64519cfd657d024ae6e2bb74cb21ad21b886fd2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 15:06:30 2008 +0000
* Unify the treatment of sources copied to the store, and recursive
SHA-256 outputs of fixed-output derivations. I.e. they now produce
the same store path:
$ nix-store --add x
/nix/store/j2fq9qxvvxgqymvpszhs773ncci45xsj-x
$ nix-store --add-fixed --recursive sha256 x
/nix/store/j2fq9qxvvxgqymvpszhs773ncci45xsj-x
the latter being the same as the path that a derivation
derivation {
name = "x";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
outputHash = "...";
...
};
produces.
This does change the output path for such fixed-output derivations.
Fortunately they are quite rare. The most common use is fetchsvn
calls with SHA-256 hashes. (There are a handful of those is
Nixpkgs, mostly unstable development packages.)
* Documented the computation of store paths (in store-api.cc).
commit 09bc0c502c4a52baf0bd363d8ee5f18d49244f73
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 29 00:31:39 2008 +0000
* Install the release notes.
commit 5d4eb9dd07ddd589ec03582c3eeb82d490023282
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 01:13:29 2008 +0000
* Moved the build farm job for building Nix to the Nix tree.
commit 0c478d2f4d7459c4af4e7608ed45ae3b2f09c7dc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 02:30:35 2008 +0000
* Ignore carriage returns.
commit 5024bde8f407582c9cb5a916f3b5603184f76eb7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 01:06:15 2008 +0000
* Handle prematurely ended logfiles, i.e. make sure we emit enough
close tags.
commit 2ab09a55cf06f547f7b6e94870259e1a51dbcf18
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 21:51:58 2008 +0000
* Bump the version number.
commit 6bbff48079b27b529f0359bb9e6731dba1ad71db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 17:22:42 2008 +0000
commit b8eb32f4d22e42d7c17a7da7aed4cb864eee8902
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 16:42:52 2008 +0000
* Urgh.
commit bba87589cce9629891c0094e5b5566d15a09c515
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 16:28:04 2008 +0000
commit f3e2e6076abdd60dc6d6a4237c0cb0f130cc5271
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 16:10:55 2008 +0000
commit 53cca4a445e9dd429302765805d9563a8a176832
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 16:06:13 2008 +0000
commit 4213b8d8ec8cf478e43b0ec3dc4068e5e55f097a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 15:44:59 2008 +0000
* Urgh.
commit eb86b6f5a5429075866eca40d3cc4b864e7499ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 15:08:39 2008 +0000
commit 3d2035ea86ce70c3a9f90120578271399ffd961e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 15:08:34 2008 +0000
* Blindly doing a replacement of occurences of $bindir (when running
the tests) is a bad idea when $bindir = /usr and some programs (like
perl) live there. Fortunately it doesn't seem to be needed anymore.
commit 285d26374aac69d2bbd1df31bc76686ad39171a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 14:14:35 2008 +0000
* Don't set the prefix to /nix by default, rather use the Autoconf
default of /usr/local. However, localstatedir and storedir are set
to /nix/var/nix and /nix/store respectively unless they're
explicitly overriden.
commit a55113411fe8e6ef39e24c79564e39f07f5a8fdf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 12:25:11 2008 +0000
* Nix daemon: reload the configuration file after forking (NIX-100).
commit c202523e5304c41ef9a6c7a54951bf39a33ff26e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 12:01:05 2008 +0000
commit aab530e9712baf802bcb48f03440a915dbc37ee9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 23:26:19 2008 +0000
* Primop builtins.storePath for declaring a store path as a
dependency. `storePath /nix/store/bla' gives exactly the same
result as `toPath /nix/store/bla', except that the former includes
/nix/store/bla in the dependency context of the string.
Useful in some generated Nix expressions like nix-push, which now
finally does the right thing wrt distributed builds. (Previously
the path to be packed wasn't an explicit dependency, so it wouldn't
be copied to the remote machine.)
commit 60564410ef34db8fd3c9be759bdc687366f24e8e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 17:50:25 2008 +0000
* Patterns.
commit 2668a43388d26d9ce740a54e8c4f0ec583ebf120
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 17:27:52 2008 +0000
commit 63ccd724968569455bb7d54f0badcfec18d18e9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 17:00:32 2008 +0000
* Updated the manual.
commit e13da525a7c16200f451fafb832993b47d407418
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 16:27:07 2008 +0000
* Files in the info directory starting with "." are temporary files
and don't indicate path validity.
commit 5d250ad1eae704106c7030ab984c929d7aef8f8f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 16:26:34 2008 +0000
* nix-store --dump-db: be more streamy.
commit 7509d70f9ddec7d28911e6b6f2145bc50a923e9f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 15:20:46 2008 +0000
* Documented some of the sharing mechanisms.
commit 2369b122d19c7a08fc6e38e5a8aab90636ed4132
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 13:19:09 2008 +0000
* Install documentation in $(docdir) (i.e. share/doc/nix).
commit 6c2c771af7b1fc35a33e1faf0e4e7b266fe44e79
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 13:18:46 2008 +0000
* Removed obsolete option.
commit 07d3a38726aeb9544212c14c8db5bdcdb7da785b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 11:58:33 2008 +0000
* Remove references to Berkeley DB, including most of the
troubleshooting section. W00t.
commit f5325d292d79f174f73b35ed886ae83bb80896cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 10:59:36 2008 +0000
* Release notes.
commit fa791116a35479bd295f5666c8d35fba60e0c98d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 14:43:40 2008 +0000
* Get rid of nix-pack-closure / nix-unpack-closure, they're redundant.
commit 3f4ed681c2e16ab7a73e31835a6a7e29d5857dd7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 14 16:50:01 2008 +0000
* Prevent zombies. Previous the SIGCHLD handler only reaped one
zombie at a time, so if multiple children died before the handler
got to run, some of them would not be cleaned up.
commit 6fedb7aa0f76c34bccedd14095bcc7824006489d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 14 15:46:45 2008 +0000
* Restore SIGPIPE to SIG_DFL when running the builder. This prevents
subtle and often hard-to-reproduce bugs where programs in pipes
either barf with a "Broken pipe" message or not, depending on the
exact timing conditions. This particularly happened in GNU M4 (and
Bison, which uses M4).
commit a519bb063505a8d39e6b1e12f130d66771676e23
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 12 11:08:27 2008 +0000
* Some somewhat ad hoc mechanism to allow the build farm to monitor
build progress.
commit 96598e7b06dad0de082730cab8992eacc440e535
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 11 15:11:10 2008 +0000
* Pass the --no-build-output flag to the daemon.
commit 4166b11a53f16365f9becfa4f29f15047fc221af
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 11 14:59:20 2008 +0000
* Add /dev/pts to the default nix.conf.
commit 2b7c839b4e20d53e097036d854fbd52dbbc16dd6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 11 14:58:37 2008 +0000
* Typo.
commit 709b55ee0281bc2d587dff6f60ec189b010800f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 29 15:34:48 2008 +0000
* Put the chroots under /nix/var/nix/chroots to reduce the risk of
disasters involving `rm -rf' on bind mounts. Will try the
definitive fix (per-process mounts, apparently possible via the
CLONE_NEWNS flag in clone()) some other time.
commit c98ea254dcb6384b686a88657fd800ad7655e4a5
Author: Ludovic Courtès <ludo@gnu.org>
Date: Thu Oct 16 21:04:32 2008 +0000
libstore: Always mount `/dev/pts' individually.
This fixes problems such as Tcl's PTY handling:
ERROR: The system has no more ptys. Ask your system administrator to
create more.
commit 9d6d50269bef214473580a879f6194e02692fe16
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 14:16:03 2008 +0000
* Bug fix for building on some old installations (contributed by Pjotr).
commit fa61ee70ee80b2b223fae86ee197987aa70499b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 18 09:08:54 2008 +0000
* Fix `--from-profile'.
commit f32fef1b075f63ecf8c7351c5e67d4dd95c0fb80
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 17 14:52:35 2008 +0000
* GC option `--max-atime' that specifies an upper limit to the last
accessed time of paths that may be deleted. Anything more recently
used won't be deleted. The time is specified in time_t,
e.g. seconds since 1970-01-01 00:00:00 UTC; use `date +%s' to
convert to time_t from the command line.
Example: to delete everything that hasn't been used in the last two
months:
$ nix-store --gc -v --max-atime $(date +%s -d "2 months ago")
commit 4af2fdba6d709d0b9bb77dd58ceb6e16d6cd4cfa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 17 13:00:55 2008 +0000
* Typo.
commit c987061aa401eaad984aaa3058aa0506df4f46da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 17 12:54:07 2008 +0000
* Some refactoring. Better output with `-v' for --use-atime.
commit 77afd97a996a0bde569140b512879fbde83bf4a1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 17 12:53:33 2008 +0000
* nix-store --gc / --delete: show how many store paths were deleted.
commit 7ab68961e4d7c30485efde1fb9dcb6edbdea9b5c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 17 10:02:55 2008 +0000
* Garbage collector: added an option `--use-atime' to delete paths in
order of ascending last access time. This is useful in conjunction
with --max-freed or --max-links to prefer deleting non-recently used
garbage, which is good (especially in the build farm) since garbage
may become live again.
The code could easily be modified to accept other criteria for
ordering garbage by changing the comparison operator used by the
priority queue in collectGarbage().
commit 2b2aa8a820b10aeaf8bb8f1eb70937d04869c045
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 8 11:02:15 2008 +0000
* Doh.
commit 7933cdc6dcbc5e6bc64e38c986b952e5ecd2dfa1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 2 09:21:38 2008 +0000
* When writing the user environment manifest, filter out non-string
attributes from the meta attribute. Not doing so caused nix-env to
barf on the "psi" package, which has a meta.function attribute,
the textual serialisation of which causes a gigantic string to be
produced --- so big that it causes nix-env to run out of memory.
Note however that "meta" really only should contain strings.
meta.function should be passthru.function.
commit 0f0dbe8c0c958f14461ad998c0847a06f95eca1d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 29 14:38:04 2008 +0000
* Extend the ATerm suppressions to 64-bit.
commit 311c222f472e93c9eb9987526b6caf80774c3d49
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 29 13:59:03 2008 +0000
commit 2a01d06da6a5e7f4eda3f13c5c4c1a20d0e02d94
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Fri Aug 29 08:34:38 2008 +0000
Added nix-http-export.cgi to extra distributed scripts; so it can be installed from releases, not only from SVN.
commit 7718b19389fd02407860ce587196adc04f80bb5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 27 17:20:25 2008 +0000
* Explicitly set PWD to prevent problems with chroot builds. In
particular, dietlibc cannot figure out the cwd because the inode of
the current directory doesn't appear in .. (because getdents returns
the inode of the mount point).
commit 9cc0da84533f1ced2ed89ea807ac18b1078f7f88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 27 16:03:03 2008 +0000
* Create a /tmp with 1777 permission in the chroot. Some builders
need a writable /tmp (they don't respect $TMPDIR).
commit 99dc3e613a2ce30474fff92151abf165d017c26d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 26 14:05:59 2008 +0000
* Require that __overrides is defined as a non-recursive attribute
(which means it can only be defined via "inherit"), otherwise we get
scoping bugs, since __overrides can't be recursive (or at least, it
would be hard).
commit d06be428f6dd046c89a69995d5328b8250bec3d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 15:49:22 2008 +0000
* Disable chroot builds for fixed-output derivations so that we don't
need /etc in the chroot (in particular, /etc/resolv.conf for
fetchurl). Not having /etc/resolv.conf in the chroot is a good
thing, since we don't want normal derivations to download files.
commit abec1c000410a1533f9c80357be6061730d8c6aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 14:31:29 2008 +0000
* Evaluate attributes in sorted order for better determinism.
commit c4f1c2114b520f5c9d589780dd7662efbfd9cf63
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 14:15:56 2008 +0000
* Minor simplification.
commit 49829da8b450a1e869168428171334e6d9d0eb45
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 13:32:27 2008 +0000
* Doh.
commit b428adc267f23441be2f801239641aaf8419e4ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 13:31:57 2008 +0000
* Strip off the `.nix' suffix from the attribute name for files in
~/.nix-defexpr, otherwise the attribute cannot be selected with the
`-A' option. Useful if you want to stick a Nix expression directly
in ~/.nix-defexpr.
commit cc826dc03e738c1d6c6fd6de0dfd9600f6289b72
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 22 14:32:29 2008 +0000
* Simplify the Valgrind suppressions using wildcards.
commit 51e2dda58c4aa08c4833bdab6b0bb0fad8e1c595
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 19 12:46:43 2008 +0000
* Some more ATerm Valgrind suppressions.
commit b7ff182b6ef1f9d8db87de040b4ffc75db1cb9bc
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Thu Aug 14 22:01:43 2008 +0000
Fixing an obvious typo in override code. I do not know whether it works correctly after the change, but at least it ca nbe compiled now.
commit ca07f3e37015fa85fbfc5afd868249d457e649c9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 16:59:37 2008 +0000
* Another experimental feature: a way to truly override attributes in
a rec. This will be very useful to allow end-user customisation of
all-packages.nix, for instance globally overriding GCC or some other
dependency. The // operator doesn't cut it: you could replace the
"gcc" attribute, but all other attributes would continue to
reference the original value due to the substitution semantics of
rec.
The syntax is a bit hacky but this is to allow backwards
compatibility.
commit 9279174dde3e1a450e63e866d2683352dd8238d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 14:00:44 2008 +0000
* Added an experimental feature suggested by Andres: ellipses ("...")
in attribute set pattern matches. This allows defining a function
that takes *at least* the listed attributes, while ignoring
additional attributes. For instance,
{stdenv, fetchurl, fuse, ...}:
stdenv.mkDerivation {
...
};
defines a function that requires an attribute set that contains the
specified attributes but ignores others. The main advantage is that
we can then write in all-packages.nix
aefs = import ../bla/aefs pkgs;
instead of
aefs = import ../bla/aefs {
inherit stdenv fetchurl fuse;
};
This saves a lot of typing (not to mention not having to update
all-packages.nix with purely mechanical changes). It saves as much
typing as the "args: with args;" style, but has the advantage that
the function arguments are properly declared (not implicit in what
the body of the "with" uses).
commit db4f4a842515392a6b40f5c86b2ef885c1278451
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 13:02:19 2008 +0000
* Backward compatibility check to prevent nixos-rebuild from barfing
when upgrading Nix.
commit 1b962fc7206bf3134b2a2097d3db0ee6d2863c47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 12:53:29 2008 +0000
* @-patterns as in Haskell. For instance, in a function definition
f = args @ {x, y, z}: ...;
`args' refers to the argument as a whole, which is further
pattern-matched against the attribute set pattern {x, y, z}.
commit e8188384129bda7c8cdd5e17023ab05047551e6e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 10:14:34 2008 +0000
* "pattern" non-terminal.
commit efe4b690ae4de5f0adea99abb1176a64a099d433
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 10:04:22 2008 +0000
* Refactoring: combine functions that take an attribute set and
functions that take a single argument (plain lambdas) into one AST
node (Function) that contains a Pattern node describing the
arguments. Current patterns are single lazy arguments (VarPat) and
matching against an attribute set (AttrsPat).
This refactoring allows other kinds of patterns to be added easily,
such as Haskell-style @-patterns, or list pattern matching.
commit c03b729319997b4e38c3f586d7c76352228b22e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 09:26:30 2008 +0000
* Increase the sleep periods a bit to make the test less likely to
fail on slow machines. Of course it would be better if this test
wasn't timing dependent...
commit 5664b6d7ba28453ccdd6d1c07a707f98608500ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 11 13:36:40 2008 +0000
* Removed the "valid values" feature. Nobody uses it anyway.
commit b455c4c45cba49397952e662cace85aedb6848fe
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Wed Aug 6 19:43:53 2008 +0000
Updates to nix-reduce-build
Common code in local build package sources refactored out in a function; before building the real set of derivations needed is found (slightly slower for only one build strategy, but less garbage on output and better performance for multiple build strategies).
Now you have full choice of best-effort build regardless of method (substituters or actual build), using substituters, building only fixed derivations (should get you all the downloads) and local build without even trying substituters.
Some minor fix in the help text about behavior with no package sources.
commit 72f3ea7358f2c85ced46da3b958505951657f9d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 11:03:05 2008 +0000
* Moved some stuff to the Nixpkgs manual.
* Updated the release notes.
commit 98b07466fbb9fc736bba0b93731117fd650e7349
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 10:57:53 2008 +0000
* Better error checking of the data from the substituters.
commit 339c1420096c254b20b5b16b79a075b2c646ee70
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 16:21:45 2008 +0000
* Use optimistic profile locking for nix-env operations like `-i' and
`-u'. Instead of acquiring an exclusive lock on the profile for the
entire duration of the operation, we just perform the operation
optimistically (without an exclusive lock), and check at the end
whether the profile changed while we were busy (i.e., the symlink
target changed). If so, the operation is restarted. Restarting is
generally cheap, since the build results are still in the Nix store.
Most of the time, only the user environment has to be rebuilt.
commit a87b5256e27bb4ac359aa98ce11ff19c5cecd9fa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 16:16:49 2008 +0000
* Fix the tests.
commit 001b3f06ecf7356cdef53f4ece4ba1cd87b97e77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 14:58:50 2008 +0000
* `nix-env --set': support --dry-run.
commit 7592f48c83b2f333fa7c5e85fd2fb64445b1c6ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 13:46:01 2008 +0000
* nix-build: `--dry-run' flag.
commit a1d310b6b5c710215265c1cd0d5893248ed50f92
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 13:44:46 2008 +0000
* `nix-store --realise': print what paths will be built/downloaded,
just like nix-env.
* `nix-store --realise': --dry-run option.
commit 42043953c3558f054dc5b9bb3da605a4a3ed6314
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 13:15:47 2008 +0000
* Doh.
commit 5adbb0aabe54479304453bf5e544f84b40ee7dd7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 13:15:35 2008 +0000
* build.cc: only use a substituter if it returns info for a path.
commit 5b1052663a35940fc99ae6a8fcf6e707ae939fef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 13:11:09 2008 +0000
* Always show what paths we're going to build/download (as in
--dry-run). Maybe there should be an option to turn this on/off?
commit c4f98941ed7e5e07786d92fc0be4435878f9b3cd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 12:29:04 2008 +0000
* nix-env --dry-run: show the total size of the substituter
downloads.
commit 03427e76f11fe1d918020d28bdb69b2fb348ee96
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 11:44:50 2008 +0000
* querySubstitutablePathInfo: work properly when run via the daemon.
* --dry-run: print the paths that we don't know how to build/substitute.
commit b3c26180e33856f16e1e5ceea30b951065b4ebc1
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Sat Aug 2 16:43:25 2008 +0000
Updates to nix-reduce-build: only realize fixed derivations if user asks so, or only use substituters. Oh, and add possibility to use : for things like /etc/nixos/nixpkgs:-A:gnused
commit 3c92ea399d717dc45b3fa91424c0dadc0239ebf2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 2 12:54:35 2008 +0000
* Make nix-env --dry-run print the paths to be substituted correctly
again. (After the previous substituter mechanism refactoring I
didn't update the code that obtains the references of substitutable
paths.) This required some refactoring: the substituter programs
are now kept running and receive/respond to info requests via
stdin/stdout.
commit fc691e1cbdcddb8c553cba06d4089bc1b60e3d98
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 14:52:25 2008 +0000
* Print a better error message when a non-derivation attribute set is
coerced to a string.
commit 096198d11f14a1fff2eb335a572c0b20ae52dbf8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 23 16:02:58 2008 +0000
* A quick hack to make nix-prefetch-url support mirror:// URLs. It
requires that $NIXPKGS_ALL points at a Nixpkgs tree.
commit 660244f65f5d3cb445c874b25fcf6494b3c1df3a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 23 09:38:38 2008 +0000
* Make sure that copy-from-other-stores.pl is built.
commit e139d7fc6896ec9eaca3944828e37ec61894d8e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 18 20:03:12 2008 +0000
* Fix the tests.
commit 989176c56e1996a7df87bb501ad09aed1f3b395d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 18 15:34:46 2008 +0000
* Allow read-only access to the store (e.g., non-root users on NixOS
can do operations like "nix-store -qR <path>" even without the Nix
daemon).
commit 8bc591a6f07ee577b5aa594dfa705f3ddabd269d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 18 13:05:10 2008 +0000
* Use the copy-from-other-stores substituter by default. Of course,
it only does something if $NIX_OTHER_STORES (not really a good
name...) is set.
* Do globbing on the elements of $NIX_OTHER_STORES. E.g. you could
set it to /mnts/*/nix or something.
* Install substituters in libexec/nix/substituters.
commit 15f39aba8ceb2dabc4f019bd1c985ca9d13bfdb4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 12 18:58:24 2008 +0000
* Quick prototype of a substituter that copies paths from other Nix
stores (typically remote Nix stores mounted via e.g. NFS, or the Nix
store on the NixOS installation CD). Example use:
$ sshfs foo@example.org:/ /mnt
$ NIX_OTHER_STORES=/mnt/nix \
NIX_SUBSTITUTERS=.../copy-from-other-stores.pl \
nix-env -i foo
This will be especially useful for the installation CD since it
doesn't require a manifest for the CD contents.
commit 7cd88b1dec29f33188e789d780ec2e4ebb155d20
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 11 13:29:04 2008 +0000
* Generalised the dependencyClosure primop to builtins.genericClosure,
which is hopefully more useful.
* New primops: length, mul, div.
commit d567baabbd99fdb92e67295a77aef76ef970e65c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 1 10:10:32 2008 +0000
* Export the nix-env derivation name parsing and version comparison
logic through the `parseDrvName' and `compareVersions' primops.
This will allow expressions to easily check whether some dependency
is a specific needed version or falls in some version range. See
tests/lang/eval-okay-versions.nix for examples.
commit b3b0b2a29e2842784f80cf839f84af18b0b83e90
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 23 13:52:28 2008 +0000
* `make ext-clean': remove the bzip2 build.
commit 6c8641a542aef69698ae05f568e8b8d67abfea8b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 19:17:05 2008 +0000
commit 5af84139a8d04ad9fdb2c02bc242ce5cd50b87b9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 15:20:33 2008 +0000
* --max-freed: support values >= 4 GB.
commit d3aa183beb774c20cb77052248cf45e684d134fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 14:20:16 2008 +0000
* Garbage collector: option `--max-freed' to stop after at least N
bytes have been freed, `--max-links' to stop when the Nix store
directory has fewer than N hard links (the latter being important
for very large Nix stores on filesystems with a 32000 subdirectories
limit).
commit a8f3b02092fcc08fb25fb327d0188ffc888120bb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 14:13:00 2008 +0000
* `nix-store --optimise': handle files with >= 32000 hard links.
(There can easily be more than 32000 occurrences of the empty file.)
commit a72709afd8ffe35613a6bacd698a36395e095a48
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 09:34:17 2008 +0000
* Some refactoring: put the GC options / results in separate structs.
* The garbage collector now also prints the number of blocks freed.
commit 934c58aa381f5eacc86304ba7f5c6775ff456cd5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 17 08:12:12 2008 +0000
* Use bzip2 1.0.5.
commit ee8f15930d9b2fb31b0125aac3ccd9a92d04c556
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jun 15 15:10:03 2008 +0000
* Test instrumentation.
commit f351834f77441e14238b3348cfe211fa6f6f4e3a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jun 14 16:03:02 2008 +0000
* nix-worker: clean up the temporary root for the worker processes
in /nix/var/nix/temproots.
commit 94fd46fa1c4655a609b3a67bef447c9547eb5080
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jun 14 16:02:31 2008 +0000
* Note.
commit 955b8841cd2a32afd7f2be56b198ce4d163f3b46
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Sat Jun 14 08:48:40 2008 +0000
Also trying to build derivers in case we cannot get substituters
commit 18e27629d301ceef4c6f896f22197f8daee24da3
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Sat Jun 14 08:30:35 2008 +0000
Added local best-effort builds (i.e. one failure does not ruin all packages you would like to see built)
commit 826b271d9aead1a0f8e1678e7c2814066fffb983
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 13 18:25:24 2008 +0000
* Garbage collector: don't do a complete topological sort of the Nix
store under the reference relation, since that means that the
garbage collector will need a long time to start deleting paths.
Instead just delete the referrers of a path first.
commit 30c9f909b24d64d8fabc2bb450e03744cc69c9a0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 13 17:21:20 2008 +0000
* Print some progress info during the early GC stages.
commit 194c66eeebdd6920716c82eeb259083d7bbd84c5
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Fri Jun 13 14:34:19 2008 +0000
Stupid error in script
commit f903d86740c918176bf299a114a03a49a17aa0b9
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Fri Jun 13 13:53:14 2008 +0000
OK, I will believe that fix does no worse..
commit ce85b55cf0c81b9de1a1633bc8f200f1d0ed0d4c
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Thu Jun 12 17:45:38 2008 +0000
Updated help text
commit 4532e4b90da3f4410e3c6ea4766e4e8912aa2cab
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Thu Jun 12 16:26:53 2008 +0000
Added verbosity for nix-reduce-build
commit 2818b7cee6729043b9eeef5b6eb6bba68e93b1e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 11 15:39:38 2008 +0000
* Updated some URLs.
commit 997b95a4af9b70bc36c57a681c1637499c5ed18c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 10 10:08:15 2008 +0000
* Fixed compatibility with old versions of "wc" that print whitespace
before the count.
commit b0e92f6d474ce91d7f071f9ed62bbb2015009c58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 9 13:52:45 2008 +0000
* Merged the no-bdb branch (-r10900:HEAD
https://svn.nixos.org/repos/nix/nix/branches/no-bdb).
commit 4ed01ed791b3bb7a4010049c6128aa2d49a81a29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 9 13:42:13 2008 +0000
* Updated some URLs (did this a long time ago but forgot to
commit...).
commit c41a3ec3a9ebf0bfde5fe23fa10d800afe2d9bd9
Author: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed Jun 4 14:36:46 2008 +0000
First attempt to update Nix SDF grammar to match the actual bison grammar
commit bd955e15e1aac8a1490a680b9f5cfcce29f2331a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 21 11:17:31 2008 +0000
* GCC 4.3.0 (Fedora 9) compatibility fixes. Reported by Gour and
Armijn Hemel.
commit 9819bb20da130509ab62f303267331c2403b043c
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Sun May 11 15:54:30 2008 +0000
Added support for file:// archive (.nar.gz) repositories to nix-reduce-build. /tmp/nix-export created by nix-http-export.cgi is OK.
commit b4bc8b76160ff81e0e5489b88ff3ca8cbd587131
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Wed May 7 14:18:28 2008 +0000
--proxy=proxy:3128
commit b1e321d6ce0b4ef2e042021939a3d6be160841f8
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Tue Apr 29 04:03:54 2008 +0000
Added http alternative transport for nix-reduce-build
commit 658816ddc9b6c22ddb9de27b82fc15af2a473723
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 10 09:54:23 2008 +0000
* Make really sure that we use bash. The line
NEED_PROG(shell, bash)
actually uses the content of $shell if set, which often points at
/bin/sh.
commit 72034ab35d5ba8c2b229fe36375a15b2a8b5b68c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 9 05:57:01 2008 +0000
* sockaddr_un doesn't allow path names of more than 108 characters.
This isn't usually a problem, except that it causes tests to fail
when performed in a directory with a very long path name. So chdir
to the socket directory and use a relative path name.
commit f8985d195e600387fd03137872bb27cec65b2492
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 28 17:52:33 2008 +0000
* Fix for NIX-101 (should use an absolute path for call to nix-hash).
commit 329025253d38361ee3d13af0728f99c756c86b7a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 27 13:45:17 2008 +0000
* Use /tmp/nix-build-<drvpath>-<counter> instead of
/tmp/nix-<pid>-<counter> for temporary build directories. This
increases purity a bit: many packages store the temporary build path
in their output, causing (generally unimportant) binary differences.
commit 5bb08db55b57b03608b15f599f0d5d9dbda13d74
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 21 14:57:16 2008 +0000
* Updated URL.
commit 98968fbb63a1a049b2439bfc2a7d53e5b51471e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 18:15:20 2008 +0000
* Disable the don't-run-as-root sanity check because it breaks RPM
builds (which are done as root...).
commit 2f1e2cf6326d25befc9962add29d6fe2e7246b1a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 14:59:33 2008 +0000
* Note that the SDF grammar isn't used.
commit f10686811053f79b5c60c97a70dde4f638fad840
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 10:16:36 2008 +0000
* Cleanup.
commit f789ea1d098c2755e97f7ee6ebc418f71e5f56f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 1 21:05:33 2008 +0000
* A transaction is unnecessary since the path cannot be
garbage-collected (it's a temporary root).
commit d7caac3e811c0c9b284c8bbbdf5bc1dd5badd040
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 28 21:27:47 2008 +0000
* Don't install nix-reduce-build by default yet please, I first want
to understand better what it does...
commit 11d512e7a812e750deccf616b461876fb0a342c2
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Wed Feb 27 21:26:47 2008 +0000
Added nix-reduce-build. You point it to some path you want to build and it fetches whatever it can from specified computers via nix-copy-closure. NOTE: You do want to set up RSA keys or ssh-agent or something... You really do want it. It will run separate ssh instances insane number of times.
commit 0a84137c4512e0a31802e94de7795e04f8ee2198
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 21 12:01:24 2008 +0000
* checkVarDefs: don't check in closed terms, which don't have
undefined variables by definition. This matters for the
implementation of "with", which does a call to checkVarDefs to see
if the body of the with has no undefined variables. (It can't be
checked at parse time because you don't know which variables are in
the "with" attribute set.) If we check closed terms, then we check
not just the with body but also the substituted terms, which are
typically very large. This is the cause of the poor nix-env
performance on Nixpkgs lately. It didn't happen earlier because
"with" wasn't used very often in the past.
This fix improves nix-env performance roughly 60x on current Nixpkgs.
nix-env -qa is down from 29.3s to 0.5s on my laptop, and nix-env -qa
--out-path is down from 229s to 3.39s. Not bad for a 1-line fix :-)
commit 0ed89c569f95d884fb8107a555f8a03672a0fffd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 5 13:38:07 2008 +0000
* Fix the parsing of
''
'${foo}'
''
where the antiquote should work as expected, instead of giving the
string "'${foo}'".
commit 4066f450c2ea56f90eba819564a112ec5ba2ee09
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 5 13:35:49 2008 +0000
* Doh.
commit e7bdde981f9460994baa805beb6906bb4aa4f947
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 5 13:25:18 2008 +0000
* Regression test.
commit 66c51dc21558c6ac5149c5158df7e5b580029e84
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 29 18:17:36 2008 +0000
* nix-store --dump-db / --load-db to dump/load the Nix DB.
* nix-store --register-validity: option to supply the content hash of
each path.
* Removed compatibility with Nix <= 0.7 stores.
commit 5b5a3af98372029f3a870cf18cc1442f1434be85
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Sun Jan 20 20:44:03 2008 +0000
Probably fixed __exprToString
commit 5eb5c23447b5c2bfa097416aab340d172eb416d3
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Tue Jan 15 04:32:08 2008 +0000
Fixed exportBuildReferenceGraph
commit 7d0f6aed59b11ef1037e7b0ee4dae1c7288ebb45
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 4 14:22:49 2008 +0000
* New primop `unsafeDiscardStringContext' to get rid of string
contexts. Needed to prevent unnecessary dependencies when building
the NixOS manual.
commit 895c9538173a1c1d7e5f6c82e5b7a58b7d904683
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 17:53:59 2007 +0000
* Bumped the version number to 0.12.
commit d4117859d61ed9560d0d6ab468735a22bfa6d076
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 16:57:12 2007 +0000
commit e0ca6714911e34f86f6a644634ebaef86666e6dc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 02:52:17 2007 +0000
* More documentation.
commit 6bdecfacbbebfaa4aa588941844713d2b31ae95c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 01:52:57 2007 +0000
* Documented a bunch of nix-store commands.
commit 454f571f873eef151f382ef4ada7692d9680da77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 01:22:09 2007 +0000
commit 4c82983010214f2588fbd7cf73265a816b7d8ac9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 01:17:25 2007 +0000
commit f60aa2aa21f59de0d741ecb7d8a46d1bff82513c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 00:34:44 2007 +0000
commit dedd62dd0ca0c066dd0fce32eaa7bff442bd15da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 31 00:08:09 2007 +0000
* More release notes.
commit b5ddcf58ad1283d462fd10935708f8b24bc05135
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 30 23:59:10 2007 +0000
* Fix the hashDerivationModulo test. I should really investigate
*why* the test failed...
commit 59707975a39b0a444444df4eb6c2e6d19ff5e050
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 30 23:36:09 2007 +0000
* Documented indented string literals.
* Release notes.
commit de012e76e2502cd5513cf7e7417aff6db3951cb2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 30 23:35:45 2007 +0000
* Don't use "store expression", it's obsolete.
commit 2196cb67c5a47eeb822351f1669c201e16ea6ebc
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Sun Dec 30 09:30:56 2007 +0000
Added a way to include derivation with its outputs and dependencies - exportBuildReferenceGraph
commit df303666bceb5715e706478fad0325447a2a52f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 14 14:49:35 2007 +0000
* Use strsignal if available to give better error messages for
builders that fail due to a signal.
commit 1e90b4189d5b922479a10eac550736d608b038fd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 14 14:15:30 2007 +0000
* Another insane Mac OS X 10.5 compatibility hack.
commit 485d71c54a323e967ef4f0b4c5ebf97e97d7d725
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 14 14:08:09 2007 +0000
* Mac OS X 10.5 compatibility: `echo -n foo' suddenly prints `-n foo'
instead of `foo' without a newline (with /bin/sh, not /bin/bash,
even though /bin/sh is also bash...). So use printf instead.
commit 30e4653783096c8349ef12512df12f0829764e65
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 13 22:06:19 2007 +0000
* Mac OS X 10.5 compatibility.
commit 4ff1335b2e7f69c33fa3d4223fe51e109338aa90
Author: Marc Weber <marco-oweber@gmx.de>
Date: Wed Dec 12 02:12:58 2007 +0000
small udpate
commit 3a2833daffcaf22894220837d9f9985580f5823a
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Mon Dec 10 22:16:47 2007 +0000
corrected --help message for nix-store a bit
commit 764b0115d5abd529d08d16f7bac2976e4a7e0cda
Author: Marc Weber <marco-oweber@gmx.de>
Date: Mon Dec 10 21:17:29 2007 +0000
Very basic nix vim syntax highlighting
commit b42ef9c0544009b372e3da0275553ce08cf0ea2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 6 10:20:58 2007 +0000
* Syntax to escape '', ${.
commit d4950f207f18e635cc13e3ee33103fd501456384
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 4 11:42:58 2007 +0000
* component -> package.
commit 6d6c68c0d29310b6eca35f58b1e68f495d6cd33a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 30 16:48:45 2007 +0000
* Added a new kind of multi-line string literal delimited by two
single quotes. Example (from NixOS):
job = ''
start on network-interfaces
start script
rm -f /var/run/opengl-driver
${if videoDriver == "nvidia"
then "ln -sf ${nvidiaDrivers} /var/run/opengl-driver"
else if cfg.driSupport
then "ln -sf ${mesa} /var/run/opengl-driver"
else ""
}
rm -f /var/log/slim.log
end script
'';
This style has two big advantages:
- \, ' and " aren't special, only '' and ${. So you get a lot less
escaping in shell scripts / configuration files in Nixpkgs/NixOS.
The delimiter '' is rare in scripts (and can usually be written as
""). ${ is also fairly rare.
Other delimiters such as <<...>>, {{...}} and <|...|> were also
considered but this one appears to have the fewest drawbacks
(thanks Martin).
- Indentation is intelligently stripped so that multi-line strings
can follow the nesting structure of the containing Nix
expression. E.g. in the example above 6 spaces are stripped from
the start of each line. This prevents unnecessary indentation in
generated files (which sometimes even breaks things).
See tests/lang/eval-okay-ind-string.nix for some examples.
commit 633518628f48fb9c06bfd570eeca6f62696aba05
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 29 16:18:24 2007 +0000
* nix-env -e: support uninstalling by path, so that one can say
$ nix-env -e $(which firefox)
or
$ nix-env -e /nix/store/nywzlygrkfcgz7dfmhm5xixlx1l0m60v-pan-0.132
* nix-env -i: if an argument contains a slash anywhere, treat it as a
path and follow it through symlinks into the Nix store. This allows
things like
$ nix-build -A firefox
$ nix-env -i ./result
* nix-env -q/-i/-e: don't complain when the `*' selector doesn't match
anything. In particular, `nix-env -q \*' doesn't fail anymore on an
empty profile.
commit 12d0a1eb753567bb2083aadb4ee3d325d3f29c70
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 29 14:15:33 2007 +0000
* Troubleshooting entry about running out of locks.
commit 06f95dd07ce691a1f12c8ec7fa5ad84858d81cd0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 21 13:49:59 2007 +0000
* New primop `readFile' to get the contents of a file as a string.
commit c370755583d7350f4b96136eb0a6a8a7b08551b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 16 16:15:26 2007 +0000
* Flag `--no-build-hook' to disable distributed builds.
* queryDeriver in daemon mode: don't barf if the other side returns an
empty string (which means there is no deriver).
commit c05783ad67ee95b5dd76d160efedc23b3acb0905
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 16 16:10:27 2007 +0000
* nix-store --import: add a flag --require-signature.
commit 6784b14241c916943cd9b1b0fa0af66fb574605c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 15 16:52:40 2007 +0000
* nix-build: pass --argstr to nix-instantiate.
commit ca210d2a581622e0276c5e98420189374652d24a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 15 15:33:30 2007 +0000
* Doh!
commit 149e27302334b6a83bfe293c15426d1a4abf958d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 15 15:07:27 2007 +0000
* Don't need gc.hh.
commit bfec245efa68f010b8687c1eee8dcf909c4d1343
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 15 14:28:08 2007 +0000
* Add build-remote.pl to the Nix distribution.
commit 6fc60e2060be5958c2aad1c859ee60bae5e23980
Author: Michael Raskin <7c6f434c@mail.ru>
Date: Thu Nov 15 03:47:12 2007 +0000
Added possibility to specify garbage collection levels for store paths; so packages can share intermediate results of compilation and GC will collect it automatically while never touching tarballs, for example.
commit 5b74a5957023bd51b7ba32fc244cb08931507a52
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 5 18:12:29 2007 +0000
* nix-prefetch-url: don't fail if /tmp/nix-prefetch-url-<pid> exists,
instead use a counter just like we do for temporary build
directories.
commit 5f8a203b556c649ef25b4b855ee795b6cff23e98
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 1 14:42:44 2007 +0000
* A rule to make a PDF version of the manual.
commit 1511aa11ce8a529ebf7210a9090653a7d7e885d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 1 13:28:33 2007 +0000
* Documented some of the more obscure derivation attributes (including
fixed-output derivations).
commit fa44e401a8ca5cddc2c5506984f0cd476e0b7d57
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 31 18:01:56 2007 +0000
* Documented multi-user Nix.
commit e007b50eb7ba070c039fc438f49a72bd248e1b5c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 29 22:16:36 2007 +0000
commit bfea7b1f3514e4b3b4fd094969de92efa46c415d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 29 14:31:45 2007 +0000
* Make the `--prebuilt-only' / `-b' option work not just for queries
but installations/upgrades as well. So `nix-env -ub \*' will
upgrade only those packages for which a substitute is available (or
to be precise, it will upgrade each package to the highest version
for which a substitute is available).
commit 0b95603595511db693378404b0f84d4033030dec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 29 10:46:45 2007 +0000
* Depend on bash instead of sh (since we use a few bashisms).
commit 42d80d11705579dbb1e8b9029e2beaa1e86baf91
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 29 10:03:07 2007 +0000
* On FreeBSD, sys/mount.h needs sys/param.h.
commit d91cd305634bfe0de200cb0b062a56349249d26e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 27 16:51:55 2007 +0000
* Detect whether chroot / bind-mount support is available.
commit dc6f373842ae65d6c407d8169089367d9c0d4e1a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 27 16:06:38 2007 +0000
* Delete the chroot directory automatically.
* Removed some debug messages.
commit 9397cd30c8a6ffd65fc3b85985ea59ecfb72672b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 27 00:46:59 2007 +0000
* Support for doing builds in a chroot under Linux. The builder is
executed in a chroot that contains just the Nix store, the temporary
build directory, and a configurable set of additional directories
(/dev and /proc by default). This allows a bit more purity
enforcement: hidden build-time dependencies on directories such as
/usr or /nix/var/nix/profiles are no longer possible. As an added
benefit, accidental network downloads (cf. NIXPKGS-52) are prevented
as well (because files such as /etc/resolv.conf are not available in
the chroot).
However the usefulness of chroots is diminished by the fact that
many builders depend on /bin/sh, so you need /bin in the list of
additional directories. (And then on non-NixOS you need /lib as
well...)
commit 0b4ed64d295316146fc4de8a5a2e971b771058b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 26 18:25:50 2007 +0000
* "trace" primop: write the trace to standard error.
commit cd08fb3fdeaeb80f8d980f7ef2ace93cf5194c0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 24 13:54:06 2007 +0000
commit d423968ba1d4f13abd469aa5b2e7ee5facac71d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 23 16:34:04 2007 +0000
* Improved introduction (actually copied mostly from the homepage).
commit 612b3e8fa35dde4893f92b4d0a5cfb5aa040f551
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 22 15:28:32 2007 +0000
* Document the new primops in Nix 0.11.
commit 35ac16e75e1fb7c948adecd64904f40b96d1d8fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 22 12:58:28 2007 +0000
* Move list of built-in functions to a separate file.
commit 1db187ff690e6673433eb073088fe5169e12a4d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 22 12:46:15 2007 +0000
commit f90d85107e5ea092f125b8e83c0cce9eddae766e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 22 12:05:30 2007 +0000
commit f8ed2e64a5d77badf68263ac239ad9d991f23ea8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 22 12:05:18 2007 +0000
commit f529a3be8a1c1eab6af06171c498f38508e7a729
Author: Marc Weber <marco-oweber@gmx.de>
Date: Mon Oct 22 01:10:19 2007 +0000
Added comment telling about setup-hook and propagatedBuildInputs
commit 14e47e9c2caa7bec5778dd740ebb4a200b2b5c2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 10 14:58:00 2007 +0000
* Doh.
commit d04291cfabd81f3c9e06b2dba68a4edaf6f8df87
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 10 13:52:38 2007 +0000
* Doh! Don't change the permissions on /nix/store.
commit 315183f194881591480d9acd1eef685d6b64d7f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 10 13:43:04 2007 +0000
* nix-store --optimise: flag "--dry-run" to just query what the disk
savings would be.
commit a8629de827e4d5a67372614727ce6fcc26423f8c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 9 22:14:27 2007 +0000
* New command `nix-store --optimise' to reduce Nix store disk space
usage by finding identical files in the store and hard-linking them
to each other. It typically reduces the size of the store by
something like 25-35%. This is what the optimise-store.pl script
did, but the new command is faster and more correct (it's safe wrt
garbage collection and concurrent builds).
commit 27a0662828cb5ac9da198f35754750f12628d546
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 9 12:51:25 2007 +0000
* listToAttrs: the list now should consist of {name, value} attribute
sets instead of {attr, value}. "name" is better than "attr" because
the *combination* of the two forms the attribute.
commit 8a9fe6c11c4cf6ae9f3648ece844a8f392fc1cc0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 19 14:01:41 2007 +0000
* Manpage for nix-copy-closure.
commit 27f57c901800c085ecc4667748b2c3a2485ee8cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 18 14:01:14 2007 +0000
* Ignore dangling symlinks in ~/.nix-defexpr.
commit f3441e6122c3ce8f81576bfe79897a638c8f82e2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 18 09:11:20 2007 +0000
* Pass various options to the worker so that flags like -K or -j work
in multi-user Nix (NIX-72).
* Client/worker: exchange a protocol version number for future
compatibility.
commit 26f981c2e52bb8dc91311f9a4ca53f7e37233e5c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 18 08:26:55 2007 +0000
* Remove garbage.
commit c8ea8a09b88ec89ef9749e9d8bae09c7cada5d1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 17 19:24:07 2007 +0000
* nix-env -qa: make the "-A" flag do the expected thing, namely follow
the given attribute path (just as -A does with other option)
(NIX-83). So you can now say
$ nix-env -qa -A nixpkgs_unstable.gnome \*
atk-1.12.4
esound-0.2.36
...
to see the packages in the "gnome" attribute in Nixpkgs.
To *print* the attribute path, you should now use "--attr-path" /
"-P" (running out of letters...).
commit 055608227f5a003825a905b0eb2aea39cba5ca16
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 17 16:08:24 2007 +0000
* nix-env: allow ~/.nix-defexpr to be a directory. If it is, then the
Nix expressions in that directory are combined into an attribute set
{file1 = import file1; file2 = import file2; ...}, i.e. each Nix
expression is an attribute with the file name as the attribute
name. Also recurses into directories.
* nix-env: removed the "--import" (-I) option which set the
~/.nix-defexpr symlink.
* nix-channel: don't use "nix-env --import", instead symlink
~/.nix-defexpr/channels. So finally nix-channel --update doesn't
override any default Nix expressions but combines with them.
This means that you can have (say) a local Nixpkgs SVN tree and use
it as a default for nix-env:
$ ln -s .../path-to-nixpkgs-tree ~/.nix-defexpr/nixpkgs_svn
and be subscribed to channels (including Nixpkgs) at the same time.
(If there is any ambiguity, the -A flag can be used to
disambiguate, e.g. "nix-env -i -A nixpkgs_svn.pan".)
commit 3339f854473863c8780e537626f457be0b2b33e2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 11 13:32:04 2007 +0000
* Test the impureEnvVars feature.
commit 9441550acb34cf35f6cd3859d3672adca79551d9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 4 15:38:09 2007 +0000
* nix-push / generate-patches: bzip the manifest.
commit 7b20c0ed4b3ef518c1f55bfbb2ece932539f35ea
Author: Marc Weber <marco-oweber@gmx.de>
Date: Sun Sep 2 10:36:59 2007 +0000
explanation what happens when passing true / false and null values to derivation builders added
commit 0d65fc08e2f7e69976ab91271024a87dbeef380d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 30 09:50:44 2007 +0000
* Create the Nix daemon socket in a separate directory
(/nix/var/nix/daemon-socket). This allows access to the Nix daemon
to be restricted by setting the mode/ownership on that directory as
desired, e.g.
$ chmod 770 /nix/var/nix/daemon-socket
$ chown root.wheel /nix/var/nix/daemon-socket
to allow only users in the wheel group to use Nix.
Setting the ownership on a socket is much trickier, since the socket
must be deleted and recreated every time the daemon is started
(which would require additional Nix configuration file directives to
specify the mode/ownership, and wouldn't support arbitrary ACLs),
some BSD variants appear to ignore permissions on sockets, and it's
not clear whether the umask is respected on every platform when
creating sockets.
commit cb1c1004cdd582abe67146ab3904bd88de3a1d4e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 28 16:22:08 2007 +0000
* When there are multiple substituters, make sure to release the
lock on the output path after trying each. Otherwise the
pathIsLockedByMe() test gets confused.
commit c970b28ba0f8866bde800849120d429d781ccb5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 28 11:36:17 2007 +0000
* Fix a race condition with parallel builds where multiple
fixed-output derivations or substitutions try to build the same
store path at the same time. Locking generally catches this, but
not between multiple goals in the same process. This happened
especially often (actually, only) in the build farm with fetchurl
downloads of the same file being executed on multiple machines and
then copied back to the main machine where they would clobber each
other (NIXBF-13).
Solution: if a goal notices that the output path is already locked,
then go to sleep until another goal finishes (hopefully the one
locking the path) and try again.
commit bc0429b1cd94289ac8d8a51f562b920999002b89
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 28 11:31:44 2007 +0000
* Doh! Broken test.
commit e0d7e47862aa1b33292fb8d05e5d50ad4ebf3590
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 28 09:39:03 2007 +0000
* PathLocks::lockPaths: don't allow reacquiring a lock we already
hold.
commit 455a7b95776440a56fd5d545d3b9a01cbae1d8e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 28 09:21:47 2007 +0000
* Test case to show that parallel builds of different fixed-output
derivations that produce the same output path don't work properly
wrt locking. This happens a lot in the build farm when fetchurl
derivations downloading the same file on different platforms are
executed in parallel and then copied back to the main machine.
commit 7d5836b34df363c2b2e7fc1574aaba1dde9a697e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 22 14:52:22 2007 +0000
* nix-channel: supports users who don't have write permission to the
manifests directory. In that case, we don't do a nix-pull, so the
user gets pure source deployment.
The directory /nix/var/nix/gcroots/per-user/$USER should be
writable. (It's created automatically if
/nix/var/nix/gcroots/per-user is writable, e.g. if it has 1777
permission.)
commit 2629998e9167b2d7897a2f34a6f531affc4033db
Author: Marc Weber <marco-oweber@gmx.de>
Date: Sat Aug 18 22:12:00 2007 +0000
primop functions listToAttrs (+test), __isAttrs, __trace added
new configuration style proposal in lib/default-unstable.nix
commit dbc0170ed998484178780d9390ae0d4434bf93b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 15 09:24:06 2007 +0000
* Show errors in nix-prefetch-url.
commit 5c793ad03e08f8f795397af1d49034ac6f616ade
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 14 13:43:51 2007 +0000
* Hopefully this fixes the test on FreeBSD.
commit ffa1c61cd50a512685b44c55261c1539890482f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 14 13:15:59 2007 +0000
* Fix the tests.
commit a7e1a51fdf5d93b0a158a120595443fe9c7c6687
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 13 14:56:40 2007 +0000
* A test for the nix-worker.
commit 550ba9ebb4b1b2415c9930879cfa6937f7fa916a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 13 13:15:02 2007 +0000
* Fix the tests.
commit 3757ee589f46a401fdacaa2126e6bf4902eee23d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 13 11:37:39 2007 +0000
* Bump the Nix database schema version number; delete the substitutes
table.
commit 59afc1a15cfb90c333aa7423e46be32cc0635b12
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 13 11:15:13 2007 +0000
* Backwards compatibility.
commit 9e975458b48d9eb041a6484c634be2ee8ee1649d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Aug 12 00:29:28 2007 +0000
* Get rid of the substitutes database table (NIX-47). Instead, if we
need any info on substitutable paths, we just call the substituters
(such as download-using-manifests.pl) directly. This means that
it's no longer necessary for nix-pull to register substitutes or for
nix-channel to clear them, which makes those operations much faster
(NIX-95). Also, we don't have to worry about keeping nix-pull
manifests (in /nix/var/nix/manifests) and the database in sync with
each other.
The downside is that there is some overhead in calling an external
program to get the substitutes info. For instance, "nix-env -qas"
takes a bit longer.
Abolishing the substitutes table also makes the logic in
local-store.cc simpler, as we don't need to store info for invalid
paths. On the downside, you cannot do things like "nix-store -qR"
on a substitutable but invalid path (but nobody did that anyway).
* Never catch interrupts (the Interrupted exception).
commit 4695f4edd6925147a59befefce1c66d34bb2d0e4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 10 01:42:00 2007 +0000
* nix-pull: support bzipped manifests: when doing a nix-pull on $url,
try $url.bz2 first.
commit 911bc01454fba42b531f3f8dd0781845b045be63
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 10 00:28:44 2007 +0000
* Enable nix-prefetch-url caching in nix-channel.
commit 5e52df18fefb188b7c7a8e917ebeb8ea1f5ed95a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 10 00:22:21 2007 +0000
* Don't rely on /dev/stdin.
commit c5e934dcc9f3c0e75cd14fd7dbab6048abf907d1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 9 23:52:53 2007 +0000
* nix-pull: using nix-prefetch-url (so that we get caching for free),
and store the manifests in the Nix store. (So now
/nix/var/nix/manifests/ just contains symlinks to the store and is
searched for GC roots.)
commit f881f7a017059fb501668aa85d41e873fe8f5285
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 9 23:16:44 2007 +0000
* nix-prefetch-url: support caching. If the environment variable
NIX_DOWNLOAD_CACHE is set, then nix-prefetch-url will store the hash
and timestamp of downloaded files in the directory
$NIX_DOWNLOAD_CACHE. This allows it to figure out if the file is
still in the Nix store.
commit ef240bc0d564d8de8877724756c1e7765c74ff75
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 7 23:40:39 2007 +0000
* Use the new patched version of the aterm library.
commit d71cc503a6f50f8c576eb8665ce3cf08d74e035b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 7 15:00:13 2007 +0000
* Don't allocate input files on the stack.
commit 4cad125e088576035ea8f7955d7770278aa6ed24
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 6 16:08:09 2007 +0000
* Optionally warn about packages that give an assertion failure.
commit 6da6fbfbe940feb807eeef20035d6603448d4d5e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 5 20:33:04 2007 +0000
* Properly keep packages during upgrades.
commit 6d1a1191b053645fa0277830524bf085a7fe0956
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 12 16:53:44 2007 +0000
* Support queryDeriver() in multi-user installations.
commit 9d9e1c5c41023e03ed5069ba6fc17ad3cfeab9f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 11 13:59:07 2007 +0000
* Distribute bzip2 1.0.4.
commit 9bff7ad7287dafff1e06f3c3db6a5ec295d7c152
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 11 11:36:22 2007 +0000
* Check against creation of GC roots in the store. Those roots don't
work, because findRoots() stops when it encounters a symlink to the
store. And of course the store is supposed to be read-only.
commit f3ebd03bb17533806d38fe871200b1dc4688acdc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 4 12:03:33 2007 +0000
* Remove debug statement.
commit 40b6f06f09ce1faa5fb7532475623dfd5e4d6208
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat Jun 2 15:03:54 2007 +0000
change default NIX_HASH_ALGO
commit b47da5ea21df9ba558f05516198d401f76719cf5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 16 22:07:39 2007 +0000
commit bddc83a1487e9f3c1bb3ac2279c0238e8e6c3ff3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 16 16:17:04 2007 +0000
* New builtin function "isFunction". You're not supposed to use it
;-)
* Channels: fix channels that are plain lists of derivations (like
strategoxt-unstable) instead of functions (like nixpkgs-unstable).
This fixes the error message "error: the left-hand side of the
function call is neither a function nor a primop (built-in
operation) but a list".
commit ca00aa11714921804afb490d0613086f549fb894
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 15 12:14:37 2007 +0000
* Allow empty argument lists in function definitions (e.g., `{}:
bla'). Also allow trailing commas (`{x, y,}: ...') as a unintented
consequence. Hopefully the reduce/reduce conflict won't cause any
problems.
commit 7046c35843af7c6232efc7e7ee23b26096e0c692
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 14 12:16:41 2007 +0000
* Typo (reported by Marc Weber).
commit e5da9c88039c360065f20cfd513f2fe68430f04a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 7 16:59:19 2007 +0000
* Create the database directory if it doesn't exist.
commit 30beeb27a9729366cb4a93d602815827a6153d06
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 2 19:38:02 2007 +0000
* Set the right priorities when recovering from a directory
collision.
commit 34d4c9388b31f21710939399376f3ade08ab2162
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 2 16:06:04 2007 +0000
commit 93aefd9fc0250eda2c47d22a88922d319cde34b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 1 23:16:38 2007 +0000
* Give unpacked channels more sensible names than 0, 1, ... They now
get the basename of the channel URL (e.g., nixpkgs-unstable). The
top-level Nix expression of the channel is now an attribute set, the
attributes of which are the individual channels (e.g.,
{nixpkgs_unstable = ...; strategoxt_unstable = ...}). This makes
attribute paths ("nix-env -qaA" and "nix-env -iA") more sensible,
e.g., "nix-env -iA nixpkgs_unstable.subversion".
commit a9d15d4f434fece269852a65be836d1338ed787d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 1 20:33:18 2007 +0000
* nix-env -i: instead of breaking package ties by version, break them
by priority and version install. That is, if there are multiple
packages with the same name, then pick the package with the highest
priority, and only use the version if there are multiple packages
with the same priority.
This makes it possible to mark specific versions/variant in Nixpkgs
more or less desirable than others. A typical example would be a
beta version of some package (e.g., "gcc-4.2.0rc1") which should not
be installed even though it is the highest version, except when it
is explicitly selected (e.g., "nix-env -i gcc-4.2.0rc1").
* Idem for nix-env -u, only the semantics are a bit trickier since we
also need to take into account the priority of the currently
installed package (we never upgrade to a lower priority, unless
--always is given).
commit cbfac2fdccc83b04d9c2027e9e21070d4ac7c7e5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 1 15:16:17 2007 +0000
* Set a terminate() handler to ensure that we leave the BDB
environment cleanly even when an exception is thrown from a
destructor. We still crash, but we don't take all other Nix
processes with us.
commit 644946feed146396c00c288337bad26428970aa4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 1 13:21:05 2007 +0000
* Make --verify more interruptable.
commit bd1f66453a7a1900f9fa850a7052b3fbe3e26933
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 1 11:30:52 2007 +0000
* `nix-env -q --xml --meta' to show all meta attributes.
commit e20f0da22ccb28d94bfd82fa66e2a723c75951f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 30 18:41:27 2007 +0000
* Doh.
commit 89c1d2b202dccbf91c40586ac33efee515f7e93d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 27 23:48:14 2007 +0000
* Package flag "keep" that prevents a package from being removed from
a user environment by an install or upgrade action. This is
particularly useful if you have a version installed that you don't
want to upgrade (e.g., because the newer versions are broken).
Example:
$ nix-env -u zapping --dry-run
(dry run; not doing anything)
upgrading `zapping-0.9.6' to `zapping-0.10cvs6'
$ nix-env --set-flag keep true zapping
$ nix-env -u zapping --dry-run
(dry run; not doing anything)
However, "-e" will still uninstall the package. (Maybe we should
require the keep flag to be explicitly set to false before it can be
uninstalled.)
commit a46db5d013a5c3ab5b041824bfb935e5c042886c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 27 23:28:44 2007 +0000
* Package conflict resolution through priority levels. If there is a
user environment collission between two packages due to overlapping
file names, then a package with a higher priority will overwrite the
symlinks of a package with a lower priority. E.g.,
$ nix-env --set-flag priority 5 gcc
$ nix-env --set-flag priority 10 binutils
gives gcc a higher priority than binutils (higher number = lower
priority).
commit 3d05166086682b39e013001bdaedb3e8b68a769f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 27 22:40:59 2007 +0000
* Allow conflicting packages to be kept in a user environment, and
allow switching between them (NIX-80).
Example: two versions of Pan:
$ nix-env -q pan
pan-0.128
pan-0.14.2.91
$ readlink $(which pan)
/nix/store/l38jrbilw269drpjkx7kinhrxj6fjh59-pan-0.14.2.91/bin/pan
At most one of them can be active any given time. Assuming than
0.14.2.91 is active, you can active 0.128 as follows:
$ nix-env --set-flag active false pan-0.14.2.91
$ nix-env --set-flag active true pan-0.128
$ readlink $(which pan)
/nix/store/nziqwnlzy7xl385kglxhg75pfl5i936n-pan-0.128/bin/pan
More flags to follow.
commit b7f0f65c1934851b038826b2ab78c0378a36143a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 26 14:20:31 2007 +0000
* nix-env -q now has a flag --prebuilt-only (-b<) that causes nix-env
to show only those derivations whose output is already in the Nix
store or that can be substituted (i.e., downloaded from somewhere).
In other words, it shows the packages that can be installed “quickly”,
i.e., don’t need to be built from source.
commit 5dc05b76ab88a332521a777d6a42974b3f432f02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 16 16:08:44 2007 +0000
* Updated dependency information.
commit 5f2492eaecfe8d3451812e894852b1330492e827
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 16 15:03:19 2007 +0000
* New primop "throw <string>" to throw an error. This is like abort,
only thrown errors are caught by the top-level derivation evaluation
in nix-env -qa / -i.
commit 0a8eeea9d8060b9d25891ccc5a9d55e32bf829ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 16 14:45:25 2007 +0000
* Remove a warning.
commit 2716f9bc5f947ffdd2835c2a820ca8d35544630e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 16 12:00:13 2007 +0000
* It seems that svnversion prints a carriage return on Cygwin, so we
get a invalid #define VERSION. Use "svnversion -n" to leave out the
newline. Fix provided by Marc Weber.
commit ae7990cc88dcc6a61edfe9e442174bc5b1bc3299
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 30 13:24:35 2007 +0000
* Work around a bug in Apple's GCC preprocessor.
commit 4caca58ff7cc2edae110a11b9c47d14fea345eca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 30 09:01:05 2007 +0000
* Make the maximum patch size configurable.
commit 17b506c0c7a927da1befc62100c5354e4b3147f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 28 15:46:21 2007 +0000
* Handle ECONNRESET from the client. Also, don't abort() if there are
unexpected conditions in the SIGPOLL handler, since that messes up
the Berkeley DB environment (which a client must never be able to
trigger).
commit efd31139dfd07600c909fa14870c82d90c6ca9de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 27 09:53:58 2007 +0000
* Forgot a @bindir@.
commit d303b389a9dbd44fe60deba5e98e68ec98bdddd3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 26 21:05:17 2007 +0000
* `nix-copy-closure --from': copy from a remote machine instead of to
a remote machine.
commit 7edd2e2cd281cadbc9b7a5afbb279e5570caf77a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 26 20:49:22 2007 +0000
* Refactoring.
commit f3584ff535f4244f6df7d0eadf9695fd8a747c8d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 21 12:39:55 2007 +0000
* Fix URL/description.
commit 803cb6e3b9c0719add9a977e76ab3fadb78858f0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 20 22:04:25 2007 +0000
* Override the setuid helper using NIX_SETUID_HELPER.
commit a8ea4cbcc8337e0fd4d423201794891fdf6e8677
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 20 11:13:15 2007 +0000
* Scan /proc/sys/kernel/modprobe for roots to prevent the kernel
modules for the running kernel from being garbage-collected. Idem
for /proc/sys/kernel/fbsplash.
commit 8ab229ddf2383ec6455836f342539b8c89356f76
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 19 12:48:45 2007 +0000
* Terminate build hooks and substitutes with a TERM signal, not a KILL
signal. This is necessary because those processes may have joined
the BDB environment, so they have to be given a chance to clean up.
(NIX-85)
commit b2b6cf3fc83f0e1625214ae31b0b088a266234bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 19 09:16:47 2007 +0000
* Undocumented option `gc-check-reachability' to allow reachability
checking to be turned off on machines with way too many roots.
commit eb2dd4815c05fcc592d049bddcd2f42d13216eab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 13 11:30:57 2007 +0000
* Remove old generations in all directories under
/nix/var/nix/profiles, not just in that directory itself. (NixOS
puts profiles in /nix/var/nix/profiles/per-user.)
commit 917e06bf6398ed77a23e5e1fc894321a7fc7f86e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 7 15:53:11 2007 +0000
* Delete the output paths before invoking the build hook.
commit df0283ae86afd1a40a83b2abc3705146ab0a6cb8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 1 13:55:47 2007 +0000
* Get rid of those stupid --login tricks, it's the responsibility of
the remote system to make sure that Nix is in the $PATH.
commit 30394a4f3f99ccfffb6935b47433c320f00e2a67
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 1 13:49:20 2007 +0000
* sh -> bash.
commit db1973d01277278b58253676337e568d5591c01f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 1 13:30:46 2007 +0000
* Look for the openssl program at compile time. If not found, call
openssl through $PATH at runtime.
commit b4a040e52b607e019515e9339f90a2e5c6c21ad5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 1 12:30:24 2007 +0000
* Don't check the signature unless we have to.
commit 2ea3bebc23b2d13475c00191f6005740fbdc7771
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 27 23:18:57 2007 +0000
* Doh! The deriver can be empty.
commit 044b6482c185ba8966d9d893b033d97d66b5f225
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 27 19:10:45 2007 +0000
* Greatly reduced the amount of stack space used by the Nix expression
evaluator. This was important because the NixOS expressions started
to hit 2 MB default stack size on Linux.
GCC is really dumb about stack space: it just adds up all the local
variables and temporaries of every scope into one huge stack frame.
This is really bad for deeply recursive functions. For instance,
every `throw Error(format("error message"))' causes a format object
of a few hundred bytes to be allocated on the stack. As a result,
every recursive call to evalExpr2() consumed 4680 bytes. By
splitting evalExpr2() and by moving the exception-throwing code out
of the main functions, evalExpr2() now only consumes 40 bytes.
Similar for evalExpr().
commit adce01a8d05ee21890a5be699a26f1835594cb5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 27 17:28:51 2007 +0000
* When NIX_SHOW_STATS=1, show the amount of stack space consumed by
the Nix expression evaluator.
commit 363e307fd360c32a932b9bcb1d620d3add259f79
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 26 23:32:10 2007 +0000
* Error message to stdout.
commit ddde8e2f32b5c6785e9ac7c6ea6eb84813cca293
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 22 18:15:29 2007 +0000
* Handle EINTR in select().
commit 27bb0ac7d2571d32c28cd09bf23cf916905d2557
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 22 17:00:58 2007 +0000
* /man -> /share/man
commit fa2be32034dcb25f9382dda91514a7785211f443
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 22 16:42:01 2007 +0000
* nix-copy-closure: force a login shell on the remote machine to make
sure that nix-store is in the PATH.
* nix-copy-closure: option --gzip to compress data.
commit 4c5e6d1a2f48a26c22ee5b515f8ac672d3d2e7ab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 22 15:48:20 2007 +0000
* nix-copy-closure: option --sign.
* nix-copy-closure: set SSH options through NIX_SSHOPTS..
commit 024a8ed3822867c5f9b9498bd8b27fa5dc180846
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 23:14:53 2007 +0000
* New command `nix-copy-closure' to copy a closure to a Nix store on
another machine through ssh. E.g.,
$ nix-copy-closure xyzzy $(which svn)
copies the closure of Subversion to machine `xyzzy'. This is like
`nix-pack-closure $(which svn) | ssh xyzzy', but it's much more
efficient since it only copies those paths that are missing on the
target machine.
commit 7f6161ab3af81e0adf834d9cfb6d232ad5c54ec2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 23:08:55 2007 +0000
* Flush cout to show progress.
commit 0db450024dbeadf0c595a6de8743b7cb8f3dcbcd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 23:00:31 2007 +0000
* Export/import many paths in one go.
commit 9da367b7d5e7c71efd802b87c99c11faff141499
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 22:45:10 2007 +0000
* `nix-store -qR' and friends: print the paths sorted topologically
under the references relation. This is useful for commands that
want to copy paths to another Nix store in the right order.
commit 881feb96987dace75f983c16fec1013b70602d4f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 17:57:59 2007 +0000
* Flag `--print-invalid' in `nix-store --check-validity' to print out
which paths specified on the command line are invalid (i.e., don't
barf when encountering an invalid path, just print it). This is
useful for build-remote.pl to figure out which paths need to be
copied to a remote machine. (Currently we use rsync, but that's
rather inefficient.)
commit 65f195f4c7eec4f0880e7c3953aa5e78eeffbebf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 17:51:10 2007 +0000
* Check that the file containing the secret key is secret.
commit bdadb98de8fcd5ed99cca97071741e2775f3ada2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 17:34:02 2007 +0000
* `nix-store --import' now also works in remote mode. The worker
always requires a signature on the archive. This is to ensure that
unprivileged users cannot add Trojan horses to the Nix store.
commit 0f5da8a83c227879566ed87623617fe195bc6f88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 16:34:00 2007 +0000
* Support exportPath() in remote mode.
commit dc7d59477613e88b18133208f6c8b2f646e66260
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 16:23:25 2007 +0000
* importPath(): set the deriver.
* exportPath(): lock the path, use a transaction.
commit 43c4d18c6a4e1a8b129114439718e26c12b49ca8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 15:45:32 2007 +0000
* `nix-store --import': import an archive created by `nix-store
--export' into the Nix store, and optionally check the cryptographic
signatures against /nix/etc/nix/signing-key.pub. (TODO: verify
against a set of public keys.)
commit 46e0919ced4646004cc0701b188d0a68e24e8924
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 14:31:42 2007 +0000
* `nix-store --export --sign': sign the Nix archive using the RSA key
in /nix/etc/nix/signing-key.sec
commit 6c9fdb17fbda181fc09a9ce1f49662ef522d006b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 21 14:00:46 2007 +0000
* Don't use $SHELL.
commit b824a1daeefd1611c8d84432dc0b2b38f24bbbfd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 20 23:17:20 2007 +0000
* Start of `nix-store --export' operation for serialising a store
path. This is like `nix-store --dump', only it also dumps the
meta-information of the store path (references, deriver). Will add
a `--sign' flag later to add a cryptographic signature, which we
will use for exchanging store paths between build farm machines in a
secure manner.
commit 3390c1be76f648ac0b18199c6204a32d1d6d5fbb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 20 22:57:46 2007 +0000
* Temporary notes on how we're going to use OpenSSL.
commit 8181a1c3bbb35642d8242f13c3bbd17fe468c8e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 20 22:49:08 2007 +0000
* Close the file - just in case.
commit 46605fb4f5024120f894f9894b8873c6a666a7a5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 6 20:03:53 2007 +0000
* Fix 64-bit compiler warnings.
commit 52d03276dd035aab2fc5c0c6e462866b6f96d6fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 5 12:10:10 2007 +0000
* Compatibility with docbook5-xsl.
commit 451dbf687f65b42d70e64c3858771abaab51b356
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 2 01:52:42 2007 +0000
* nix-env now maintains meta info (from the `meta' derivation
attribute) about installed packages in user environments. Thus, an
operation like `nix-env -q --description' shows useful information
not only on available packages but also on installed packages.
* nix-env now passes the entire manifest as an argument to the Nix
expression of the user environment builder (not just a list of
paths), so that in particular the user environment builder has
access to the meta attributes.
* New operation `--set-flag' in nix-env to change meta info of
installed packages. This will be useful to pass per-package
policies to the user environment builder (e.g., how to resolve
collision or whether to disable a package (NIX-80)) or upgrade
policies in nix-env (e.g., that a package should be "masked", that
is, left untouched by upgrade actions). Example:
$ nix-env --set-flag enabled false ghc-6.4
commit f52de527c7743d8fe28574f02b632566a1006244
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 29 15:55:49 2007 +0000
* Doh!
commit b618fa6eb6aa4cc128286ab748bfb100fa46a888
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 29 15:51:37 2007 +0000
* computeStorePathForText: take the references into account when
computing the store path (NIX-77). This is an important security
property in multi-user Nix stores.
Note that this changes the store paths of derivations (since the
derivation aterms are added using addTextToStore), but not most
outputs (unless they use builtins.toFile).
commit c558b1583c0e23bf4e19e916ef0ba223b61405a3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 29 15:15:37 2007 +0000
* Don't capitalise the primop functions.
commit 18e60961057f67995bf76b1952c8673b89f59bc2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 29 15:11:32 2007 +0000
* Organise primops.cc a bit better.
commit 7349bd0176b8a8ced3a017bb5d0e9ebb30570722
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 29 14:23:09 2007 +0000
New primitives:
* `sub' to subtract two numbers.
* `stringLength' to get the length of a string.
* `substring' to get a substring of a string. These should be enough
to allow most string operations to be expressed.
commit 7dedbd896ade732ab2fe88a5fe88e069cb329fa5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 29 13:32:50 2007 +0000
* filterSource: pass strings to the predicate function instead of
paths. Paths can have unexpected semantics.
commit 84a84afb0ec60551c606fa95699afb6153465704
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 24 13:31:20 2007 +0000
* Nasty: Glibc clears the TMPDIR environment variable in setuid
programs, so if a builder uses TMPDIR, then it will fail when
executed through nix-setuid-helper. In fact Glibc clears a whole
bunch of variables (see sysdeps/generic/unsecvars.h in the Glibc
sources), but only TMPDIR should matter in practice. As a
workaround, we reinitialise TMPDIR from NIX_BUILD_TOP.
commit fac63d6416ae0f7aec6c986d9d258b25047a24e2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 23 16:57:43 2007 +0000
* exportReferencesGraph: work on paths within store paths as well.
commit bae75ca5a18edbb9fb959e2e48065a1987ffb61a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 23 16:50:19 2007 +0000
* New kind of manifest object: "localPath", which denotes that a store
path can be created by copying it from another location in the file
system. This is useful in the NixOS installation.
commit 36d9258c0dbfeab095dc5727b6ebcb55afacb0a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 23 16:05:59 2007 +0000
* Successors have been gone for ages.
commit 7bc30e1ca8e20ee54175881364663ce5aaf1fa1c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 22 09:53:36 2007 +0000
* nix-prefetch-url: change the default hash to SHA-256 (in base-32).
commit 71ceb1c16102f82e15375afb44e0ac59e39eaa23
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 15 14:50:25 2007 +0000
* Handle multiple indirect symlinks when loading a Nix expression.
commit e4b0666f8eee3fc48f37c0cd3fd194c27652173c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 15 08:54:51 2007 +0000
* builtins.filterSource: pass the type of the file ("regular",
"directory", "symlink") as the second argument to the filter
predicate.
commit 63f3ce6d9a26cb46a2f066dd9c5f2af25b3610df
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jan 14 17:28:30 2007 +0000
* `nix-store --verify': revive checking the referrers table. This is
important to get garbage collection to work if there is any
inconsistency in the database (because the referrer table is used to
determine whether it is safe to delete a path).
* `nix-store --verify': show some progress.
commit 8f67b3588603483402440538d7dc326451bbe60d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jan 14 16:24:49 2007 +0000
* Make the garbage collector more resilient to certain consistency
errors: in-use paths now cause a warning, not a fatal error.
commit 8659edc0981373a42f123cd7d84b9925be0123bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jan 14 12:33:04 2007 +0000
* Don't forget the .flags files.
commit e418976107ed1581c108c82cd5b3b06c2f4ba9db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jan 14 12:32:44 2007 +0000
* Option --argstr for passing string arguments easily. (NIX-75)
commit 4e329f173f738dfc83e58bdb8ad2ced6c452a395
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jan 14 12:16:58 2007 +0000
* Doh.
commit afe23b5f385901ba5972ce88b2f053526c5097a9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 19:50:42 2007 +0000
* nix-pack-closure: store the top-level store paths in the closure.
* nix-unpack-closure: extract the top-level paths from the closure and
print them on stdout. This allows them to be installed, e.g.,
"nix-env -i $(nix-unpack-closure)". (NIX-64)
commit f25f9000451ec5b9fb3221cdf2a297fe24ab7357
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 18:25:30 2007 +0000
* Allow multiple --attr / -A arguments in nix-build / nix-instantiate
(NIX-74).
commit 215505bb46503b083fd64dd9a65e7b79d6eadf21
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 17:54:01 2007 +0000
* Removed chroot support.
commit f23dcdd60330c3b2f83b5b4278e38c245c397468
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 16:17:07 2007 +0000
* Canonicalise ASTs in `nix-instantiate --eval': remove position
info, sort attribute sets.
commit 05879db628a31f53c69a0fc29311c840c80837e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 15:41:54 2007 +0000
* Memoize strict evaluation.
commit 501158845919c8bdf4297a8a76a916dc5b9a7943
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 15:11:10 2007 +0000
* printTermAsXML: treat derivations specially; emit an element
<derivation outPath=... drvPath=...> attrs </derivation>. Only emit
the attributes of any specific derivation only. This prevents
exponententially large XML output due to the absense of sharing.
commit 792878af911bd1913706a1a8ee5a18f7230352ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 14:48:41 2007 +0000
* Make printing an expression as XML interruptible.
commit 11158028be348ed9eb58bf78f4cc9711e8bfe664
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jan 13 14:21:49 2007 +0000
* Cleanup.
commit 1b7840b949f038d44f31492bd59e0e189e17ef9c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 11 19:28:28 2007 +0000
commit 69c8b5b8a7165e1b9468c2b98a56b0e5af092a69
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 11 16:19:45 2007 +0000
* Install generate-patches into libexec.
commit 1f3722bd4ad2ee0b97f9622574547f144dad6932
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 8 15:32:15 2007 +0000
* Reject patches that are larger than a certain fraction of the full archive
(currently 60%). Large patches aren't very economical.
commit 50bdec410adaf4acacd40444203799ac110e34d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 8 15:17:18 2007 +0000
* Huge speedup in patch propagation (20 minutes or so to 3 seconds).
commit 4c63f9fe0493e07039c2a75a0926d2aab8cb6549
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 29 22:23:51 2006 +0000
* Another great success.
commit 57969b95b321ca9527de9e4625db5fb6ad709e01
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 29 20:37:55 2006 +0000
* Testing 1 2 3.
commit cafaceb70721e9a5aea478501eb3b572bbacaa68
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 15 21:27:26 2006 +0000
* Handle weird cases when the server redirects us while setting a cookie.
commit 1073b1780a68522a5cad0fe0e1e6735365034118
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 13 14:29:05 2006 +0000
* Remove debug message.
commit a3e6415ba8cf1b8d2a1db40c06997d997eac8afc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 12 23:05:01 2006 +0000
* New primop builtins.filterSource, which can be used to filter files
from a source directory. All files for which a predicate function
returns true are copied to the store. Typical example is to leave
out the .svn directory:
stdenv.mkDerivation {
...
src = builtins.filterSource
(path: baseNameOf (toString path) != ".svn")
./source-dir;
# as opposed to
# src = ./source-dir;
}
This is important because the .svn directory influences the hash in
a rather unpredictable and variable way.
commit b438d37558eab56a2927771013c9080675381ba8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 12 21:51:02 2006 +0000
* In dumpPath(): pass a function object that allows files to be
selectively in/excluded from the dump.
commit 3130f1f0fa484495ebca89bd458cf7fffa522687
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 12 20:17:14 2006 +0000
* Push.
commit 7ace29dae7bc928e5511c148408825f6d846771e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 12 19:06:02 2006 +0000
* New operation `nix-env --set' which sets a user environment to a
single derivation specified by the argument. This is useful when we
want to have a profile for a single derivation, such as a server
configuration. Then we can just say (e.g.)
$ nix-env -p /.../server-profile -f server.nix --set -A server
We can't do queries or upgrades on such a profile, but we can do
rollbacks. The advantage over -i is that we don't have to worry
about other packages having been installed in the profile
previously; --set gets rid of them.
commit 1a7e88bbd9290987e72616d42c9e9d344acc2a86
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 12 16:14:31 2006 +0000
* New built-in function `builtins.attrNames' that returns the
names of the attributes in an attribute set.
commit 5e6699188fba38619dc23c0b65ee70849f90ea6c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 9 23:14:55 2006 +0000
commit b17677462c56161bb00fb2d90f2c8e3e2a855229
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 9 20:02:27 2006 +0000
* Use lchown() instead of chown() in canonicalisePathMetaData(). This
matters when running as root, since then we don't use the setuid
helper (which already used lchown()).
* Also check for an obscure security problem on platforms that don't
have lchown. Then we can't change the ownership of symlinks, which
doesn't matter *except* when the containing directory is writable by
the owner (which is the case with the top-level Nix store directory).
commit 5f681988f210dd8edbb0d13da7d00e1c0e2a1769
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 9 00:26:24 2006 +0000
* Use deletePathWrapped() in more places.
commit fa333031464ca394317a55a0e7c6b773f068aae2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 8 18:41:48 2006 +0000
* Goal cancellation inside the waitForInput() loop needs to be handled
very carefully, since it can invalidate iterators into the
`children' map.
commit 06c4929958c60b085cbe18a558df9ef58c8f8689
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 8 17:26:21 2006 +0000
* Some refactoring.
* Throw more exceptions as BuildErrors instead of Errors. This
matters when --keep-going is turned on. (A BuildError is caught
and terminates the goal in question, an Error terminates the
program.)
commit 9dbfe242e3bdbfc7728a36c8a2b9fbbea2c8ed68
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 8 15:44:00 2006 +0000
* Kill a build if it has gone for more than a certain number of
seconds without producing output on stdout or stderr (NIX-65). This
timeout can be specified using the `--max-silent-time' option or the
`build-max-silent-time' configuration setting. The default is
infinity (0).
* Fix a tricky race condition: if we kill the build user before the
child has done its setuid() to the build user uid, then it won't be
killed, and we'll potentially lock up in pid.wait(). So also send a
conventional kill to the child.
commit d3fe6ab024df7764f4de2a9dcf88e2daa981f786
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 8 00:19:50 2006 +0000
* Also for convenience, change the ownership of the build output even
in case of failure.
commit 096194ab29db244fe791404e02b729a3e38eee8d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 23:58:36 2006 +0000
* Remove ancient terminology.
commit 6833e8bbe89dc61bda59a1e04c01415501ad4133
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 23:27:40 2006 +0000
* When keeping the temporary build directory (-K), change the owner
back to the Nix account.
commit e24d0201c29b09483944b462bd62b71a90c99c97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 22:07:05 2006 +0000
* Doh!
commit 2819eb36a43488c348942de5ef4dca4442b999db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 21:43:35 2006 +0000
* Be less verbose.
commit 4ca01065c3df106eb9610c425b2c604ba96db365
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 20:47:30 2006 +0000
* Rename all those main.cc files.
commit d03f0d411740aebd5b27e5a1ac57d8533843ff6b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 18:51:11 2006 +0000
* Check for lchown.
commit c3286ec020dfa20edcad6ad3cea519546e5207f1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 17:52:58 2006 +0000
* Don't count on the Pid deconstructor to kill the child process,
since if we're running a build user in non-root mode, we can't. Let
the setuid helper do it.
commit a82d80ddeb6f68ff136124dfb591a404bb195ea3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 16:40:41 2006 +0000
* Move setuidCleanup() to libutil.
commit f76fdb6d42a1b539fcf0b77d8efc5262283a19ea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 16:33:31 2006 +0000
* If not running as root, let the setuid helper kill the build user's
processes before and after the build.
commit ec23ecc64d40b7f65585c23592db123127967221
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 15:54:52 2006 +0000
* In the garbage collector, if deleting a path fails, try to fix its
ownership, then try again.
commit a0a43c32062f756b32feca7d04e89fb5d01767db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 15:18:14 2006 +0000
* When not running as root, call the setuid helper to change the
ownership of the build result after the build.
commit 6a07ff1ec068c6255d45644eb182dea5c0027286
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 14:14:35 2006 +0000
* Change the ownership of store paths to the Nix account before
deleting them using the setuid helper.
commit 7d8cf316eec3b5b1f2cf5ae8558a80bcaa69437f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 11:27:32 2006 +0000
* Pass the actual build user to the setuid helper.
commit a45c498e4e1109e0147b46df1230db718e5bceb1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 00:42:30 2006 +0000
* If Nix is not running as root, call the setuid helper to start the
builder under the desired build user.
commit 813a7c65c99951a946e8342713884d46af1f2966
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 00:19:27 2006 +0000
* Sanity check.
commit 6a8e60913ac470c704510a733d40d3fab3ecb00d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 7 00:16:07 2006 +0000
* Move killUser() to libutil so that the setuid helper can use it.
commit 79875c5e42eca2e2d05f439da4b0da778385678a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 23:52:25 2006 +0000
* Change the ownership of the current directory to the build user.
commit 62ab1314127a164c7e71e77551d549b27ce82e6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 23:15:26 2006 +0000
* Verify that the desired target user is in the build users group (as
specified in the setuid config file).
commit f07ac41656fbc4349ec0dda9d072b06a8b38e53b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 22:45:41 2006 +0000
* Check that the caller is allowed to call the setuid helper. The
allowed uid is specified in a configuration file in
/etc/nix-setuid.conf.
commit 173d328351b2c59c313177d8d984df506760ada3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 20:19:25 2006 +0000
* Urgh.
commit ef281b93c22580c3ccbcb598e3dd734402adce39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 20:18:29 2006 +0000
* Fix the safety check.
commit a14d491f09e4f1908e916be507def744be11d1c0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 20:16:28 2006 +0000
* Oops.
commit 6e5ec1029ad279c1ac69e14730afb4d2d9964b5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 20:00:15 2006 +0000
* Get rid of `build-users'. We'll just take all the members of
`build-users-group'. This makes configuration easier: you can just
add users in /etc/group.
commit 751f6d2157a1b89f2463b68a90f8515deb3f942c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 17:29:10 2006 +0000
* nix-setuid-helper: allow running programs under a different uid.
commit 9f0efa6611d010bf2fb88a2f6a583c4f32fd89ac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 6 01:24:02 2006 +0000
* Start of the setuid helper (the program that performs the operations
that have to be done as root: running builders under different uids,
changing ownership of build results, and deleting paths in the store
with the wrong ownership).
commit 2b558843a2228051bec475a016e7bb2565433330
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 19:01:19 2006 +0000
* Be less chatty.
commit 44cad9630f25f7f1c6a9263c031e453170b2f489
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 18:28:15 2006 +0000
* Urgh. Do setgid() before setuid(), because the semantics of setgid()
changes completely depending on whether you're root...
commit 6f0d05032410873bd5cdb573b998c7a7939d09b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 18:21:16 2006 +0000
* Tricky: child processes should not send data to the client since
that might mess up the protocol. And besides, the socket file
descriptor is probably closed.
commit 4c1c37d0b6f4f8e7331b359617d7071c5e6e42fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 18:07:46 2006 +0000
* FreeBSD returns ESRCH when there are no processes to kill.
commit 8d1854c3f19848fa6435aaa0fc688230ccc478c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 17:44:19 2006 +0000
* Oops! In daemon mode, we can't run as root either if build-users is empty.
commit 99655245ae21dd18403ce79f54199c13574da9aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 17:21:42 2006 +0000
* Use an explicit handler for SIGCHLD, since SIG_IGN doesn't do the
right thing on FreeBSD 4 (it leaves zombies).
commit 62b0497c0f2e1b269c7284684524d20c39c1d519
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 16:17:01 2006 +0000
* Better message.
commit c808e6252f7ba6d02834c591e0e4bcfbc8476635
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 15:36:31 2006 +0000
* Ugly hack to handle spurious SIGPOLLs.
commit fd4a9db91fc82ddc399f3be73ba65188a63cd7d9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 14:15:51 2006 +0000
* Some renaming.
commit fc1c20d11b5e95690ad5acf6bebd5cea129618e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 13:57:35 2006 +0000
* Redundant.
commit a9c4f66cfb1618833cc70ceaf13733730b634193
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 02:18:46 2006 +0000
* Allow unprivileged users to run the garbage collector and to do
`nix-store --delete'. But unprivileged users are not allowed to
ignore liveness.
* `nix-store --delete --ignore-liveness': ignore the runtime roots as
well.
commit 29cf434a35d82529f56c085c9cd50858c148d086
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 01:31:45 2006 +0000
* The determination of the root set should be made by the privileged
process, so forward the operation.
* Spam the user about GC misconfigurations (NIX-71).
* findRoots: skip all roots that are unreadable - the warnings with
which we spam the user should be enough.
commit 8623256f483f77e090e689ae332165a530a489a5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 00:48:36 2006 +0000
* findRoots: return a map from the symlink (outside of the store) to
the store path (inside the store).
commit d27a73b1a95a911077947f39fab42c628c722c0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 5 00:34:42 2006 +0000
* In addPermRoot, check that the root that we just registered can be
found by the garbage collector. This addresses NIX-71 and is a
particular concern in multi-user stores.
commit 74033a844fe57e3e91c71ae37f9a65f6b2f22aa9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 23:29:16 2006 +0000
* Add indirect root registration to the protocol so that unprivileged
processes can register indirect roots. Of course, there is still
the problem that the garbage collector can only read the targets of
the indirect roots when it's running as root...
commit 0d40f6d7bb226e69f65f8ca8e6d0597baf3eec9a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 22:58:44 2006 +0000
* Not every OS knows about SIGPOLL.
commit 7751160e9f560e7063d3e6e6e0e57b1432037b4c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 19:10:23 2006 +0000
* Don't redirect stderr.
commit 40c3529909a929e03ebd943d87dd00e3fce93c9e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 17:55:14 2006 +0000
* Handle exceptions and stderr for all protocol functions.
* SIGIO -> SIGPOLL (POSIX calls it that).
* Use sigaction instead of signal to register the SIGPOLL handler.
Sigaction is better defined, and a handler registered with signal
appears not to interrupt fcntl(..., F_SETLKW, ...), which is bad.
commit 0130ef88ea280e67037fa76bcedc59db17d9a8ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 17:17:13 2006 +0000
* Daemon mode (`nix-worker --daemon'). Clients connect to the server
via the Unix domain socket in /nix/var/nix/daemon.socket. The
server forks a worker process per connection.
* readString(): use the heap, not the stack.
* Some protocol fixes.
commit 4740baf3a61c48c07f12f23927c84ca9892088a8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 14:21:39 2006 +0000
* When NIX_REMOTE=daemon, connect to /nix/var/nix/daemon.socket
instead of forking a worker.
commit f5f0cf423fda5e030d9be6fd6500a1b06d3a60bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 13:28:14 2006 +0000
* Refactoring.
commit 052b6fb1495cd606d35cd3eb1806f9fe0019e6ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 13:15:29 2006 +0000
* Pass the verbosity level to the worker.
commit 1e16d2065503e213189d58db14de893f51545597
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 4 13:09:16 2006 +0000
* Install the worker in bindir, not libexecdir.
* Allow the worker path to be overriden through the NIX_WORKER
environment variable.
commit 9322b399f3a6fe3e0d60dfa991b06012c35b72f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 20:41:22 2006 +0000
* Doh.
commit f4279bcde0934c221df081c366c8fc776aa2be99
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 16:25:19 2006 +0000
* Don't run setuid root when build-users is empty.
* Send startup errors to the client.
commit 35247c4c9f55fd49d8838b0df963016fdcde0420
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 15:32:38 2006 +0000
* Removed `build-allow-root'.
* Added `build-users-group', the group under which builds are to be
performed.
* Check that /nix/store has 1775 permission and is owner by the
build-users-group.
commit 84d6459bd5a0820729c57d710f886af6f423259b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 14:32:22 2006 +0000
* Use setreuid if setresuid is not available.
commit a9f92410541e15e994c3306215608cb33ff101e2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 03:16:27 2006 +0000
* Handle a subtle race condition: the client closing the socket
between the last worker read/write and the enabling of the signal
handler.
commit 3ed9e4ad9b72dfbe59d47823beec829fe550351e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 03:03:36 2006 +0000
* Some hardcore magic to handle asynchronous client disconnects.
The problem is that when we kill the client while the worker is
building, and the builder is not writing anything to stderr, then
the worker never notice that the socket is closed on the other side,
so it just continues indefinitely. The solution is to catch SIGIO,
which is sent when the far side of the socket closes, and simulate
an normal interruption. Of course, SIGIO is also sent every time
the client sends data over the socket, so we only enable the signal
handler when we're not expecting any data...
commit 4251f94b32daed2abb0324439466876a97acdb77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 02:36:44 2006 +0000
* Use a Unix domain socket instead of pipes.
commit 8c76df93e6fe021df6a6aa2b2c710202db326a34
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 02:22:04 2006 +0000
* Better error message if the worker doesn't start.
commit 363f40022f08b3a7f5571574ddecf785db39584a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 02:12:26 2006 +0000
* Pid::kill() should be interruptable.
commit 7951c3c5460324c652d42f5f92bcae44e0a0b9c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 02:08:13 2006 +0000
* Some hackery to propagate the worker's stderr and exceptions to the
client.
commit 714fa24cfb5afeb144549e0cc4808cc2a1c459cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 3 00:52:27 2006 +0000
* Run the worker in a separate session to prevent terminal signals
from interfering.
commit e25fad691aa3ccb492c4fb8840289f76151e553e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 2 16:41:36 2006 +0000
* Move addTempRoot() to the store API, and add another function
syncWithGC() to allow clients to register GC roots without needing
write access to the global roots directory or the GC lock.
commit 30bf547f4f5bc881eb60c9e11020d077fbb8b899
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 2 15:46:17 2006 +0000
* Doh.
commit 536595b072e73f72c421400c35d09089e7d54ca4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 2 15:45:51 2006 +0000
* Remove most of the old setuid code.
* Much simpler setuid code for the worker in slave mode.
commit 9c9cdb06d095ea91e10be8dae3a85f06a99c51bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 2 14:34:14 2006 +0000
* Remove SwitchToOriginalUser, we're not going to need it anymore.
commit 626f8ee42f0b984ebc1cbf0b39938bcb3edf3bd7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 2 14:33:39 2006 +0000
* Clear NIX_REMOTE in the tests.
commit 8ba5d32769560d32cb5e1e83fd30fb6da0b145f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 2 14:27:24 2006 +0000
* Remove queryPathHash().
* Help for nix-worker.
commit fcd9900d74b0eb3d57402c448ede2a411133fa46
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 1 21:00:39 2006 +0000
* Replace read-only calls to addTextToStore.
commit a824d58b566752b2a89a718fd628053754968d72
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 1 20:51:18 2006 +0000
* Merge addToStore and addToStoreFixed.
* addToStore now adds unconditionally, it doesn't use readOnlyMode.
Read-only operation is up to the caller (who can call
computeStorePathForPath).
commit ceb982a1be381d59532d0405451f38d263abb617
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 1 18:02:05 2006 +0000
* Right name.
commit b0d8e05be16e9887dbf3edcd6167c7f0b36dee5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 1 18:00:01 2006 +0000
* More operations.
* addToStore() and friends: don't do a round-trip to the worker if
we're only interested in the path (i.e., in read-only mode).
commit 0565b5f2b35dc153dc98e1e3bd37476aa13ee4f1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 22:43:55 2006 +0000
* More remote operations.
* Added new operation hasSubstitutes(), which is more efficient than
querySubstitutes().size() > 0.
commit aac547a8b3f481fda48cc1fe1082ce4c32be0e03
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 21:32:46 2006 +0000
* Doh.
commit 02632790713eaabd5250ba04283233c8bc078067
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 20:45:20 2006 +0000
* More operations.
commit a711689368fe0915a2f18ea61fe6e953647d0174
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 20:13:59 2006 +0000
* First remote operation: isValidPath().
commit 765bdfe542d3250329dea98b69db2271419f31b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 19:54:43 2006 +0000
* When NIX_REMOTE is set to "slave", fork off nix-worker in slave
mode. Presumably nix-worker would be setuid to the Nix store user.
The worker performs all operations on the Nix store and database, so
the caller can be completely unprivileged.
This is already much more secure than the old setuid scheme, since
the worker doesn't need to do Nix expression evaluation and so on.
Most importantly, this means that it doesn't need to access any user
files, with all resulting security risks; it only performs pure
store operations.
Once this works, it is easy to move to a daemon model that forks off
a worker for connections established through a Unix domain socket.
That would be even more secure.
commit 40b3f64b55f98e03b3173541b8d94cd924099223
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 19:19:59 2006 +0000
* Skeleton of the privileged worker program.
* Some refactoring: put the NAR archive integer/string serialisation
code in a separate file so it can be reused by the worker protocol
implementation.
commit 9adc074dc3e135356c2390038bf72264c29c1e03
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 18:35:50 2006 +0000
* Oops.
commit 9cf1948993659cc394eccea5890e14df82eff8bb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 18:35:36 2006 +0000
* Skeleton of remote store implementation.
commit 6ecb840fd118019f879de60007e13321b7c080d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 18:02:04 2006 +0000
* Put building in the store API.
commit e2ef5e07fdc142670f7f3161d3133ff04e99d342
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 17:43:04 2006 +0000
* Refactoring. There is now an abstract interface class StoreAPI
containing functions that operate on the Nix store. One
implementation is LocalStore, which operates on the Nix store
directly. The next step, to enable secure multi-user Nix, is to
create a different implementation RemoteStore that talks to a
privileged daemon process that uses LocalStore to perform the actual
operations.
commit 5f0b9de6d837daf43c6ab26d41c829621c3ca727
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 15:06:46 2006 +0000
* Benchmarking Unix domain sockets.
commit fe15f991e3a65021442b682f187fcbdad06358a8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 30 11:24:10 2006 +0000
* Troubleshooting information on fixing a b0rked Berkeley DB database.
commit 80b742dd520bffd3895b4dadef83d64e70309375
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 29 22:07:49 2006 +0000
* Don't spam.
commit 92417600a1f26510d50310afef19b75c541d05df
Author: Roy van den Broek <rbroek@cs.uu.nl>
Date: Wed Nov 29 21:58:09 2006 +0000
* Example script to set permissions for setuid operation.
commit 71e867c5f5ee2c188244da33366e506935abffb7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 29 21:06:58 2006 +0000
* Remove --enable-setuid, --with-nix-user and --with-nix-group.
Rather, setuid support is now always compiled in (at least on
platforms that have the setresuid system call, e.g., Linux and
FreeBSD), but it must enabled by chowning/chmodding the Nix
binaries.
commit c6a97e3b74289fdc8e57189212a0db3d0e6896e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 24 20:24:14 2006 +0000
* Doh! Path sizes need to be computed recursively of course.
(NIX-70)
commit a76efaeb3f2c1d7de6d41bd0e883b92e2d0f3d7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 24 20:07:30 2006 +0000
* Dead files.
commit d94118628919ee5b6d8e52cd6dcf89ba13a54360
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 18 19:03:45 2006 +0000
* Show more progress.
commit 0541ddc7e33c35a35efe85b6d6f603efb5bac8c8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 18 18:56:30 2006 +0000
* Turn off synchronisation between C and C++ I/O functions. This
gives a huge speedup in operations that read or write from standard
input/output. (So libstdc++'s I/O isn't that bad, you just have to
call std::ios::sync_with_stdio(false).) For instance, `nix-store
--register-substitutes' went from 1.4 seconds to 0.1 seconds on a
certain input. Another victory for Valgrind.
commit 471749ca7eb594660488954d23391f5329d638a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 14 19:18:52 2006 +0000
* Grrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr...
commit 17d18b1a9c821c234f5b0df7f4dec41a7ec537c1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 14 19:11:36 2006 +0000
* Doh!
commit 0ddaee756e6e6b1d3802969162a90d4ff7ef886b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 14 19:08:46 2006 +0000
* Doh.
commit bce9ff7ece912d18f1d92e6759b82ef5b8ad20aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 14 15:36:27 2006 +0000
* Use the patched ATerm library.
commit 745e354b19a00dba9fd6d058036ce412ba30e23a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 14 10:23:21 2006 +0000
* Push.
commit f459a5bb3a7142dee5d82c5d385bc3c4654c8e2c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 13 18:19:05 2006 +0000
* Remove the undocumented `noscan' feature. It's no longer necessary
now that reference scanning is sufficiently streamy.
commit e2a70b7ec04db604e9eaadfa6446bd360473163a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 13 18:18:13 2006 +0000
* Magic attribute `exportReferencesGraph' that allows the references
graph to be passed to a builder. This attribute should be a list of
pairs [name1 path1 name2 path2 ...]. The references graph of each
`pathN' will be stored in a text file `nameN' in the temporary build
directory. The text files have the format used by `nix-store
--register-validity'. However, the deriver fields are left empty.
`exportReferencesGraph' is useful for builders that want to do
something with the closure of a store path. Examples: the builders
that make initrds and ISO images for NixOS.
`exportReferencesGraph' is entirely pure. It's necessary because
otherwise the only way for a builder to get this information would
be to call `nix-store' directly, which is not allowed (though
unfortunately possible).
commit e40d4a5604a75540d94782d405dfff2000143f61
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 13 16:48:27 2006 +0000
* Option `--reregister' in `nix-store --register-validity'. We need
this in the NixOS installer (or in the buildfarm) to ensure that the
cryptographic hash of the path contents still matches the actual
contents.
commit e7904043184ed08b1c4f206bd67c9e84305220f0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 13 14:54:18 2006 +0000
* Don't use the result of `uname -p' on x86_64 as it gives wacky
results on some machines. (NIX-69)
commit 983c5e3fce1fb688ec086a5d6664a30f492f700d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 7 14:51:28 2006 +0000
* Fix the locking patch for Berkeley DB 4.5.
commit 7e85a2af5f2cf6c19fc582c6cec77c0eefef2c31
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 3 16:17:39 2006 +0000
* Fix importing of derivation outputs.
commit b3f916995af379ac1964e0459fb805803794ba39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 31 18:45:17 2006 +0000
* Oops, `nix-build --no-out-link' was broken.
commit 005eecfc4d0a26694b521e999e4985c452c4b3f3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 30 16:29:05 2006 +0000
* Release notes.
commit 8478cd260f31e8592aacdfaf99c1a4e53e4eb400
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 30 11:56:09 2006 +0000
* readFile: don't overflow the stack on large files.
commit 8d17265ac4f9202d924a109a38db33dac5619f9f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 28 22:07:09 2006 +0000
* Don't use EPSV.
commit ae6fb27f18fff6639f3b51ace4789537255a43a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 28 16:33:54 2006 +0000
* `nix-store --read-log / -l PATH' shows the build log of PATH, if
available. For instance,
$ nix-store -l $(which svn) | less
lets you read the build log of the Subversion instance in your
profile.
* `nix-store -qb': if applied to a non-derivation, take the deriver.
commit 99b0ea7c67e9e545bdf8b8bb050ce63dc9440e95
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 26 23:06:47 2006 +0000
* Typo reported by Arie Middelkoop.
* Left out close-quote in example.
commit dd300fb48dd2048d056a5f25dda7d4c1f5515d46
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 23 16:45:19 2006 +0000
* Some better error messages.
commit 1d694eef4ce022a99a3fb552804a1f26f686cc55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 19 19:20:18 2006 +0000
* Require Perl 5.8.0 or newer. I mean, it *is* more than four years
old...
commit 7a4497d98ca10a3e92d4f94fd62075f336b299b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 19 17:44:51 2006 +0000
* Checks for allowedReferences and some other features.
* Use nix-build in a test.
commit 17f4883bfeb27c3fb6f28bd8ff8c6bbf65e6ea84
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 19 17:43:58 2006 +0000
* Better message.
commit 9bd93f76069fdf25688ce984a17798ab0834202f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 19 17:39:02 2006 +0000
* toFile: maintain the references.
commit b3d3700e113c584329473dbfbd3149c9ef8566e8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 19 17:30:09 2006 +0000
* nix-build: check the exit status of `nix-store -r'.
commit 6a67556f7192108d612560992e97a14b0fe16a22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 19 16:09:24 2006 +0000
* Special derivation attribute `allowedReferences' that causes Nix to
check that the references of the output of a derivation are in the
specified set. For instance,
allowedReferences = [];
specifies that the output cannot have any references. (This is
useful, for instance, for the generation of bootstrap binaries for
stdenv-linux, which must not have any references for purity). It
could also be used to guard against undesired runtime dependencies,
e.g.,
{gcc, dynlib}: derivation {
...
allowedReferences = [dynlib];
}
says that the output can refer to the path of `dynlib' but not
`gcc'. A `forbiddedReferences' attribute would be more useful for
this, though.
commit daa8f85fcd3d5d7c48a51305818e05bee866b936
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 14:13:15 2006 +0000
* Backwards compatibility hack for user environments made by Nix <= 0.10.
commit 24737f279e6f1e0fd079609b9397deb867925324
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 14:01:45 2006 +0000
* Backwards compatibility with old user environment manifests.
commit 4bd5cdb90b980bd5e0eec86bf3fcfdd3b07946d1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 14:01:28 2006 +0000
* Print out the offending path.
commit 58ff6939f4713063dabd77d485689691a82dbb3b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 12:58:42 2006 +0000
* An awful backwards compatibility hack.
commit 3059df0f1e7c70da8b63e09420af84014ef96295
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 12:34:13 2006 +0000
* baseNameOf: paths don't have to be absolute.
commit 822dba2210a03144510df357c4c38229b1e4c211
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 12:15:15 2006 +0000
* Maintain the references for the user environment properly.
commit dfc042a0c1786596554f30d628555845ab4539d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 11:16:02 2006 +0000
* Another test.
commit 9e30694f9838ff16533f614788c782503fe20967
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 11:08:59 2006 +0000
* Fix the tests wrt the AST changes, i.e., Str(s) -> Str(s, []), and
the semantic changes.
commit be1961c9f8fbf71ab8ba7ba7a2da5dbb21be54b4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 11:07:11 2006 +0000
* toPath: should be the identity on paths.
commit cba913c5217fd4071419279da81fd02599715b6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 11:05:34 2006 +0000
* dirOf: return a path if the argument is a path.
commit cf705eaf78df646116f2fc14e6fa07d88f1607fe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 10:58:12 2006 +0000
* toString: don't copy paths. So toString can be used to pass
non-store paths to a builder.
commit 7de5fe2fc2cf4ceafc421697ad0bfb0a6e2d994d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 10:57:25 2006 +0000
* Do the path check on the normal form.
commit 46b631b6c4a743b88bf2d6bb779c0f677e9b8318
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 17 10:15:42 2006 +0000
* Don't generate an empty drvPath attribute in the manifest.
commit d7efd7639420f4c840cbfdfcbbb3c45292f3ac54
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 16 15:55:34 2006 +0000
* Big cleanup of the semantics of paths, strings, contexts, string
concatenation and string coercion. This was a big mess (see
e.g. NIX-67). Contexts are now folded into strings, so that they
don't cause evaluation errors when they're not expected. The
semantics of paths has been clarified (see nixexpr-ast.def).
toString() and coerceToString() have been merged.
Semantic change: paths are now copied to the store when they're in a
concatenation (and in most other situations - that's the
formalisation of the meaning of a path). So
"foo " + ./bla
evaluates to "foo /nix/store/hash...-bla", not "foo
/path/to/current-dir/bla". This prevents accidental impurities, and
is more consistent with the treatment of derivation outputs, e.g.,
`"foo " + bla' where `bla' is a derivation. (Here `bla' would be
replaced by the output path of `bla'.)
commit 4c9aa821b985b8e334790a03497a56af3a021f3b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 13 14:08:14 2006 +0000
* Fix version.
commit 142863a89d1652d6e634b5fb7f3084c9bc37b023
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 13 12:11:30 2006 +0000
* Use Berkeley DB 4.5.
commit 37c8a664f3af9d67ecdc200d4a6b5ced1009c25f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 13 11:49:55 2006 +0000
* A helpful message.
commit e4af398681576d62df29cfee018dea800a7dfa17
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 13 11:15:53 2006 +0000
* Don't crash when upgrading the Berkeley DB environment.
commit 2a535689fe801441ef8e4a5c6659925528cce106
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 12 20:13:29 2006 +0000
* Reduce the maximum archive size for patch generation to 100 MB to
prevent trashing on nix.cs.uu.nl.
commit 7d4567f2cc16959e827f542e6de76a28ff11789e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 11 21:59:33 2006 +0000
* Removed URIs from the evaluator (NIX-66). They are now just another
kind of notation for strings.
commit b4e012ab4d8ef2f9091c1e8d14e059b38a2e4529
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 11 13:39:00 2006 +0000
* Merge 0.10.1 release notes.
commit 0c4c5c2020383db9c2d39d7a3420195568d06312
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 10 21:23:35 2006 +0000
* Quick hack to fix NIX-67: evaluation result differing if the Nix
expression resides in the store.
commit bd0c40e1e93d2239b44bd1f73c2587cd62e66e4d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 10 15:07:23 2006 +0000
* `import': unwrap the context. Necessary to make `import (x + y)'
work, where x is a store path.
commit 7bada48b36a091bb30c905229e16df3c36c90d7d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 6 13:45:29 2006 +0000
* Bumped the version number to 0.11.
commit e1cc84259ce38f0639f6304f04e1747c00fd43cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 6 09:59:02 2006 +0000
* Too lazy to document nix-push --copy.
commit b3fc0160618d89bf63ce87ccad27fc68360c9731
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 6 09:03:39 2006 +0000
* Translate Unicode quote characters to ASCII equivalents when
generating NEWS.txt.
commit 3815d2d463d6cd130e96497e66ff50b9243e59fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 6 07:47:56 2006 +0000
* Typos etc.
* Set the release date.
commit beee18de881040e3d7861be694fc3c66e9bf4159
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 23:13:15 2006 +0000
* Document nix-store --delete.
commit eff573f5638e8eefd682d0a8860728fe53791f22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 23:01:50 2006 +0000
* Work around a weird bug in the manpage generation.
commit 9e08f5efe105fb1314e3bb052a819696ed2adee1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 22:57:07 2006 +0000
* Documented nix-store --dump / --restore.
commit 8791ffbc886520e02017f854342922a624b61fb5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 22:56:52 2006 +0000
* Documented new nix-env options.
commit 99ef620c8c453949719c45229a8bd4f1cd5a66a8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 20:41:57 2006 +0000
* Documented nix-instantiate --xml, --strict.
* Added an example to the nix-build section.
commit 8396b592860bcb7b6394e7201b20d63ea92887d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 20:07:41 2006 +0000
* Documented --attr / -A.
commit 5d769de8a34474f4e76911927118312b69b47136
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 09:08:52 2006 +0000
* Document --arg.
commit 6f2bfd92b695a31b35d8d515cd4ee12f9fc2c786
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 5 08:21:52 2006 +0000
* Manual.
commit d98f750fd8de5a0546903061e94b9bda3f68681f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 18:58:11 2006 +0000
* tmpnam() -> File::Temp::tempdir().
commit 34427a7b43382215774b1a164fd784a0f7804d33
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 17:07:58 2006 +0000
* Weird.
commit a3fd53b9eb767c9b9f2c8f3824a1aea1c25544a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 17:07:52 2006 +0000
* Style tweak.
commit 59ef0aaf3fc6707d25f7f4fcabab4f1ceaaef9e1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 16:02:18 2006 +0000
* Strings.
commit 407c9fd520e8084f3a313297cdd6e99e56247f07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 15:20:19 2006 +0000
* Explanation of toXML example.
commit 0ef3bd3c376a2d48e98dfb8712a7d376743b0498
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 12:20:07 2006 +0000
* Use GIF callouts instead of PNG since the GIFs have transparency.
commit 4a7ece698ba27e8957fed071434e3e66c337b03b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 08:26:05 2006 +0000
commit bd4f1b4bb8fb20b0752677c52f28ff951205d513
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 4 08:14:35 2006 +0000
* Style tweaks.
commit 96fa456a0ae624a30a3cfded21e91e690056eda2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 3 15:39:34 2006 +0000
* An example of using toXML to pass structured information to a
builder and generate a Jetty configuration file with XSLT.
commit 5fd44654dbca02f188957279eb25a33a3ecfe96b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 3 15:38:59 2006 +0000
* toXML: propagate the context to allow derivations to be used in the
argument.
commit 3837fb233cccc8f65629749f07820afba04952a0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 3 15:19:05 2006 +0000
* Document the built-in functions.
commit d20c3011a06a49d229c92c49447eb21b5a1f110d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 3 14:55:54 2006 +0000
* toFile: added an additional argument to specify the store path
suffix, e.g., `builtins.toFile "builder.sh" "..."'.
* toFile: handle references to other files correctly.
commit 84e6c43e85cab83ee033bf13c1e58c0f30ca1de9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 22:11:44 2006 +0000
* Documented nix-hash.
commit cfe35ca0e04fe486394d8505646cf7dff5d627be
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 20:28:52 2006 +0000
* Manual.
commit 853252ac6699ec339f0692c913361b0df417ded6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 16:14:30 2006 +0000
* Document the new let.
commit ac19b333b38b2ac4b633bc1203e59c153bbb5c91
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 15:52:44 2006 +0000
* Finally, a real "let" syntax: `let x = ...; ... z = ...; in ...'.
commit 7581cfdee4001cba719d4d72f8f17f1b4c04ed51
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 14:43:15 2006 +0000
* Hack for Bison 2.3 compatability.
commit f316b6c1a91e596b2717bc4db76c6513e3ef5f85
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 11:50:55 2006 +0000
* Manual updates (especially how nix-build makes testing packages much
easier; no longer need a helper expression).
commit 91a01e6fcf88edfff5cd1b25651452d4385b1fbd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 2 09:01:36 2006 +0000
* Manual.
commit 88d422567eb018b8b050a662bdaa6b0faa6a4be0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 29 14:59:10 2006 +0000
* One-click installs.
commit 0212feeed66d2eb0a9365ca4d55cb2dad3bc4ade
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 29 14:16:41 2006 +0000
* Document nix-install-package and the nixpkg file format.
commit 070e07ed5aeac9918b9ec4cb6944f31b2b1aeeae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 29 11:03:16 2006 +0000
* Manual.
commit 30c7db85d81840d9d99841ab72e95c5267a925a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 29 10:31:56 2006 +0000
* Manual updates, some style improvements.
commit e2eed05224ed9bbc64014db9158bbc42bd3d9bef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 28 09:10:53 2006 +0000
* Manual updates.
* Documented nix-{pack,unpack}-closure.
commit 4ad6fb7ea3e18361b6021a23a7401af4085d3602
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 27 21:04:07 2006 +0000
* Fix setuid builds.
commit 015ac7c7da6dfc93d287b89e443648656a88665d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 27 13:27:26 2006 +0000
* Release notes.
commit a9a6356ffceeb346b9de1f7640932a27bf90ce1d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 27 12:43:00 2006 +0000
* Release notes.
commit e47d42536fbee59598951f1e007b7fa5884459e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 26 09:57:27 2006 +0000
* Release notes.
commit 5ca45d085e0ecf44f5362272b89a8532c2fffdc8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 25 15:11:59 2006 +0000
* Use "propagated-user-env-packages", not "propagated-build-inputs"
for packages that should be propagated to the user environment.
commit 02f2335712c6448b10f8a2828a22c663bf8d9579
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 25 15:07:45 2006 +0000
* Propagated packages now have lower priority; they are symlinked
*after* the packages that have been explicitly installed, and
collisions are ignored.
commit 3632019b737d1c570a3c30f4f3f07763b5b1d23c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 25 14:00:59 2006 +0000
* Quick hack to let nix-install-package set the package name properly
(e.g., "java-front-0.9pre15899" instead of "java-front";
particularly important when doing upgrades later on).
commit d43565c3e837feea478aaa71bad7e0a92c1911f0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 25 11:11:16 2006 +0000
* In `nix-channel --update', skip manifests that assume a Nix store at
a different location than the user's. This makes channels usable as
a source deployment mechanism for people who install Nix under
non-standard prefixes. (NIX-57)
commit 68ae953d8a492061bcda7c4d7bf2f5b9432f791c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 25 10:44:27 2006 +0000
* Clean up calls to system().
commit 76c971009149f73453ccec66392625f2b67f8785
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 25 10:29:25 2006 +0000
* Use builtins.toPath.
commit e347033f718e23d1ae6821207124465fedc73db1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Sep 24 21:39:57 2006 +0000
* The result of a concatenation with a derivation on the left-hand
side should be a path, I guess.
* Handle paths that are in the store but not direct children of the
store directory.
* Ugh, hack to prevent double context wrapping.
commit 0e705391dbe5340154d59106e591671923d107d0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Sep 24 18:23:32 2006 +0000
* Primop `toPath' to convert a string to a path.
* Primop `pathExists' to check for path existence.
commit e47e0c2dbe808f299eb912da94640b95954703f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Sep 24 17:48:41 2006 +0000
* Builtin function `getEnv' for getting environment variables.
commit df8873e14ad071812e27f38b69783f04dbae5f44
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Sep 24 15:21:48 2006 +0000
* lessThan primitive for integer comparison.
commit 2ab4bc44c780d2e28647f7559664675b756f38b9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 15:29:21 2006 +0000
* Builtin function `add' to add integers.
* Put common test functions in tests/lang/lib.nix.
commit d315210612a8d5eb52654407903544b72222130b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 14:55:19 2006 +0000
* Added a builtin function `isList' to test whether a value is a list.
With this primitive, a list-flattening function can be implemented
(NIX-55, example is in tests/lang/eval-okay-flatten.nix).
commit c02a44183fcff7c28cfed1c84c142cc2cf80f167
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 14:46:36 2006 +0000
* Builtin functions `head' and `tail' to return the head and tail of
list. Useful for lots of things, such as implementing a fold
function (see NIX-30, example is in tests/lang/eval-okay-list.nix).
commit 8a1ab709a47f0896cb5b47521e31c8c27f88b2b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 14:31:55 2006 +0000
* New builtin functions builtins.{hasAttr, getAttr} to check for
attribute existence and to return an attribute from an attribute
set, respectively. Example: `hasAttr "foo" {foo = 1;}'. They
differ from the `?' and `.' operators in that the attribute name is
an arbitrary expression. (NIX-61)
commit 666babbbfa2fc168b8d511a35065d352b4979dae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 13:10:30 2006 +0000
* Use a bounded amount of memory in scanForReferences() by not reading
regular files into memory all at once.
commit 385c6f87373303f6e4c9f4e67e02507641a268f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 12:07:41 2006 +0000
* Supply the 64-bit ATerm patch, but don't apply it (since that
requires rerunning Autoconf/Automake). Interested users should do
that themselves.
commit d22d7565f3a1848552f9459e18cb4be4e6d08018
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 11:28:23 2006 +0000
* Don't allocate the buffer twice.
commit b43aeadbc9a42c845a50c28ceb1c148e39e77cb9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 11:13:35 2006 +0000
* Don't allocate more than SIZE_MAX bytes.
commit 4cab35d1a691009b43fb0c47574ae0e4baa0b65d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 22 11:13:12 2006 +0000
* Build with -D_FILE_OFFSET_BITS=64 to support files >= 2^31 bytes
(NIX-22).
commit 25df5017046ca5d4f753787532b747cb2c44fec6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 21 19:06:34 2006 +0000
* GC options in nix-store --help (NIX-15).
commit 0bd5eb71a0a23b27a02af591ba46e4cf2c34aa04
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 21 18:54:08 2006 +0000
* `nix-install-package --url': install from a URL (NIX-12).
* `nix-install-package --help' (NIX-9).
* `nix-install-package --non-interactive': don't prompt or pause.
* Tests for nix-install-package.
* Security fixes: filter the values obtained from the nixpkg.
commit 4e91d8621f6620f8b15535002309882fd7794a1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 21 18:52:05 2006 +0000
* Fix comment.
commit ee5040421ff442ec62db25f35874d9a27f9a646f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 21 11:29:14 2006 +0000
* Try konsole and gnome-terminal in addition to xterm.
commit 1bdc152931b2da66d896199e22defa70eaec9eff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 20 16:36:29 2006 +0000
* Shut up a warning.
commit 1b804f88e44e7f6760e9c43e329a8a6eb368c52e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 20 16:23:14 2006 +0000
* Absolute path to rm (NIX-51).
* Don't hardcore /nix/bin and /nix/store.
commit 0623359fbc67c421bf76b7433f92c7ef58050321
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 20 16:15:32 2006 +0000
* Print a better error message for wrong hashes (NIX-49).
commit 22d13d6ec27b02f98ca4e398fbae4f3273e97794
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 20 15:28:47 2006 +0000
* Check for patch (NIX-59).
commit 947e64578969e95e96157c7e2e52fd7299027184
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 20 15:14:19 2006 +0000
* Hide warnings about a missing "lsof" (NIX-54).
commit a060adf165e24a585da0301e88ad41e674f3e9db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 20 15:04:04 2006 +0000
* Use paths, not strings, when calling the function that generates
NARs. Fixes the impurity of nix-push (NIX-21).
* Better help.
commit 7dd342e482b230d0042f8f2dee6ccb44232a3d3b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 19 16:40:22 2006 +0000
* Doh.
commit ee6cf99660bbef843145731fbcdce9880c3bdb21
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 19 16:14:15 2006 +0000
* Doh! Of course we have to take execute permission into account.
* Restore the mtime on modified directories.
commit 6dbed1bf38cd881ebf13aae39a4d988e4bd57f79
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 19 14:58:35 2006 +0000
* `optimise-store.pl' reduces disk space consumption by hard-linking
all identitical files in the Nix store to each other. (Previously
it only computed the size that would be saved by doing so.)
commit 07cec27848014244c8f62985c5c0eb045bc86634
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 19 14:27:28 2006 +0000
* Cleanups.
commit 9488ae7357b718e09362c22f075cc5553c758214
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 19 13:53:35 2006 +0000
* `show-duplication.pl', a small utility that shows the amount of
package duplication present in (e.g.) a profile. It shows the
number of instances of each package in a closure, along with the
size in bytes of each instance as well as the "waste" (the
difference between the sum of the sizes of all instances and the
average size).
$ ./show-duplication.pl /nix/var/nix/profiles/default
gcc 11
3.3.6 19293318
3.4.4 21425257
...
average 14942970, waste 149429707
coreutils 6
...
average package duplication 1.87628865979381, total size 3486330471, total waste 1335324237, 38.3017114443825% wasted
This utility is useful for measuring the cost in terms of disk space
of the Nix approach.
commit e0afaf18576e8c04110f4ae8499a311cae261215
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 14 22:48:59 2006 +0000
* Wow, that bug has been there since r764.
commit 86cbd93ec1e439fba3e33016272db45d9597fba4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 14 22:33:53 2006 +0000
* nix-env --switch-generation / --list-generations /
--delete-generations: lock the profile to prevent (extremely
unlikely) race conditions.
commit 5c38c863bdb6904f28a929b97e91d283e29aea70
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 14 22:30:33 2006 +0000
* Fix a huge gaping hole in nix-env w.r.t. the garbage collector.
Nix-env failed to call addPermRoot(), which is necessary to safely
add a new root. So if nix-env started after and finished before the
garbage collector, the user environment (plus all other new stuff)
it built might be garbage collected, leading to a dangling symlink
chain in ~/.nix-profile...
* Be more explicit if we block on the GC lock ("waiting for the big
garbage collector lock...").
* Don't loop trying to create a new generation. It's not necessary
anymore since profiles are locked nowadays.
commit f00bc4c94ca4122d432ae516f8d1d7b405d5d05e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 12 09:29:28 2006 +0000
* "Too many links" error.
commit 01d169f817649796aad94180beadbf54bb636161
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 11 13:05:15 2006 +0000
* Support `++'.
* More follow restrictions on layout.
commit feb63da431eae72087fb57d723e62573ee0c4e14
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 8 09:31:07 2006 +0000
* Remove debug message.
commit a04a65d7a5ef904ff8465bd4e63e17a88d75be2f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 6 14:29:49 2006 +0000
* Release notes.
commit 2e210b2387904ada0417ad5a7502e4e40b852e02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 6 14:23:04 2006 +0000
* Convenience option `nix-collect-garbage -d' (--delete-old): removes
old generations of *all* profiles in /nix/var/nix/profiles, then
runs the garbage collector. Quick way to get rid of all old stuff.
Of course, one cannot roll back to earlier points in time after
this.
commit 89ac8db74f1241c56b05f579cc1e04056de1a6ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 5 11:34:50 2006 +0000
* Package the include directory.
commit a89a2015981ed32354ff1cc29ea41ae8d0221fbe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 5 10:32:47 2006 +0000
* Missing #include.
commit fc195519b5dfbb8e7901cf6672fb4af36df9b350
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 5 08:54:48 2006 +0000
* Sone missing #includes.
commit bafc1690fc4a2a2c3ff81ff1c1a677f208d3b1b7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 22:55:28 2006 +0000
* Move setuid stuff to libutil.
* Install libexpr header files.
commit e5a6c09b12a9a68ba604d4e95adf28482ae8fc8d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 22:41:36 2006 +0000
* Install header files in /nix/include/nix.
commit 4be5443882cfbe7c2aa09b1c373c220400a5133f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 22:08:40 2006 +0000
* Remove unnecessary inclusions of aterm2.h.
commit 2382a729e07ae09abb278cc28b137b9c4060101e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 21:50:39 2006 +0000
* Don't need extern "C".
commit e3ce954582f56b9d853ea379c783cf6cd5571c83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 21:36:15 2006 +0000
* Compile the lexer as C++ code. Remove all the redundant C/C++
marshalling code.
commit 75068e7d753cf6cbe45a4bf294000dca9bd41d8b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 21:06:23 2006 +0000
* Use a proper namespace.
* Optimise header file usage a bit.
* Compile the parser as C++.
commit aab88127321344d5818d823bff515d127108d058
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 4 15:12:24 2006 +0000
* Store the Nix libraries in ${libdir}/nix instead of ${libdir}.
commit 7974aae81ced67b2aee0b537a37d813f6c67a1ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 1 12:07:31 2006 +0000
* New primop: builtins.toFile, which writes a string into the store
and returns its path. This can be used to (for instance) write
builders inside a Nix expression, e.g.,
stdenv.mkDerivation {
builder = "
source $stdenv/setup
...
";
...
}
commit de90fdf908f2504e1a89a5d4660552cbcc1a15d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 1 12:04:06 2006 +0000
* Allow "$" in strings as long as they are not followed by "{". (Too
bad flex doesn't have lexical restrictions, the current solution
isn't quite right...)
commit c9586b6c3f32b22eec8791fd9b49c81ec3f5fcf6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 1 12:02:39 2006 +0000
* Fix race condition in the test.
commit c25f688e237cbd3329b2479202ad7a6a5e438b8a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 31 15:38:43 2006 +0000
* Doh! Doh! Doh!
commit 354d58b3d71d8b3723ff3cb6e8311469e9548417
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 31 11:40:39 2006 +0000
* Better error checking.
commit f93f7b75be7851affd1288dc36d6d4c4f0d43743
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 30 13:10:04 2006 +0000
* Okay, that's a bit harder than expected.
commit dce1afdc67b36e1b06d03c541758cb3cd97ccedd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 30 12:25:27 2006 +0000
* TDD: == should do a deep equality test, i.e., it should strictly
evaluate its arguments.
commit 3151bdea55ceb341b08998d2b29d9451e81c2143
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 30 12:00:27 2006 +0000
* Uninitialised variable.
commit 547b119f25dea97ff06cf754f2720e11b50f079f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 29 15:40:49 2006 +0000
* Support singleton values and nested lists again in `args', but print
a warning.
commit 2132d9ddeba14ea2ddcbb16fa51ddb16c45c3c6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 29 15:29:38 2006 +0000
* Fix the ~ operator.
commit 1f6616dabff48028b2b08fc50889707928201ea6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 29 15:29:19 2006 +0000
* Backwards compatibility test for ~.
commit 1ec9f55741ae54f5e618e248ee49aff132017247
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 28 21:47:42 2006 +0000
* In toString, deal with nested lists properly (i.e., flatten them).
commit 1fca76870b7a96d1eb33abb8ad4e4cc5ba656253
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 28 13:31:06 2006 +0000
* Removed processBinding, instead we now apply toString to all
derivation attributes to flatten them into strings. This is
possible since string can nowadays be wrapped in contexts that
describe the derivations/sources referenced by the evaluation of the
string.
commit 8a6080eb1400b9b7414e2ec8b995268315448cb5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Aug 26 16:48:01 2006 +0000
* Refactoring.
commit 4b66cebe7bf1a8c03fb8f1e0052c19e91820c66c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 25 17:09:55 2006 +0000
* Remove those storePath attribute sets, we don't need 'em.
commit e5678b3435d44a610517246f95c7626d36965389
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 25 16:23:42 2006 +0000
* Map "ppc" to "powerpc" so that Linux on PowerPC will be reported as
"powerpc-linux".
commit e64c4f5742dbe830ab9048aeef386a4eb0c62622
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 25 13:36:17 2006 +0000
* Doh! (NIX-58)
commit bf738f00707d57a1e8ecbdf77b68df84f710b53b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 25 12:14:57 2006 +0000
* Honour DESTDIR so that bzip2/bunzip2 get installed in the right
location when building RPMs (fixes NIX-58).
commit 3e8dccf6ab0918e89c4275ea9bf454d34e01534b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 24 15:02:39 2006 +0000
* Escape newlines in XML attributes to prevent them from being
normalised away.
commit 215ec2ddc6088be2291722a544c6ab5a1b00a5a1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 24 14:34:29 2006 +0000
* New primop __toXML (or builtins.toXML) to convert an expression to
an XML representation stored in a string. This should be useful to
pass structured information to builders.
commit f793caf93674350f8c1e6fa740ab6cce649d0db8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 24 14:16:55 2006 +0000
* Refactoring.
commit da25d80152fb6e51fe695dcd2ebaa4e00a7ee646
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 24 14:03:39 2006 +0000
* Strict evaluation and XML printing of lists.
commit 943ab38a0d0969004de231a6b3e89df88ffc6ccf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 24 13:39:22 2006 +0000
* Refactoring: move strictEval to libexpr.
commit f41297fdcecaa1ba12d238d1754457d319426579
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 23 16:33:21 2006 +0000
* Allow --arg in nix-env as well, example:
$ nix-env -qa --system-filter \* --arg system '"powerpc-darwin"'
to override the system from the default value (__currentSystem in
all-packages.nix).
commit 9638f3f3930bffab8a547ec59502ae72e203d9ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 23 16:20:14 2006 +0000
* Pass the autoArgs to findAlongAttrPath so that "nix-instantiate
foo.nix -A attr --arg name value" will work if (name, value) is
needed in the evaluation leading up to "attr".
commit b19cebc513c2d513ee1f91b5ce12f30c5dd095f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 23 15:46:27 2006 +0000
* Quotes.
commit 38f18aa6d418515e42b688fa9b3e4f3ab61bb89e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 23 15:46:00 2006 +0000
* New primop: abort "error message".
commit 4a053bfdfd85915a2a659a337bd171bc22c49138
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 23 14:39:11 2006 +0000
* A new primop `builtins', which returns an attribute set containing
all the primops. This allows Nix expressions to test for new
primops and take appropriate action if they're not available. For
instance, rather than calling a primop `foo' directly, they could
say `if builtins ? foo then builtins.foo ... else ...'.
commit 68515b5a96d0d7c114570434f605e5077b7d3166
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 22 13:19:06 2006 +0000
* Release notes.
commit 561a07f51d9710ecea006b18463c8119e04d3806
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 22 13:18:51 2006 +0000
* Revert unintentional commit.
commit 93d9797eda419cd9f9fc059af3e1a765adeb50dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 22 09:34:38 2006 +0000
* Urgh (see NIX-56).
commit 1a9a1f2768bac5defe4c2e39e5a9ccdee0e05d55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 21 16:05:11 2006 +0000
* Convert to DocBook 5.
* Use Jing for RelaxNG validation, xmllint seems buggy.
commit cc0505f033f9d7f55837dca7b3bb4fb3d2969afb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 17 12:21:39 2006 +0000
* Distribute *.exp.xml.
commit 4874fd2d9a698170adfd22c69e8e38b5afb7d03c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 17 11:28:29 2006 +0000
* Test for `nix-instantiate --eval-only --xml'.
commit 24e234a2fabd8930f1ef71a5bb03010725d0773a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 17 08:53:08 2006 +0000
* Print attributes in sorted order, rather than the arbitrary order
produced by ATermMap. Necessary for testing.
* `--strict' should also work on stdin.
commit 22ba63df162d3ac980f5c33210929177e0a3dfe0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 16 21:59:53 2006 +0000
* More XML output. `--strict' to strictly evaluate attribute sets and
so on.
* Removed `--print-args', it's subsumed by `--eval-only --xml'.
commit 18e4ac0fc6bd1bc01d92d011e4629cacc3bec016
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 16 10:32:30 2006 +0000
* `nix-instantiate --{eval|parse}-only --xml': print an XML
representation instead of an ATerm.
* Indent XML output.
commit fe101fa7851c3eccb79441ed7f5805e13934254f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 16 10:29:43 2006 +0000
* Meh.
commit 267064273301ee9547589fd5874eee693415352f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 16 10:28:44 2006 +0000
* Handle carriage returns. Fixes NIX-53.
commit bfe19b3c3728d90cad7575c5d2571d48f0ef0d14
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 16 10:23:02 2006 +0000
* A test for NIX-53.
commit 3e5b68068bf5cfdc671a2900eeb0dc70fae49cf6
Author: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Tue Aug 15 21:37:48 2006 +0000
On cygwin, disable the check that the output is not group or world
writable. File permissions on Cygwin are rather complex, and in this
case this check introduced a problem with build jobs invoke from
outside of Cygwin (MSYS). It seemed almost impossible to fix the
permissions of the directory, so for now this safety check is disabled
on Cygwin.
commit 7455fd88356fdb58db3fbf01c68de86b06c18747
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 14 14:24:18 2006 +0000
* Put the value in an attribute.
commit 4250b641d8e8edc4cb7def9bc463c7e4ff82e144
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 11 20:26:49 2006 +0000
* `nix-store --gc --print-dead': print the total size of the store
objects that would be freed.
commit 92f7dfa5b73e44f7584eaed726927450a29a48b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 11 20:15:20 2006 +0000
* Don't assume that paths returned by the runtime root finder are
valid.
commit d19b6521fc5f28f821562f2f93cf9c772a5d4582
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 10 20:19:13 2006 +0000
* New configuration setting `build-max-jobs' which sets the default
for the `-j' flag (i.e., the maximum number of jobs to execute in
parallel). Useful on multi-processor machines.
commit 3e239a37ff6f19f2072f70881f8bce748d447c68
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 9 19:37:23 2006 +0000
* file:/ -> file://
commit f1aa71a92f9914ac04141d9d0338391acedd6dea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 9 15:12:34 2006 +0000
* Fix the help message wrt --attr.
commit a18d02e0b076a8a936c3c1660d93f941a9f3183f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 9 15:08:47 2006 +0000
* Print a warning that the subpath operator (~) is deprecated.
commit c0bfcbdd45bfe3c45ab8bf188df926d214675a18
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue Aug 8 15:42:33 2006 +0000
rework the --target flag. If this flag is used, a URI should be given. Default
values are not changed.
commit a0607be7f4ca2d54332cd9e557b21f6ed7a763d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 7 19:48:38 2006 +0000
* Workaround for a bug (?) in GCC 2.95.
commit 5a6b45e2523c29c215f77135c6866baa83f1a7d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 7 18:22:57 2006 +0000
* In nar.nix, path -> storePath, otherwise we get a collision between
environment variable names on Cygwin (where they are case
insensitive).
commit a61129c48cfc11f1b836f42e178aaf231c1fed82
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat Aug 5 00:33:52 2006 +0000
add coreutils to the default PATH for this scripts, so we know for sure we have tools like rm, mkdir, and so on
commit f1947cce9375745b63f7f0512fd1bd4a0f5c1639
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Sat Aug 5 00:31:04 2006 +0000
prevent doing recursive chroots, by unsetting NIX_ROOT in the scripts.
commit 1854f84e830a5282ae1ad1d0c85ed641af6bcf33
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 4 17:07:13 2006 +0000
* Fix a few warnings.
commit dcff8cdb76b37da8978fecee3398d3b541d11ccb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 4 16:01:26 2006 +0000
* Weird issue on Cygwin with the include file order.
commit f4a502a09a8f4dd0f4ac393798e66f0df03937d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 4 11:51:46 2006 +0000
* Use old-school pipe opens; the new style is Perl >= 5.8.0.
commit 981eff065b8c5b8833ecb81e29b57944b493be01
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 4 11:45:50 2006 +0000
* Remove the dependency on `date', use strftime instead.
commit 339e6f0e1d8a8eddcaa58ceb3e7396eca9714087
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 3 15:52:09 2006 +0000
* `nix-env -q --xml': show query result in XML format for easier
automated processing.
commit 0e267e2625dba2c771996bcf537d1ebb6956ba58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 3 14:49:57 2006 +0000
* `nix-instantiate --print-args': produce XML output so that the
result can be used more easily by scripts.
commit 4750f6c5ed8f74683ebaa013079e24598a753cbe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 3 13:21:21 2006 +0000
* Simple class for writing XML files.
commit fcb784051f5a2d502951722b09cb714d3b397ff4
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu Aug 3 11:48:09 2006 +0000
urgh...for some weird reason this one-liner was not in svn. PEBKAC!
commit a29b64a231468174dcc693979fe40bd482b040b4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 1 13:50:10 2006 +0000
* Better error checking.
commit 4fde308ec047df9691bbfb6f6c1b1fd8d56e8404
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue Aug 1 13:15:55 2006 +0000
add a flag --target, so we can override the URL in the MANIFEST file. This
is only for local copies (so file:///)
commit 601a8eab79bd2822235bcf508574be668a036f18
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 1 12:00:37 2006 +0000
* Ugh. Darwin's chmod insists that flags come before the mode
specification.
commit 6ac237e242260385168046ad95ebc7db2f3538b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 1 09:43:41 2006 +0000
* Show some progress.
commit 4661282fde9f37780877fbeeb34b06b0c221e6bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 28 16:03:28 2006 +0000
* `nix-instantiate ... --arg NAME VALUE': allow arguments to be passed
to functions from the command line.
* nix-build: started removing backticks.
commit c11839d7b24993f9639d59f9fa3420e8ccc22e02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 28 14:01:29 2006 +0000
* `nix-instantiate --print-args': print out the valid values for
functions arguments that have a domain.
commit ca2238cf818e27ebb663c83a9fe9ae7f58eb830f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 26 15:05:15 2006 +0000
* Refactoring: get the selection path stuff out of getDerivations()
and put it into a separate function findAlongAttrPath().
commit 2317d8f6712b2d4e249b8b1206f9e0a9c4269fc0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 25 21:21:50 2006 +0000
* `nix-instantiate --print-args' prints out the arguments of a
top-level function.
commit 0e6dc72a7a4d29b7f1a1458670581a29d573e479
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 25 16:40:38 2006 +0000
* Applied rbroek's patch from the branch at
https://svn.cs.uu.nl:12443/repos/trace/buildfarm-control/trunk/ext/nix/,
with some modifications. This allows `nix-env -qa' to show the
attribute path that can be used to unambiguously install a package
using `nix-env -i -A'. Example:
$ nix-env -f top-level/all-packages.nix -qaA subversion xorg-server
subversionWithJava subversion-1.2.3
subversion subversion-1.3.2
subversion14 subversion-1.4.0pre-rc1
xorg.xorgserver xorg-server-1.1.0
commit b11aeb2c4bce28dca0f0b266eff732ea80628aed
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 25 13:15:23 2006 +0000
* Doh.
commit 5744dd548039b9a8666a414dcb66629322e5af21
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 25 11:53:22 2006 +0000
* Support the --attr / -A flag in nix-env as well. So now we can do,
e.g.,
$ nix-env -i -A subversion xorg.xorgserver
The main advantage over using symbolic names is that using attribute
names is unambiguous and much, much faster.
commit 7a3a5d1608254565030ae8ceb593605962a2614e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 24 16:49:28 2006 +0000
* When there is a domain check, we have to evaluate the argument.
Can't be lazy!
commit f4c5531d928caadee75d66bba40994f55f839be7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 24 16:35:34 2006 +0000
* New language feature: domain checks, which check whether a function
argument has a valid value, i.e., is in a certain domain. E.g.,
{ foo : [true false]
, bar : ["a" "b" "c"]
}: ...
This previously could be done using assertions, but domain checks
will allow the buildfarm to automatically extract the configuration
space from functions.
commit 88acffa20ac45fd13b65a1d9143e0400ae0bde47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 24 16:19:08 2006 +0000
* `touch' might not be in $PATH.
commit b545c669a0d6b6ab7b1aa56560001e43fe9c0956
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 24 15:50:29 2006 +0000
* Tests for domain checks.
commit 57751fdb55ad04d82542165417511d26304cadc2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 24 15:16:03 2006 +0000
* Refactoring to support domain checks.
commit 9c3099d3286b7bc8582b1685ba1917db409cac0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 21 13:21:43 2006 +0000
* Purify `make check'.
commit 7adaa6d4466063893c9ac6b5b7d71c423be34b69
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 21 12:46:54 2006 +0000
* Test for runtime root finding.
commit dcded7da4704ae66ebbb4343597868a7eb992aa7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 21 12:28:25 2006 +0000
* Don't try to do DNS lookups.
commit a4273156c43db7325d27cb21e460b57a998ee882
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 20 13:21:37 2006 +0000
* Use $(libexecdir) to find find-runtime-roots.pl.
commit 410760c5ab696779bfd26bbd8026827ec436a201
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 20 12:58:51 2006 +0000
* Doh.
commit ee2cf45d76a12542fa7c29563cfd9a67524479d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 20 12:19:55 2006 +0000
* Use debug().
commit eca30e12e1c970e4e82ad8fec45d9e2db26b236d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 20 12:18:10 2006 +0000
* svn:ignore.
commit c15f544356dfebf6d08887e73fa156d4e70e2bbc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 20 12:17:25 2006 +0000
* Call find-runtime-roots.pl from the garbage collector to prevent
running applications etc. from being garbage collected.
commit ebcccbd3581d34d7fefb975c0255a39a3e39e122
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 19 16:49:59 2006 +0000
* Added a tool to find additional roots for the garbage collector,
such as open files, current directories, mmaped files, etc. This is
inherently unportable, but it's easy to adapt this script to other
platforms. Currently we call `lsof' and try to read various bits in
/proc/NNN.
The goal is to prevent the garbage collector from removing store
paths that are no longer reachable from a permanent root but that
are still in use (for instance, after the user has done "nix-env -e"
on a running program).
commit 88e54153dce2cdba9a075d9dbc81ad81e7e73435
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 19 15:49:29 2006 +0000
* Add a precise test for hashDerivatioModulo.
commit 4f3725b167cc0080c570a814e28c6181ef5c7f52
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 19 15:36:15 2006 +0000
* Better error messages (especially wrt types).
commit e10b830251af37951109113d88ddf203ae95645c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 11 10:29:52 2006 +0000
* Doh! Of couse we cannot memoize across scopes.
commit 2b4b0658fa3f959f3b25dc75a3aa0a9814e63962
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 10 17:35:00 2006 +0000
* This expression has an undefined variable which isn't detected, so
evaluation fails:
error: impossible: undefined variable `gcc'
commit d51aede4afeb49182879f257b56394b70938028f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 6 15:30:37 2006 +0000
* Allow the canonical system name to be specified at runtime in the
Nix config file.
commit a945fb7905597ff67f285b39004f607f737b14e9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 27 12:17:25 2006 +0000
* `nix-env --upgrade --eq': only upgrade if the old version is equal
to the new version. This is actually useful.
commit f4a3a280dbd5c723d13cf74d71aab1993d0f0a9e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 22 13:01:42 2006 +0000
* Apply the ATerm aliasing patch so that Nix works correctly with gcc 4.1.x.
commit dbf6d7e783ff86c60d39f5000e341082d2604e85
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 20 17:48:10 2006 +0000
* Concurrent GC on Cygwin.
commit cc51f9c539a3822c84a2285efcec11b577727234
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 19 16:35:35 2006 +0000
* Oops.
commit 5bb3444032ad92b98a4a58051fec1f2b31d2e3da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 19 16:24:15 2006 +0000
* _exit() doesn't seem to work right on Cygwin.
commit b35735d8b28af206fa0b293c796bf44c62dde678
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 19 14:43:13 2006 +0000
* On Windows we cannot delete open (lock) files, so we delete lock
files after we've closed them. Since this only succeeds if the lock
is no longer opened by any process, the token trick used on Unix is
not necessary.
commit 0e783e557941f77d5b4bcf2a6c6423ed583991a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 19 14:37:35 2006 +0000
* Write messages to stderr in a slightly more atomic way. Useful when
there are several parallel processes.
commit d7f40357e328c54694edd24e5b2687fe5789528e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 16 13:27:36 2006 +0000
* Skip this test on Cygwin, too slow (and doesn't test anything Cygwin-specific).
commit c937b736227384e6c2f4f477796fc3ce02d1229a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 16 10:13:03 2006 +0000
* Show when we're blocked waiting for a lock.
commit 588cb0eade0c14acdf4a20dfec5678715cc6542e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 15 11:56:49 2006 +0000
* In `nix-env -i|-u|-e', lock the profile to prevent races between
concurrent nix-env operations on the same profile. Fixes NIX-7.
commit 49de87132f3f1685fcdd4157f89ca817647028b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 15 09:16:55 2006 +0000
* Removed.
commit 48e4a3231b5c3b5b91305b246aec7e7c07fe291d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 14 13:31:23 2006 +0000
commit b454977909f31cf560518042f22d930c375caaac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 14 11:53:55 2006 +0000
* Fix for a problem with BSD's group ownership semantics when the user
is not in the "wheel" group.
commit 3a68622dda35d448d1baa61825edda45ca846b97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 14 11:52:22 2006 +0000
* Oops.
commit 370af25efff8be8582bb810c9e4d980989668ffb
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed Jun 7 15:27:17 2006 +0000
* Fix for a locking bug in Berkeley DB on Cygwin.
commit 23960e92df736d3c87db861fcaf2dd7981cfc4ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 1 18:13:33 2006 +0000
* Minor cleanup.
commit 2d456fc35a57f3433ce228433dc8c034359cb605
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 31 11:50:14 2006 +0000
* On Cygwin, set the system type to i686-cygwin, and disable dynamic
linking.
commit bb84984f3ff1fa8fbf3842c1331c4bb660a2714a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 31 10:58:47 2006 +0000
* svn:ignore.
commit 50fe85f016d2d9cb6be512918d648f6376932903
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 31 09:51:45 2006 +0000
* For fixed-output derivations, pass the environment variables listed
in the attribute variable `impureEnvVars' from the caller to the
builder.
commit 04cf72287bc27e4eca69d527ce44a88b7fcbebb2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 31 09:24:54 2006 +0000
* This may be useful in the future.
commit 1390ce4142d511b284b354f984d84fdb12ae850b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 30 11:37:21 2006 +0000
* Not all platforms have sys/select.h.
commit b1c63dc36230bfe4ac4d128f6647846a995feb40
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 30 11:31:33 2006 +0000
* Don't use badTerm, it gives awful error messages.
commit c7d9397fc911997ff10192662bfdaf419167b142
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 29 21:53:58 2006 +0000
* Handle $PATHs with spaces.
commit 58b4198ed8134ec246c0d0689ac46667fc389a97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 29 20:46:51 2006 +0000
* Disable the concurrent garbage collector on Cygwin for now.
commit d764409d9714562f74b378f3eea666528aae3130
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 24 13:23:20 2006 +0000
* Some Cygwin fixes.
commit b5988004d64d6c533e8bb09732a6f7cd4fb1194f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 12 11:47:45 2006 +0000
* Support for srcdir != builddir (NIX-41).
commit 9d72bf8835f3012169aaa88ec608172d5a056b9e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 11 02:19:43 2006 +0000
* 64-bit compatibility fixes (for problems revealed by building on an Athlon
64 running 64-bit SUSE). A patched ATerm library is required to run Nix
succesfully.
commit e3c07782d124cdd8d0aab2b498225cdca28cad66
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 8 20:00:28 2006 +0000
* Remove old manifests in `nix-channel --update'.
commit c54287eafe8435e71634df3957cd5e30b97bb6a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 8 15:15:13 2006 +0000
* GCC 2.95 compatibility.
commit 8b5aa91aa7da149c0a734bd7a3353658aded9838
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 8 14:00:39 2006 +0000
commit 5cabd47394a5bb3076f3f5b5a98425665cddef23
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 8 12:52:47 2006 +0000
* Allow function argument default values to refer to other arguments
of the function. Implements NIX-45.
commit 310e605995dc104bee29d330ac135e3e2bb82f97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 8 10:00:37 2006 +0000
* Show evaluation stats when NIX_SHOW_STATS=1.
commit 0832956089516d32371060c98df4f8d0cbff2b0f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 4 12:21:08 2006 +0000
* Use the new ATermMap.
commit 9840368cad6088e4221fb323202861c97d70bb37
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 4 09:22:29 2006 +0000
* Iterators.
commit 6980544467b42aaefc5b588d8be2f1d7a2badef3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 4 08:32:30 2006 +0000
* Keep some statistics about memory allocation.
commit b803fb95cbce33cf37496e1fc947d9721714de44
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 3 23:17:42 2006 +0000
* Maintain the count field properly.
commit db0d865ec4fb646856731000d540d968011f4daf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 3 23:07:38 2006 +0000
* New ATermMap, seems more-or-less finished.
commit 052cefe1bdb6be0257ef2f1c1f128b7e635814ed
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 3 17:29:48 2006 +0000
* Started hacking on a ATermTable replacement, since ATermTable uses
gigantic amounts of memory --- 65536 bytes per table at least ---
which makes it unsuitable for representing short-lived substitution
tables and attribute sets.
commit d300b4383dabb007db08c7165fb327c12dbe8e71
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 21:58:46 2006 +0000
* Optimise null-ary term builders. Also declare all term builder
functions as pure, which might improve performance a bit.
commit 68174bdc7d68746c5471e87bb74909c552e98644
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 21:39:02 2006 +0000
* Use a linked list of substitutions. This reduces the amount of
copying.
commit c791e94aee07ad98ec29df18498ad85241e1e96d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 17:51:50 2006 +0000
* Removed a bunch of ATreverses.
commit b52e71191094f564d7b7484b89e47e710bb94bdc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 17:12:03 2006 +0000
* Huge reduction in memory use (2/3 or so on large nix-env -qas
operations): share ATermMaps between DrvInfos.
commit 11ae2d1e7af05c3410a368338c7d13a49c2d2ccd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 14:07:28 2006 +0000
* Memory reduction: replaced expensive calls to ATmakeApplList by
ATmakeApplArray, and got rid of ATreverse in substitute().
commit dc719e6ba57fc877574bd3bc023a25676c555b3c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 13:39:55 2006 +0000
* Some preliminaries towards NIX-45.
commit ae55e79541ffbce7a051794d6d25e9e8c7b63b2d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 11:20:55 2006 +0000
* More tests.
commit dca43ef795c0589d47620241823393c739b99498
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 2 11:15:04 2006 +0000
* Tests for NIX-45.
commit 7276e194eefc807600e1dcd10566a57e557ed1ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 1 15:29:46 2006 +0000
* Disallow unescaped $ in string literals.
commit 0064599a27ec44880e4ff6fa19f453e610b5ef07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 1 14:01:47 2006 +0000
* String interpolation. Expressions like
"--with-freetype2-library=" + freetype + "/lib"
can now be written as
"--with-freetype2-library=${freetype}/lib"
An arbitrary expression can be enclosed within ${...}, not just
identifiers.
* Escaping in string literals: \n, \r, \t interpreted as in C, any
other character following \ is interpreted as-is.
* Newlines are now allowed in string literals.
commit 6cecad2be0f7ced82658ec2a86bcf61583487959
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 1 09:56:56 2006 +0000
* Allow string concatenations involving derivations, e.g.,
configureFlags = "--with-freetype2-library="
+ freetype + "/lib";
commit cce31b739c6d3e381824ac6fde3f06ccb02782af
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Apr 29 11:54:45 2006 +0000
* svn:ignore
commit 6fca1b82ae39dd45bdd155c7211dc16629a5e11a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 25 16:41:06 2006 +0000
* Change this to LGPL to keep the government happy.
commit de8f2d061ca7646521b67fcbde5b474abaf9438b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 25 11:52:24 2006 +0000
* Install only the header file and libraries from Berkeley DB.
commit e18c93169c35dba6863ffb9fb51c7b775bac9d89
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 25 11:33:27 2006 +0000
* Create libexec.
commit 0748331b708deec8319a3e0dcb075b4c396b5665
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 25 10:57:08 2006 +0000
* Typo.
commit 03162f8f477fb7634edbf53ad4e9dfca433dd9d9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 25 10:45:53 2006 +0000
* Unless --with-bzip2 is specified, use a copy of bzip2 in the
externals directory. This is in particular useful because though
most systems have bzip2/bunzip2, they don't always have libbz2,
which we need for bsdiff/bspatch.
commit ef2d4a2da9c14c15985bdd27c02d2d30093a3e56
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 24 14:02:44 2006 +0000
* Print a more useful stack trace when an error occurs deep in the
derivation dependency graph.
commit b69e4693287d481ee75f948227a2c508391ef055
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 23 16:43:07 2006 +0000
* In `nix-env', look for derivations inside attribute sets that have
the `recurseForDerivations' attribute set to `true'.
commit 49ce8b57ddc459faef8192be04f69b9e777afc75
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 23 16:37:49 2006 +0000
* Hm.
commit 20675feeab7501bd9ca78a699509b4de89885ec9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 15 12:58:22 2006 +0000
* Update copyright.
commit 05bb644890b2c5b46f1e69072873a276dccaa191
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 14 16:35:01 2006 +0000
* Allow the resulting symlink of nix-build to be named, e.g.,
$ nix-build .../i686-linux.nix -A apacheHttpd -o apache
commit fdea084c365083a65eb363973400416107b5e32b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 10 22:27:26 2006 +0000
* Allow `make check' to work in directories that have symlink
components.
commit 37d1b1cafd17a18dc7dbef3b4ba7fb204158d58b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 10 16:20:42 2006 +0000
* `nix-env -qa --description' shows human-readable descriptions of
packages (provided that they have a `meta.description' attribute).
E.g.,
$ ./src/nix-env/nix-env -qa --description gcc
gcc-4.0.2 GNU Compiler Collection, 4.0.x (cross-compiler for sparc-linux)
gcc-4.0.2 GNU Compiler Collection, 4.0.x (cross-compiler for mips-linux)
gcc-4.0.2 GNU Compiler Collection, 4.0.x (cross-compiler for arm-linux)
gcc-4.0.2 GNU Compiler Collection, 4.0.x
commit a33fb2d28738376d377ea8473f6cffc39bc784c4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 10 16:14:30 2006 +0000
* Oops.
commit 2b3b6c9b3428856b215545efd3abb9b8f42cf8b4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 10 16:14:13 2006 +0000
* In theory, this should reduce the number of ATermMap
re-allocations.
commit 4ada6db1fc9cee9c0e51fb54af8770dd28243dff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 10 10:24:46 2006 +0000
* `nix-env -q' now accepts arguments that allow specific derivations
to be queried, e.g., `nix-env -qa firefox'. This does require the
argument '*' to be passed if one wants information about all
derivations, so the old `nix-env -qa' now is `nix-env -qa "*"'.
commit 9811815429f613b4ab64794a3b95144f9aa5b41d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 10 09:41:28 2006 +0000
* Write messages to stderr, not stdout.
commit 18c321308d2e71db7355a83200c0ef4d00900d0b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 9 17:07:25 2006 +0000
* Ugh, printHash() was very inefficient because it used
ostringstreams. Around 11% of execution time was spent here (now
it's 0.5%).
commit b90c00e63fb476d8587ca29f15cbe8008760a584
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 9 15:10:01 2006 +0000
* Regression: semantics of the result of getDerivation() changed.
commit 922697c8b27570b6c76a472266507b73f6b79f7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 9 15:09:18 2006 +0000
* Big speedup (factor > 2.5) in all nix-env operations that do actual
instantiation, e.g. "nix-env -i" and "nix-env -qas" (but not
"nix-env -qa"). It turns out that many redundant calls to
addToStore(path) were made, which reads and hashes the entire path.
For instance, the bash bootstrap binary in Nixpkgs would be read and
hashed many times. As a result nix-env would spend around 92% of
its time in the function sha256_block (according to callgrind).
Some simple memoization fixes this.
commit 6dca5c9099b92b6a93071197aa606a31ccd83a37
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 8 16:03:58 2006 +0000
* When obtaining derivations from Nix expressions, ignore all
expressions that cause an assertion failure (like `assert system ==
"i686-linux"'). This allows all-packages.nix in Nixpkgs to be used
on all platforms, even if some Nix expressions don't work on all
platforms.
Not sure if this is a good idea; it's a bit hacky. In particular,
due to laziness some derivations might appear in `nix-env -qa' but
disappear in `nix-env -qas' or `nix-env -i'.
Commit 5000!
commit 9088dee9e265db8176b61e53ac43a916fdd34a3d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 8 14:11:19 2006 +0000
* Some refactoring of the exception handling code so that we can catch
Nix expression assertion failures.
commit fa72ae1e9cad0dded28b965fe97293bbeeac031e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 6 14:40:10 2006 +0000
* GCC 4.1 compatibility.
commit c8bfb11b34e4b8d3cfd714c54e7436c80e4d72ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 6 11:21:15 2006 +0000
* `nix-env (-i|-u) --dry-run' now shows exactly which missing paths
will be built or substituted.
commit 7ba1fd2029c1290d89f0218157e597885926ca80
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 6 11:04:39 2006 +0000
* Regularise help text a bit.
commit 120f00c04fcc1cf1239e88b605f34da551e0bacf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 3 14:25:07 2006 +0000
* More online help.
commit 2d54312f876c4810db4c3c0006bace686db4948b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 3 14:15:02 2006 +0000
* Rewrote nix-build in Perl, since sh is just too limited (turns out
that arrays are a bash extension, so it didn't work on FreeBSD).
Also fixes NIX-8 (readlink(1) dependency).
commit 78d84f5631eb1d0e4b665dbaacbbb1669ba899f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 18:26:21 2006 +0000
* Tests for fixed-output derivations (and attribute selection, incidentally).
commit 2167bf6b72dde2bb574ac72da0fad145504a4d3f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 18:11:41 2006 +0000
* Tests to prevent a repeat of the parseHash32 debacle.
commit 70dee0f8ca9d7236008e161d1d1210b945ec832e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 18:05:47 2006 +0000
* Flags `--to-base32' and `--to-base16' to convert between hex and
base-32 hashes.
commit e136532800113902432c451f0a38bf6d77e5801a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 17:59:08 2006 +0000
* Ouch, parseHash32 was completely broken. All digits >= 4 were
parsed as 4.
For a moment I worried that printHash32 was broken, and that would
have been really, *really* bad ;-)
commit 74166f2f44a9d2de6dc7862a99e9c2f2bcc9b54b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 17:44:28 2006 +0000
* db.hh shouldn't depend on the Berkeley DB headers.
commit 1bdceb421fe0082213e012362c1ac6a47ee6e4bb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 16:52:55 2006 +0000
* Doh!
commit d822bf32e470e46a3634638fee3c4b1472d2cd26
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 16:36:35 2006 +0000
* Close the database before the destructor runs.
commit fa95f4be3f4df6ebe4d49ec57a66129f645e36c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 16:26:13 2006 +0000
* More test coverage.
commit 80b5c7168436d4fa34952c2d7d8c26d9894afe3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 16:03:32 2006 +0000
* Doh!
commit e3daee919d0335d2c41fc556ff55d8289ade10d0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 15:46:22 2006 +0000
* Test `nix-store -q --binding'.
commit ea9c35d3cc2ef65643718e696007ba3569099e1e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 15:43:37 2006 +0000
* Test `nix-store --add' and `nix-store -q --hash'.
commit 30d051ff14d5a0f8912c9ba3c3a6ca97c2b7dbf0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 15:40:01 2006 +0000
* New suppressions.
commit b6780b9e1079cdb3eec2aedcd7d9e510edfd95f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 14:39:42 2006 +0000
* Uninitialised variable. Fixes the --delete test.
commit b602d2dfdf79d5e00595f78701b54339e15bf7d8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 14:39:10 2006 +0000
* Wrong delete. Thanks valgrind.
commit b90787290df216f511ec296c85390e645ca1e89f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 14:26:03 2006 +0000
* TDD! Woohoo!
commit 089c41a0c2ecf91c55495547a5462d75f36be5f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 14:17:00 2006 +0000
* Oops!
commit ca0b23c831e28ef344e71ffd342452700b1b9109
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 14:00:27 2006 +0000
* Test the nix-store --gc subflags.
commit 5cb6c42088347bf7ba513cdd68b20c91035c7db9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 13:49:12 2006 +0000
* Test nix-build. This also tests indirect roots.
commit 8cd646b6af87dad97d326e5f0d7b1e9ecff17c97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 13:33:12 2006 +0000
* Clear the substitutes prior to running the test.
commit e48bd8c8b50e48db297e49fb325a94e854d6bdad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 13:25:08 2006 +0000
* Add a test for nix-log2xml.
commit 458820df6cb976e0642c67ca775d8e7095c091f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 13:24:47 2006 +0000
* Generate valid HTML.
commit 6b8bb8d74ab500eb6dddecbdf578c9cdf14a748c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 12:51:39 2006 +0000
* Remove dead code.
commit 84c4631221bc65643830173b4affe58b0dc58202
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 12:51:18 2006 +0000
* Simplification.
commit a4c63c6e8e161d55778b797e566d9eca7c47f34f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 1 12:15:33 2006 +0000
* Make it easy to run individual tests from the command line.
commit 85793fa438847974330123a8d4160283fcfa18f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 24 17:10:38 2006 +0000
* Remove debug statement.
commit e2f16b9cae0f9904daeb94ac0ecee1fd9ae2c9b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 24 16:05:55 2006 +0000
* A script to remove from a manifest those patches whose base or
target no longer applies to any available release. This is a
partial fix for NIX-34 (when producing linear patch sequences
between releases, the number of patches grows without bound).
commit 5168f9bb005aa0d25cb31fdd7aba1bac951b2251
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 24 16:02:36 2006 +0000
* Canonicalise manifests a bit by sorting them.
commit 9d3bee50ad9e52cd46eefe06a4c6b55794e83a9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 15:20:11 2006 +0000
* Aha!
commit 17f39049cf13450c86b62a5782f28e678849bc33
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 15:09:47 2006 +0000
* WTF?
commit 43fa1c20e7e98819925b16d60d6b7c9e87c93fca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 14:35:19 2006 +0000
* Separate the cache reading code.
commit 928cce592279615fbe7b29fc0f47bb2506297116
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 14:13:02 2006 +0000
* Directory for nix.cs.uu.nl manifest / cache maintenance scripts.
commit fcec32a2c56589da9224aa62daf94c6492250015
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 14:10:02 2006 +0000
* Use right directories for NAR files and patches.
* Print errors to STDERR.
commit f0d6318dd1227dff81b84d62796371904e5c5b5f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 14:02:44 2006 +0000
* More tests.
commit ddb78dfc3d209f96101da242f90e5031918af355
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 22 13:55:41 2006 +0000
* Check whether "nix-store -q --graph" generates a valid dot graph.
* Test "nix-store -q --tree" as well.
commit 46f0cb08692713954a4d452da6d7c07e17eb0cac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 17 18:11:45 2006 +0000
* In "nix-env -i", print a warning if there are multiple derivations
with the same name *and* version number, and pick the first one
(this means that the order in which channels appear in
~/.nix-channels matters). E.g.:
$ nix-env ii aterm
warning: there are multiple derivations named `aterm-2.4.2'; using the first one
installing `aterm-2.4.2'
commit 7a3e715980c3fcd84b6d12f54a18a920ebba208d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 17 17:47:54 2006 +0000
* Fix for NIX-31: "nix-env -i foo" installing all derivations named
foo. Now it will only install the one with the highest version
number.
commit 58fc420b365b8f8d6faaa332ab3ba4e97ad584e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 17 17:05:34 2006 +0000
* And another test.
commit 4ddd5ff39cddf46acb23eedc9638f9709da0c47d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 17 17:03:19 2006 +0000
* Regression test for NIX-31.
commit 889ef564fd0aca2814659f28fc7b9dc0191a6656
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 17 16:26:28 2006 +0000
* Fix the infamous NIX-17: nix-env -i prints misleading messages
("installing `foo'" followed by "uninstalling `foo'").
commit 345a95afe9e265bc433eea46c32c507ea84a72a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 16 13:58:10 2006 +0000
* Allow the size of the GC reserved file to be specified in nix.conf
through the new `gc-reserved-space' option.
commit 651ab439cf5b0c6ab2044257a30b0d94406d57d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 16 13:19:15 2006 +0000
* A simple hack to fix NIX-18: the garbage collector cannot run when
the disk is full (because to delete something from the Nix store, we
need a Berkeley DB transaction, which takes up disk space). Under
normal operation, we make sure that there exists a file
/nix/var/nix/db/reserved of 1 MB. When running the garbage
collector, we delete that file before we open the Berkeley DB
environment.
commit d6f586d0eaa9344a99248cc4dfb7825972f2a174
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 13 19:52:43 2006 +0000
* Optional switch "--with-openssl=<PATH>" to use OpenSSL's
implementations of MD5, SHA-1 and SHA-256. The main benefit is that
we get assembler-optimised implementations of MD5 and SHA-1 (though
not SHA-256 (at least on x86), unfortunately). OpenSSL's SHA-1
implementation on Intel is twice as fast as ours.
commit e8475bbd5b0c5505bb0536929e89efc8b0d4da5c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 13 18:00:08 2006 +0000
* Use a union.
commit 2d2e28d02c18668856b7d55fad40cac4f875fa3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 13 13:09:23 2006 +0000
* Override YYMALLOC and YYFREE so that we can call AT[un]protectMemory
on the Bison parse stack. Otherwise, a garbage collect during
parsing could lead to a crash.
commit 0ca0a4da9f63c8c036d82c2366f4c794bcd327d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 13 12:48:59 2006 +0000
* Valgrind suppressions for the ATerm library. The ATerm library uses
a conservative garbage collector that scans the stack and parts of
the heap for pointers to ATerms. This scan can touch uninitialised
memory, which is harmless. Use:
$ valgrind --suppressions=aterm-gc.supp ...
commit da0a6b6499ea89bc9858d32970da8f26c5f3c56b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Feb 12 21:00:36 2006 +0000
* Doh.
commit 982399bb144ca1c6d21834fd9a6f61b49db1bfce
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 10 17:37:35 2006 +0000
* Enable the --attr in nix-build as well (and add -A as an alias).
Example:
$ nix-build ./all-packages.nix -A xlibs.libX11
So finally it's easy to perform a test build of a Nix expression!
commit c6120352b3fd25380ff21726982e22b97ee43e0b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 10 17:25:59 2006 +0000
* In nix-instantiate, allow us to specify a "path" to the
derivation(s) we're interested, e.g.,
$ nix-instantiate ./all-packages.nix --attr xlibs.libX11
List elements can also be selected:
$ nix-instantiate ./build-for-release.nix --attr 0.subversion
This allows a non-ambiguous specification of a derivation. Of
course, this should also be added to nix-env and nix-build.
commit b505f9eaf57c7badeacb176a1946b5f5f145f816
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 10 15:29:17 2006 +0000
* Document that nix-instantiate can read from stdin.
commit 9e51abc7dc13ece2a561cdd41c0304cffbba67d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 10 15:28:47 2006 +0000
* Make --parse-only work when *not* reading from stdin.
commit f848a457391488544abc6b405d33ab5334eb19d0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 10 15:14:57 2006 +0000
* Cleanup: use the code shared with nix-env.
commit 4eb637c799bddfcff7661164f98cd604fe4120f5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 16:15:07 2006 +0000
* When querying all derivations, filter out syntactically equal derivations.
commit 8688e83194c11f66df2d38dfa9b274d2216773b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 15:22:30 2006 +0000
* When evaluating, automatically call functions with default arguments.
commit f8aadf14c3426f7ab2b7a934b602f812bcc5b8ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 15:21:57 2006 +0000
* Test-driven development, woohoo! nix-env should work on functions,
provided that all arguments have defaults.
commit 287d0ef41c347d91c0cd2f74ab4e48df7c125cc8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 14:32:33 2006 +0000
* Oops, fix breakage.
commit e771e59178f42fd1c6005c8a35f2ecfebf0e4ce4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 14:32:06 2006 +0000
* Tests for nix-env, finally!
commit 39f50db731bb1924d3c18b153dfe4258208b8812
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 8 13:21:16 2006 +0000
* Refactoring: move derivation evaluation to libexpr.
commit 4db4b61380d94c2626b7c4ee2e613b6b6223f803
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 7 14:47:26 2006 +0000
* Don't install nix.conf (so it won't be overriden when you upgrade an RPM).
commit 81de538e46c154267c4fb7e87cf6804aed63f3df
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 3 14:20:59 2006 +0000
* Use setsid instead of setpgrp in child processes. This not only
creates a new process group but also a new session. New sessions
have no controlling tty, so child processes like ssh cannot open
/dev/tty (which is bad).
commit b90daaaf6c1f52fe93f4f845da20b122cfea2936
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 2 16:27:31 2006 +0000
* When killing a build hook, kill the entire process group (as
intended). This ensures that any ssh child processes to remote
machines are also killed, and thus the Nix process on the remote
machine also exits. Without this, the remote Nix process will
continue until it exists or until its stdout buffer gets full and it
locks up. (Partially fixes NIX-35.)
commit 6e2eaaec96e96ce593dd1e38d03fcf8d1f62eb55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 1 17:28:13 2006 +0000
* Print a better error message when writing the patched file (e.g.,
"No space left on device" instead of "Success"). Reported by Karina
Olmos.
commit d9d6ff9f8eb4269bb697912154ef9d6d96ab1481
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 1 16:49:52 2006 +0000
* Doh.
commit 8291f6d96845163850a2451fff4a03a292fa71b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 1 16:48:49 2006 +0000
* bsdiff updated to 4.3. This makes Nix depend on libbz2.
commit 9e4ffc43a2a6b67643765efd48198f218fcf0530
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 1 16:47:51 2006 +0000
* The "S" bit should be based on the output path, not the derivation path.
commit 3eba483692f6c353dd20341b9d3fea144271ba69
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 1 14:52:58 2006 +0000
* Use Berkeley DB 4.4.20.
commit 151f10dbc758a8bbc15bd941bd10bfdfe4c925a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 1 12:41:54 2006 +0000
* Add @bindir@.
commit 83424eb71b2c9656061b01617230e433a4b27d83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 26 23:18:46 2006 +0000
* Don't force a build of derivations.
commit db2275cb9968fc337bfac14805651d6c78c7213a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 26 23:18:26 2006 +0000
* Oops, the "I" bit in "nix-env -qas" was broken. Reported by Nicolae Vintila.
commit 1029716a8a8934fe1f0502e3da0d65646f45c911
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 19 15:35:34 2006 +0000
* Don't show cycles, they're not very useful.
commit e4d4969ae929682aea936e035cc24d56949a82ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 12 15:17:51 2006 +0000
* New tools nix-pack-closure and nix-unpack-closure. These provide a
useful way to transfer the closure of a store path to another
machine.
These commands provide functionality previously possible through
`nix-push --copy'. However, they are much more convenient in many
situations (though possibly less efficient).
Example:
$ nix-pack-closure /nix/store/hj232g1r...-subversion-1.3.0 > svn.closure
(on another machine:)
$ nix-unpack-closure < svn.closure
Note that Subversion is added to the store, but not installed into a
user environment. One should do `nix-env -i
/nix/store/hj232g1r...-subversion-1.3.0' for that.
Another example: copy the application Azureus to the machine
`scratchy' through ssh:
$ nix-pack-closure $(which azureus) | ssh scratchy nix-unpack-closure
commit 5b527901ae625675f525dd65b82f90bcb2001afd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 9 14:52:46 2006 +0000
* dirOf: return "/", not "", for paths in the root directory. Fixes NIX-26.
commit 04be39734f6a5fe2e724a0c7b813ea1dd6ed3a29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jan 8 17:16:03 2006 +0000
* Resolve all symlink components in the location of the temporary
build directory (TMPDIR, i.e., /tmp). Fixes NIX-26.
commit 0f8d3c871bfad0f83f4469c26aaa37927a525fe0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 25 11:29:12 2005 +0000
* More GCC 2.95 compatibility.
commit 52d20ef124bafc51d982b34d127e7d9524d1a409
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 25 02:02:29 2005 +0000
* Hack around a GCC 2.95 bug.
commit 1440419b45dec876497b982f945bcfff8d0aea4b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 24 23:32:59 2005 +0000
* GCC 2.95 compatibility.
commit 1d2460ee5da0f026807ac645aebdd8ab811058cd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Dec 24 23:22:05 2005 +0000
* Documentation fixes.
commit f96d2dea266760e5587356e72d1cadaace5f7d5b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 23 21:36:44 2005 +0000
* Added a flag `--ignore-liveness' to `nix-store --delete'. It
deletes a path even if it is reachable from a root. However, it
won't delete a path that still has referrers (since that would
violate store invariants).
Don't try this at home. It's a useful hack for recovering from
certain situations in a somewhat clean way (e.g., holes in closures
due to disk corruption).
commit 4b9e7f59ca14c3de7b0cfdaebca98fa2639bbbf9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 23 21:08:42 2005 +0000
* Revived the old "nix-store --delete" operation that deletes the
specified paths from the Nix store. However, this operation is
safe: it refuses to delete anything that the garbage collector
wouldn't delete.
commit 3c5619c7e496b0ce7b7bc16cbcf11668cf7a69fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 21:11:55 2005 +0000
* Begin release notes.
commit 530b27df1e71852580d8b0d474543aeffe65618f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 21:11:39 2005 +0000
* `nix-store --gc' prints out the number of bytes freed on stdout
(even when it is interrupted by a signal).
commit 5144f750c471cdb629750e96ddc913fb01fb9eef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 17:04:02 2005 +0000
* Typo.
commit b1eed6b5862644fe8fdb8b7d3897fdcf227abe71
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 16:53:21 2005 +0000
* Split the database upgrade into multiple transactions to prevent
Berkeley DB from running out of locks.
commit 11a8dc76d6262c8da601cf640516b9e9669850a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 15 13:45:10 2005 +0000
* Doh!
commit ab5c6bb3a3deef29c6fe0a86017d35bc4f3de506
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 13 21:04:48 2005 +0000
* Change `referer' to `referrer' throughout. In particular, the
nix-store query options `--referer' and `--referer-closure' have
been changed to `--referrer' and `--referrer-closure' (but the old
ones are still accepted for compatibility).
commit d87549c1c7bb6f85ff0a019b33b315ace0013e6b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 12 19:14:38 2005 +0000
* Automatically delete the old referers table.
commit 8463f27d8cd09d54648de21c747f895cdb558f83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 12 18:24:42 2005 +0000
* Fix NIX-23: quadratic complexity in maintaining the referers
mapping. The referer table is replaced by a referrer table (note
spelling fix) that stores each referrer separately. That is,
instead of having
referer[P] = {Q_1, Q_2, Q_3, ...}
we store
referer[(P, Q_1)] = ""
referer[(P, Q_2)] = ""
referer[(P, Q_3)] = ""
...
To find the referrers of P, we enumerate over the keys with a value
lexicographically greater than P. This requires the referrer table
to be stored as a B-Tree rather than a hash table.
(The tuples (P, Q) are stored as P + null-byte + Q.)
Old Nix databases are upgraded automatically to the new schema.
commit 18bbcb1214caf75c0190e610d7eb34e971366c7c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 11 19:25:48 2005 +0000
* Add a test to demonstrate the quadratic complexity of referrer
(de)registration, in particular garbage collection (NIX-23).
commit a33b561a6b2e5cbc805f903817a3a3d5df03b747
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 9 22:55:07 2005 +0000
* Use Berkeley DB 4.4's process registry feature to recover from
crashed Nix instances, and toss out our own recovery code.
commit eb268a7f959ff558fcbb72f2c2c3b3c3df97eb6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 8 22:14:15 2005 +0000
* Apply the patch.
commit dfffd9256813701e64685227bdfb75f0a694c70d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 8 18:18:20 2005 +0000
* A patch to make the DB_REGISTER feature work when debug info is not on.
commit 760264bffe7f233f7c1fd5e9fccb9b3c189afd58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 6 15:00:04 2005 +0000
* Require Berkeley DB 4.4.
* Checkpoint after an upgrade.
commit dc528128cc5230c9eb7da0abb0a791f94e0e3b56
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 17 13:58:23 2005 +0000
* FreeBSD compatibility fix.
commit 44409f52c1984542d1e565b55e5b94f29c686c7b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 17 11:58:22 2005 +0000
* "Fix" the test, since we cannot feasibly support the intended semantics.
commit b7f008fc353ea05c423fb571047144052ce691c3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 16 08:27:06 2005 +0000
* Did something useful while waiting at IAD: reference scanning is now
much faster.
commit 9311ab76a523de516b6bc98afda9e4b790225514
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 4 15:34:09 2005 +0000
* Install signal handlers for SIGTERM and SIGHUP. This ensures that
Nix is properly shut down when it receives those signals. In
particular this ensures that killing the garbage collector doesn't
cause a subsequent database recovery.
commit 5bf939885a8bfca9b66a2440bf52330c5fde6477
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 4 15:17:05 2005 +0000
* Memoise checkVarDefs since internally produced terms (i.e., not the
result of parsing) can have very heavy sharing, causing exponential
complexity if we naively recurse into them. ATerms are graphs, not
trees!
commit 1f285cf5563047f236213c8eadc91324b69af42b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 4 14:50:33 2005 +0000
* Scoping bug in `with'.
commit 221c79013f105612222cd7df3415bf63abcc7412
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Oct 29 18:17:45 2005 +0000
* Turn off build hooks in nix-push because of an impurity (NIX-21).
commit f0856fd905ea727e88f3fc14d3c717679ce8359b
Author: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat Oct 29 15:44:02 2005 +0000
* Repair the referers table from the references table.
commit 92d599c6a7e7d197fa41167967860628b0f51e60
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 20 16:58:34 2005 +0000
* Prevent uids from being used for more than one build
simultaneously. We do this using exclusive locks on uid files in
/nix/var/nix/userpool, e.g., /nix/var/nix/userpool/123 for uid 123.
commit e932c40f8e1fb6aa6edb155fbca1c1273798a20e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 19 14:27:44 2005 +0000
* Oops. Fixed-output derivations were broken.
commit 1b43fbd8e4c97dfed5f0679feccdb7ff576f6bbe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 18 14:09:43 2005 +0000
* Oops, that should be Berkeley DB 4.3. Reported by Gerco Ballintijn.
commit 13b089c890bac229e7c3accfd9299f3fdac95e27
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 17 17:43:21 2005 +0000
* Also kill all processes of the build user after the build. This is
critical to prevent certain kinds of 0wnage.
commit f1b3a418fa86e3204c47d4b33873b57a19e9f47c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 17 17:35:37 2005 +0000
* Before starting a build under some uid, kill all current processes
running under that uid.
commit 439823ae803444052442ad6ceb7191ba22cbc4cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 17 16:59:25 2005 +0000
* Check that the build result is owned by the build user, and that
nobody else has write permission to the build result. This catches
most hack attempts.
commit 7ef574e5d0568a27a3f30b68af6d0a744aff90ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 17 16:52:29 2005 +0000
* Don't use FIFOs to make Nix create the output path on behalf of the
builder. Instead, require that the Nix store has sticky permission
(S_ISVTX); everyone can created files in the Nix store, but they
cannot delete, rename or modify files created by others.
commit 32282abceaebbe574fa83c074aa8dbff19f937bb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 17 15:33:24 2005 +0000
* Beginning of secure multi-user Nix stores. If Nix is started as
root (or setuid root), then builds will be performed under one of
the users listed in the `build-users' configuration variables. This
is to make it impossible to influence build results externally,
allowing locally built derivations to be shared safely between
users (see ASE-2005 paper).
To do: only one builder should be active per build user.
commit 15ff877438a57936d620622cee8fb98cea607d08
Author: Armijn Hemel <armijn@gpl-violations.org>
Date: Tue Oct 11 17:30:57 2005 +0000
add @coreutils@ to correctly use coreutils to create a profile. This is needed
for NixOS, where we might not know our PATH in advance.
commit 0f133ae8d280c33db21d0aab7269c647de016b23
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 11 12:41:12 2005 +0000
* Use ATerm 2.4.2.
commit dfbf520ec2748b17638fdc5a911f7b091f1b74a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 6 15:51:59 2005 +0000
* Swap the system and version comparion columns.
commit 62412c5874583364a95eece820744bed53d155cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 6 15:51:43 2005 +0000
* Document `nix-env --compare-versions'.
commit cec2be64f36dce184986cbe69adf80a3fac6985a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 6 15:01:46 2005 +0000
* Only colorise if we are attached to a terminal.
commit b87b9c0d1fcbce045f05379d0efe9ae14d0f87e6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 6 14:44:54 2005 +0000
* New query option: `--compare-versions' or `-c' to compare installed
versions to available versions, or vice versa.
For example, the following compares installed versions to available
versions:
$ nix-env -qc
autoconf-2.59 = 2.59
automake-1.9.4 < 1.9.6
f-spot-0.0.10 - ?
firefox-1.0.4 < 1.0.7
...
I.e., there are newer versions available (in the current default Nix
expression) for Automake and Firefox, but not for Autoconf, and
F-Spot is missing altogether.
Conversely, the available versions can be compared to the installed
versions:
$ nix-env -qac
autoconf-2.59 = 2.59
automake-1.9.6 > 1.9.4
bash-3.0 - ?
firefox-1.0.7 > 1.0.4
...
Note that bash is available but no version of it is installed.
If multiple versions are available for comparison, then the highest
is used. E.g., if Subversion 1.2.0 is installed, and Subversion
1.1.4 and 1.2.3 are available, then `nix-env -qc' will print `<
1.2.3', not `> 1.1.4'.
If higher versions are available, the version column is printed in
red (using ANSI escape codes).
commit 0e0041b2b674e94ae7846474c536ad49239f9e36
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 5 13:01:45 2005 +0000
* Update NEWS in the root directory properly.
commit 0e38578433f5626a33647d8d1332affe1b10b94c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 5 09:42:13 2005 +0000
* log2xml -> nix-log2xml.
commit d47e03fccd1807edb6199cbe0736872d0db3b017
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 5 09:37:58 2005 +0000
* Install the XSL stylesheets for log to html conversion.
commit ed4de220d29414be504a9f73bf86e0cef2e8dfba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 28 09:00:07 2005 +0000
* Use "source" instead of ".".
commit ebfe57166dcf14b0033b4f3d3be3bb1289a19c07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 22 17:23:43 2005 +0000
* Lets not go wild with templates.
commit 4578a490ce5a5a6325b4ff2b8f44468464de2d94
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 22 15:43:22 2005 +0000
* Parse multi-valued options.
commit fbedf6056eb2acb5049b0372350b2c93b8185ab7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 22 12:23:22 2005 +0000
* Merge release notes.
commit 607a2f01e6e171ab31c31aef3220dc69736309c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 21 17:14:52 2005 +0000
* Remove other uses of IPC::Open2.
commit 95304172a581a1052a3b6bcda2ef1a8531f88949
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 21 17:06:06 2005 +0000
* Don't use IPC::Open2, it has a subtle race bug on Mac OS X 10.4. If
the parent runs before the child, it closes some pipe file
descriptors which causes the child to fail due to a bad file
descriptor. So we just use the normal open() function instead.
This fixes NIX-14 (intermittent nix-pull failures).
commit a864aca44cf2eb0b6b39f5e06ac4112250a05358
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 21 17:02:48 2005 +0000
* This doesn't parse for now.
commit 8d06842a761bab72a2886420c6c47f9daedf30e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 21 12:19:39 2005 +0000
* Configuration options for trusted local builds.
commit 89cd0f57b174ec4dc7e0a4e6015ed401272d9aad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 21 11:12:43 2005 +0000
* Use -all_load on Mac OS X.
commit ef9e2c8e733c4cd4f98ebc704527a54588f4a3ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 20 16:14:00 2005 +0000
* Typo.
commit 25d217684b06b368923d8f683c9b561cdfded255
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Sep 18 20:27:02 2005 +0000
* Use a statically linked ATerm library and build it at -O1, since
higher optimisation levels cause statically linked libraries to
barf.
commit f4fe3bd5b1b92007f2023f841a468c64592b6fd0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 13:47:03 2005 +0000
* Bump the version number to 0.10.
commit db1a4227a3303d6bda5ea0f28716ca9141a5b25e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 11:28:29 2005 +0000
* Updated release notes.
commit c28b8eb6996ee1fa6cf0755dcb745b7382650011
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 10:35:48 2005 +0000
* svn:ignores.
* Add missing file to dist.
commit 6f044ab39ceec0a53ccc6995d0c0ec43603ba9b9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 09:05:54 2005 +0000
* svn:ignore.
commit d34fa9a6cc62f8a98a64a269843f0480ceaed8b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 09:05:18 2005 +0000
* Remove dead file.
commit 846b53bde42614e30bbb260d4ba97140eb503f49
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 09:03:24 2005 +0000
* Set the current directory to something well-defined. Might help in
setuid installations.
commit 5c0770ac847e3eb0ed004b75a52e2a94463b550f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 16 08:47:34 2005 +0000
* Include the release notes in the manual.
commit 1b62c2eba3f735c8e31200446735f53568a12ff3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 15 20:29:08 2005 +0000
* Force release notes in ASCII, not UTF-8.
commit d1d027199672f514253cbd7ddef1903fdf2c3710
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 15 15:21:57 2005 +0000
* Check for w3m.
commit 7f384d9c1b4699af2e2ea71c644d6e9bd72be581
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 15 15:21:35 2005 +0000
* Use a proper temporary directory.
commit 896c0b92f35c61079050beec483587f10fd79ad5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 15 09:18:21 2005 +0000
* This is not a GNU project :-P
commit 5818e8eeaf91789d997cdbc1b62b4f9888354215
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 14 18:51:02 2005 +0000
* Remove dead code.
commit 025086edeaa6fc39ee8b5bc6fcad3cc64c2fd0c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 14 18:50:45 2005 +0000
* Release notes in Docbook; ASCII release notes (i.e., the `NEWS'
file) is now generated from that using `w3m' and some XSL hackery.
commit ed1db42915dc13cff9b940ae2b12ff9e38b28961
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 14 11:41:59 2005 +0000
* List concatenation must be right-associative for efficiency.
commit deb75bb414c6c7a6d1209efd86738fdd147db13d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 13 15:54:36 2005 +0000
* Remove debugging code.
commit 116e939d5731f89821a6777fb2b458508fd85e29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 13 14:07:22 2005 +0000
* More debugging.
commit 55b84357a1859f5606c655ca52b44591c986cb7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 13 13:17:14 2005 +0000
* Debugging.
commit cf2bb91ec8abd866ff69cb1d20b3549381bd4577
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 13 13:17:01 2005 +0000
* Missing #include.
commit 699073c337d022aa32eac6e840035dbd324d5120
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 13 10:57:24 2005 +0000
* Release notes.
commit cb44aa03b85c3622b3ffe5879e73f46ce78ffba0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 1 20:48:18 2005 +0000
* Use aterm 2.4.
commit 2bcd65ecf6a8505ade08aa39efe41a0361eaf84a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 1 18:14:04 2005 +0000
* `nix-env -e' corrupts memory due to incorrect use of iterators.
Reported by Rob Vermaas.
commit e1a6fb787059848c815a8154da23b7da794c6231
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Aug 14 14:00:39 2005 +0000
* `dependencyClosure' now allows a search path, e.g.,
dependencyClosure { ... searchPath = [ ../foo ../bar ]; ... }
* Primop `dirOf' to return the directory part of a path (e.g., dirOf
/a/b/c == /a/b).
* Primop `relativise' (according to Webster that's a real word!) that
given paths A and B returns a string representing path B relative
path to A; e.g., relativise /a/b/c a/b/x/y => "../x/y".
commit 08c53923dba9c7fe6c2676be862744dc1f90f660
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Aug 14 12:38:47 2005 +0000
* A primitive operation `dependencyClosure' to do automatic dependency
determination (e.g., finding the header files dependencies of a C
file) in Nix low-level builds automatically.
For instance, in the function `compileC' in make/lib/default.nix, we
find the header file dependencies of C file `main' as follows:
localIncludes =
dependencyClosure {
scanner = file:
import (findIncludes {
inherit file;
});
startSet = [main];
};
The function works by "growing" the set of dependencies, starting
with the set `startSet', and calling the function `scanner' for each
file to get its dependencies (which should yield a list of strings
representing relative paths). For instance, when `scanner' is
called on a file `foo.c' that includes the line
#include "../bar/fnord.h"
then `scanner' should yield ["../bar/fnord.h"]. This list of
dependencies is absolutised relative to the including file and added
to the set of dependencies. The process continues until no more
dependencies are found (hence its a closure).
`dependencyClosure' yields a list that contains in alternation a
dependency, and its relative path to the directory of the start
file, e.g.,
[ /bla/bla/foo.c
"foo.c"
/bla/bar/fnord.h
"../bar/fnord.h"
]
These relative paths are necessary for the builder that compiles
foo.c to reconstruct the relative directory structure expected by
foo.c.
The advantage of `dependencyClosure' over the old approach (using
the impure `__currentTime') is that it's completely pure, and more
efficient because it only rescans for dependencies (i.e., by
building the derivations yielded by `scanner') if sources have
actually changed. The old approach rescanned every time.
commit 714b7256cd5a6783813c3d3a7468f36ba637f567
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Aug 14 10:19:55 2005 +0000
* Cleanup; sync with thesis.
commit 039936567539c1d6d7a3b824b94726b3fed3343b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Aug 14 10:09:56 2005 +0000
* nix-hash: option `--truncate' to truncate the hash to 160 bits. Hmm,
kind of ad hoc ;-)
commit 2fd22c63600a3c91d25316b566fc00aa2415bfee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 1 13:39:56 2005 +0000
* Add .libs to svn:ignore. Commit 3500 ;-)
commit c680f835c9bf3e357fbe6c655b721da68946c90a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 1 13:39:19 2005 +0000
* Escape ASCII characters < 32 to Unicode FFFD (REPLACEMENT CHARACTER)
so that we don't produce un-wellformed XML.
commit f450c8ea2f0917f3a8df77d8c849eed713f96cbd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 1 13:24:04 2005 +0000
* Oops. XSL stylesheet to mark errors.
commit 800a6ff845ff951ff54a43fd4098b2e505f6eb02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 1 13:23:43 2005 +0000
* Mark error lines in red, and expand subtrees containing errors
automatically.
commit 78c72bf10eee4db5f2eb3f7caba8f46e5be51a0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 1 07:30:35 2005 +0000
* channels -> channels-v3, catamaran -> nix.cs.uu.nl.
commit 991a130b1e71b3b849b3640264f8834d6e13da22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 25 15:05:34 2005 +0000
* Added a list concatenation operator:
[1 2 3] ++ [4 5 6] => [1 2 3 4 5 6]
commit e6899794ae9ce3924b818721d5caff463bccd60c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 25 10:10:24 2005 +0000
* Add $prefix/lib to the RPM.
commit 33efb52e022a815d88f79e31edd5209837cbee3c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 25 07:25:18 2005 +0000
* Hack to get around the libtool wrapper script around nix-store not
working when PATH is unset.
commit 3fae65d4ccea78eeb0aef5acb4b613a0547a4c6d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 22 20:37:39 2005 +0000
* Adhockery.
commit 4c20a0829304631cf7282937bd6a0789701f40a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 22 14:52:45 2005 +0000
* Build dynamic libraries.
commit 1a67154d416d3408ac35ddb5a197d1b76f57aab8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 19 12:00:38 2005 +0000
* Release notes.
commit 0f827cc6076ae3c395537a0c9bd806b0d42947c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 19 11:48:05 2005 +0000
* Prevent repeated wrapping of closed terms
(closed(closed(closed(...)))) since this reduces performance by
producing bigger terms and killing caching (which incidentally also
prevents useful infinite recursion detection).
commit 2135e7c0417b366b4161d01ebf794d25e96b61ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 16 23:19:20 2005 +0000
* Wat cleanups.
commit 6f82a78de7ac02ec5665f17248c4fe98bd4f5847
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 16 21:38:15 2005 +0000
* Define paths using regexps, as is done in the Flex definition.
commit 6f91f02f757f069b939b09eed51ff95de850b2c9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 16 20:43:58 2005 +0000
* Make the rejects a bit more compact.
* Add lexical restrictions for keywords.
commit 9590009a74a99100f6718f108098c066e4a0204f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 16 15:41:27 2005 +0000
* Fix ambiguity.
commit f797cb5855d149c679525f55b1558a5dcc27d996
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 16 14:07:35 2005 +0000
* Revive and update the SDF grammar for Nix expressions.
commit a5ceb5bc0b2d7fd796cb49e29d45bf568dc0df2f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 13 17:39:10 2005 +0000
* nix-build: default to `./default.nix' if no paths are specified.
So when using Nix as a build tool, you can just say `nix-build' and
it will build the top-level derivation defined in `default.nix'.
commit d4879b4dfe05708eb174129141299fb343ceb946
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 12 16:08:10 2005 +0000
* Add curl to the RPM dependencies. Should fix NIX-11.
commit 22d3587f3b850e8fc34add4d8e62911c6598ad78
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 12 16:06:25 2005 +0000
* In nix-instantiate, at top-level, call functions that have arguments
with default values automatically. I.e., e -> e {}.
This feature makes convenience expressions such as
pkgs/system/i686-linux.nix in Nixpkgs obsolete, since we can just do
$ nix-instantiate ./pkgs/system/all-packages.nix
since all-packages.nix takes a single argument (system) that has a
default value (__thisSystem).
commit 928a7c06dc830455c246e1ccb8fd980c882b1637
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jun 18 14:20:24 2005 +0000
* Don't create patches for archives >= 150 MB because bsdiff can't
handle it. It crashed on the 234 MB tetex archive. Probably we
will never be able to handle archives of that size on 32-bit
machines (because bsdiff does everything in memory requiring
max(17*n,9*n+m)+O(1) bytes, so the address space simply isn't
there).
commit 040140dd1c3c11e3aa1ca486c3f3596cbe99c008
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 18 17:19:21 2005 +0000
* Added a primop `removeAttrs' to remove attributes from a set, e.g.,
`removeAttrs attrs ["x", "y"]' returns the set `attrs' with the
attributes named `x' and `y' removed. It is not an error for the
named attributes to be missing from the input set.
commit 109cde670629a0f022de1d875b55bb2f5243b271
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 10 14:56:10 2005 +0000
* Ignore (with a warning) invalid garbage collector roots.
commit c09e47c68f6d32d78df482929295ac0acaf6b387
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 10 14:43:17 2005 +0000
* Some svn:ignores.
commit 8be1db899ec3b2e6270da06421e2c055f874c3b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 10 14:24:48 2005 +0000
* Another typo.
commit cbc8d083acce04a1be6bce23f97956c4c87bbcda
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 10 14:22:36 2005 +0000
* Make unpacking of patch sequences much faster by not doing redundant
unpacking and repacking of intermediate paths.
commit 456f3251d2af6e7f4e21f317e217c035d9d6f967
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 10 14:21:46 2005 +0000
* Typo.
commit 9ec7e58aa44d413df071a07aae45e4c32b331274
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 9 17:55:35 2005 +0000
* Handle store path arguments in `nix-env -i' correctly again.
commit bfe4875a5e1058462345cd791061a332e510e033
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 9 15:30:13 2005 +0000
* Use Berkeley DB 4.3.38.
commit 8f57634c1457ced226942024c31e8c3759b1655b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 9 15:25:47 2005 +0000
* Automatically upgrade the Berkeley DB environment if necessary.
commit 88dea78cdfbbf584d8d1de51a7660654de464530
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 9 09:58:00 2005 +0000
* Crazy: don't use real hashes of real components in examples, since
they cause Nix builds to have unnecessary retained dependences
(e.g., on Subversion).
commit edd145d2fb2960fab414bfe2c4a1221b976815ea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 8 10:32:09 2005 +0000
* Lazily compute the derivation and output paths of derivations. This
makes most query and installation operations much faster (e.g.,
`nix-env -qa' on the current Nixpkgs is about 10 times faster).
commit 426593162ee4b22443dfca428083047ca1e39ac7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 8 10:28:19 2005 +0000
* ATermMap needs an assignment operator, otherwise we are screwed.
commit 77557a6f06500e0a464f54c7b4b4f5162d0359bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat May 7 21:48:49 2005 +0000
Commit 3000!
* Make the `derivation' primitive much more lazy. The expression
`derivation attrs' now evaluates to (essentially)
attrs // {
type = "derivation";
outPath = derivation! attrs;
drvPath = derivation! attrs;
}
where `derivation!' is a primop that does the actual derivation
instantiation (i.e., it does what `derivation' used to do). The
advantage is that it allows commands such as `nix-env -qa' and
`nix-env -i' to be much faster since they no longer need to
instantiate all derivations, just the `name' attribute. (However,
`nix-env' doesn't yet take advantage of this since it still always
evaluates the `outPath' and `drvPath' attributes).
Also, this allows derivations to cyclically reference each other,
for example,
webServer = derivation {
...
hostName = "svn.cs.uu.nl";
services = [svnService];
};
svnService = derivation {
...
hostName = webServer.hostName;
};
Previously, this would yield a black hole (infinite recursion).
commit 6057b51835596ed282a2ad11f6f6fb8bdec13f7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat May 7 21:33:31 2005 +0000
* Don't try to register GC roots in read-only mode.
commit 6c88d67780c1f009f6ffce46d95f5195c82790f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat May 7 15:45:38 2005 +0000
* Build .tar.bz2 files in `make dist'.
commit d8cda7c3dc8e0fa38694ccdd8b93786ffad72deb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 6 14:43:14 2005 +0000
* Mac OS X (and POSIX) doesn't have readlink.
commit 52a2f41320d1fe35ceccaef35db9fd661f8bffb6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:33:20 2005 +0000
* Include some required header files.
commit 26fd28432d61a88dcef5f3f79657c2caa9461a78
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:32:54 2005 +0000
* FreeBSD 4.x doesn't have stdint.h, use inttypes.h instead (which is
also part of ISO C).
commit 5dea0622d1d673bf60f47781c33f343ce9979a7f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:31:49 2005 +0000
* Idem (constness fix).
* `compare' in GCC 2.95 is broken.
commit 4a266e35d4c756af6163a314585e55ecb65a4c0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:31:24 2005 +0000
* GCC 2.95 compatibility fix in constness; strangely, I think this
should not have worked at all.
commit d7b3cdbd9142ed702a98ebb6a3f6759410d27773
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:30:35 2005 +0000
* GCC 2.95 compatibility. Prevents internal compiler error in member
template friends.
commit ae6d9033a1c6b0b863b94c239c35a2df1a58948a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:29:44 2005 +0000
* The eof() state isn't guaranteed to be set non-lazily. GCC 2.95
compatibility fix.
commit d8a31da1ea418de9c1fb7968b95d74d700a7a54f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 4 16:28:39 2005 +0000
* Use `$(MAKE)' instead of `make' for systems where `make' isn't GNU
make (such as FreeBSD).
commit 36fb29f8f0317144a0074d7b6689912a4dc40325
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 2 15:25:28 2005 +0000
* Merge remaining stuff from the nix-make branch.
* Add support for the creation of shared libraries to `compileC',
`link', and `makeLibrary'.
* Enable the ATerm library to be made into a shared library.
commit 02f2da01426b338c75051397dcbdcb0c75913670
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 2 14:44:58 2005 +0000
* Merging from nix-make branch:
- Add __currentTime primitive (dangerous!).
- Allow imports of derivations.
commit 6842bc9ac4fda9e4ef6b7e71d23b5050357bc1cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 1 09:36:28 2005 +0000
* Be quiet when untarring a channel file.
commit f913283570aabb2e968a4f6bd06f74c03a5d772c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 13 09:20:27 2005 +0000
* Remove redundant message.
commit 9f3601a36cbc4a3c322f48c5ec3487df441105bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 12 10:51:38 2005 +0000
* Argh! The patch downloader was broken due to the renaming of the
`--isvalid' flag in nix-store.
commit f3660b1c8cba8e701689c82fc3fcaf3a3b8283da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 12 10:51:00 2005 +0000
* Garbage collector fix: allow deletion of paths that have invalid
(but substitutable) referers.
commit d5219a351af4429ce0ca339940b7ae81717df4a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 12 10:07:02 2005 +0000
* Damn. Disable the USE heuristic for now, since the deriver in the
database isn't always in the manifest (so the reference graph cannot
be reconstructed fully).
commit 1d86790910c204f074626916e8d17508d8d633be
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 13:04:54 2005 +0000
* Bump the version number to 0.9.
commit bc5e26dcda9e264bf8d873e30a3ad530003a0d7b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 11:34:49 2005 +0000
* Mark date.
commit cab7816b56f75dab579c75f8178e7dd20773b1a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 11 08:07:41 2005 +0000
* Slightly nicer message.
commit 82d771f6e66e3f8a7101574d9c606553b490fe71
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Apr 10 20:54:21 2005 +0000
* Manual updates.
commit c9c58dba55fc9e46375bb67fdc9e2b55ef3805ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Apr 10 17:38:19 2005 +0000
* Primop `__currentSystem' to return the current platform identifier.
commit b4b51c9f933055e416505e54e446cc27f5f27f56
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Apr 9 19:31:12 2005 +0000
* NEWS.
commit fb45b0f5482546b98c984fb9fa753332ba84f72d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Apr 9 17:16:00 2005 +0000
* Document nix-channel.
commit c702dfca3f5a437866faf190ce7b0869fd1058cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 8 13:48:41 2005 +0000
* nix-store: `--substitute' -> `--register-substitutes'.
commit 8b70f138e02d62214715f144b133bf1b981911df
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 8 13:00:38 2005 +0000
* Lots of manual updates, in particular the new `nix-store --query'
options were documented, as well as the Nix configuration file.
commit 4271385a73d5e073ddfa7e4a75ab0ae5bef50439
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 8 12:57:16 2005 +0000
* Make `nix-store --query --tree' work on non-derivations (i.e., on
any store path).
commit 90905634edbbf55447f2eebd84524e556b3f0750
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 8 09:28:50 2005 +0000
* Doh.
commit b9d8ecbc6a76779d0c63729a21628965cafcc4cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 15:51:27 2005 +0000
* More doc updates.
commit 7d876f8fa7b6c3ce120a66b59f69b70ae526538b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 14:35:44 2005 +0000
* Get rid of fetchurl, we don't need it anymore.
commit 10c429c757625c4c36319751f6d87b8990677c1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 14:35:01 2005 +0000
* If store paths are specified as sources in Nix expressions, don't
copy them, but use them directly.
commit f9848d4f3122b8a43b69d53277b606806bdba9dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 14:33:32 2005 +0000
* Support base-32 hash representations.
commit c815aff21b668f5fe7bbd04086a988df51281840
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 14:01:51 2005 +0000
* `nix-store --add-fixed' to preload the outputs of fixed-output
derivations. This is mostly to simplify the implementation of
nix-prefetch-{url, svn}, which now work properly in setuid
installations.
* Enforce valid store names in `nix-store --add / --add-fixed'.
commit 57d023a184bdc2f30cd7052c157e43ba1bca8288
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 10:47:58 2005 +0000
* More manual updates.
commit f1ae10b992cf8b3b5f13c5bf69f264872c0a4f4f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 09:36:35 2005 +0000
* Build hook documentation.
* nix-store options.
commit 806b91f1040d75ca5331445272ecc46adac1c9ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 7 08:17:04 2005 +0000
* GC docs.
commit 128c174295680097b28d5f578873ded2696caf40
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 5 15:28:30 2005 +0000
* Manual updates.
commit 229252941aeef2bf2292bf3bb47aa477727d03f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 5 11:30:56 2005 +0000
* Some GC documentation.
commit 6c8cf567b824ddb267578ce0105d374cae755420
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 5 11:29:46 2005 +0000
* Use `--nonet' flag.
commit 31e140d70be780d410e697c0ed12b6d84da2cd04
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 4 15:18:19 2005 +0000
* I said it couldn't be done. I was wrong.
commit 4a83c12c5db250ca0946497420d3e5cac1fbcd57
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 1 15:34:23 2005 +0000
* Added a glossary to the manual.
commit 6f788880b692834655c8679ed58e9131ca2fdfa1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 26 22:06:57 2005 +0000
* Re-enable dot graph generation.
commit 298dd487bb7bc0e0f4f12a3df91906263e506db4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 25 14:31:12 2005 +0000
* When finding live paths, the deriver need not be valid.
commit ebe342c9c14a06bdc90096847529e744265fae3a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 25 14:30:01 2005 +0000
* Better error checking.
commit 7eaf0387639b3108f2351c513801b0d4e0b18be4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 25 14:21:49 2005 +0000
* `nix-store --verify': repair bad referer mappings.
commit c6178f0b038097584cbbac970ebdb3772de27763
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 24 17:46:38 2005 +0000
* Create missing log and temproots directories automatically (reported
by Rob).
commit d1487d9015222c33680c7727c31e3b499c620610
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 24 14:07:02 2005 +0000
* This is a better location to keep the blacklist, since it can evolve
separately from Nix or Nixpkgs.
commit 009752ca70f2db7775d279d46dd7cf1b127fad88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 24 13:44:47 2005 +0000
* Blacklist Firefox 1.0.1.
commit cff6bc06df81d325b0c99c98cb28ab54b8d8c597
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 23 19:18:22 2005 +0000
* Fix endianness bug.
commit 590e5a0d654c2ba85839978eb4ee69e5a4678e6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 23 17:13:42 2005 +0000
* Add a test for base-32 encoding of hashes since it seems to be
broken on Mac OS X.
commit 0df9f08078e0588b3bb699465263aa3b80deb771
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 23 13:16:36 2005 +0000
* Export the references graph to the build hook.
commit 3f236f01ae7e9abe58a591071698a9a9840af7c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 23 13:07:28 2005 +0000
* `nix-store --register-validity': allow a path to refer to a path
listed later in the list of new valid paths.
commit a04c62e0c4f0f8d3bd9cda21173a0193be9eda8a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 23 12:06:57 2005 +0000
* Canonicalise path meta-data in `nix-store --register-validity'.
commit f20f08156031f04a60025bc7a41dd3fcc117baa7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 23 11:25:20 2005 +0000
* nix-store: `--isvalid' -> `--check-validity', `--validpath' ->
`--register-validity'.
* `nix-store --register-validity': read arguments from stdin, and
allow the references and deriver to be set.
commit a1e00bf6aa8eb581ff4d47a6287800cf224c6a41
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 21 16:28:58 2005 +0000
* Remove non-POSIX flag.
commit ab75a50ba43a2e8c82eb85142134b27a2d7ed0eb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 21 10:06:11 2005 +0000
* Fink compatibility.
commit 7272c3f8178b6509e6d949b1e7538bbde49de58a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 18 09:43:25 2005 +0000
* Ignore hash conflicts in gc-releases.pl.
commit 67eff20906899e315a6fbbaab02f18326ac5afb8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 17 10:30:53 2005 +0000
* Manual updates.
commit ad3121a52dacba417387df543df573816cd15b55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 16 16:45:29 2005 +0000
* Documented common environment variables.
commit f982df3cd766072fdb9d36ba6501eaa246381092
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 16 14:40:48 2005 +0000
* Update the user environments figure to show multiple profiles and
users.
* Change to base-32 hashes.
commit afc3a7b79be9f7aa3dea83633cd1c7c64b484beb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 16 10:46:33 2005 +0000
* Automake 1.9 compatibility.
commit 693ff4f6bff7c2f2f708d908dcbf52fc402c62ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 15:42:11 2005 +0000
* Some more updates.
commit 62dbfbc45bd4e58b88ae21c21b80db16b257711a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 14:38:22 2005 +0000
* Remove Docbook EBNF dependency.
commit e30133469665d02588118594d4db8b6148249cd7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 13:55:41 2005 +0000
* XInclude all the way.
commit b376565b86717c4da2bdea5ee0bc73978ff9bc78
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 13:21:32 2005 +0000
* Manual updates.
commit bacd3a6cfa3af1879ef01e693178c74839d66f70
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 12:03:15 2005 +0000
* Purify all corepkgs builders.
commit e52ae1c0ffed6af893438cb456c5c38a272c8b21
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 15 11:12:48 2005 +0000
* Use SHA-256 for nix-push.
commit 155c91b335c4041db5c9e83b8314757bdf7137b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 18:56:02 2005 +0000
* Upgrade information.
commit 5675d5f48819b84e297d3577d6e9b1694f9b6192
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 18:55:46 2005 +0000
* Idem.
commit 6fb5f7e532bf43ecf02004a4010496e9f98d09bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 18:55:29 2005 +0000
* Pass `--base32' unless using MD5.
commit c757d16c8c180bc8a7d74494a2fc92aee7993631
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 18:54:40 2005 +0000
* Bug in clearSubstitutes().
commit bb2e53699fb413d5808ee285d2194a33006a19b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 17:05:42 2005 +0000
* Parse new hash format properly.
commit 5863f2472233ac3991bbd5e659b990f662b340d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 17:05:20 2005 +0000
* Print SHA-1 hashes in base-32 by default.
commit bd333b939cc2fd2006466507ffc78976f85323b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 16:46:19 2005 +0000
* Prefix hash algorithm in patch generator too.
commit 8eff18cd4321f6282e3880da09010ccc9242962e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 15:09:53 2005 +0000
* Set NAR name to content hash; previous nix-push names were not
unique.
* Drop `hashAlgo' attribute in manifests; prefix hashes with the hash
algorithm instead.
commit 1562dfe9bad119e58296f35c1982fc539a97ac30
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 14 14:03:41 2005 +0000
* Script to garbage collect nix-push directories. It prints out all
file names in the directory not included in any of the manifests
specified on the command line.
commit 012b812698e9b2d8cdb43ffd41e46cc160256d77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 11 18:35:58 2005 +0000
* Preliminary NEWS for 0.8.
commit 536f3241775c21566d68a0581c78154a908da35f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 11 15:27:37 2005 +0000
* nix-install-package: install outPath, not drvPath, for now.
* nix-prefecth-url: print out in base-16.
commit 08df4436182a12a25aa45fcab2a13dbe71f7f10a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 10 11:33:46 2005 +0000
* Check for duplicate attributes and formal parameters in Nix
expressions.
commit 97c93526da4dfba1b92a11fb8522c07456d9e1ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 7 16:26:05 2005 +0000
* In the checker, do traversals of the dependency graph explicitly. A
conditional expression in the blacklist can specify when to
continue/stop a traversal. For example, in
<condition>
<within>
<traverse>
<not><hasAttr name='outputHash' value='.+' /></not>
</traverse>
<hasAttr name='outputHash' value='ef1cb003448b4a53517b8f25adb12452' />
</within>
</condition>
we traverse the dependency graph, not following the dependencies of
`fetchurl' derivations (as indicated by the presence of an
`outputHash' attribute - this is a bit ugly). The resulting set of
paths is scanned for a fetch of a file with the given hash, in this
case, the hash of zlib-1.2.1.tar.gz (which has a security bug). The
intent is that a dependency on zlib is not a problem if it is in a
`fetchurl' derivation, since that's build-time only. (Other
build-time uses of zlib *might* be a problem, e.g., static linking.)
commit bfbc55cbc6b72aa14805131553c6b2547d3b6ee7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 7 14:54:52 2005 +0000
* Use XML::LibXML.
commit 543d7a41dcb76406e433fde7f5e26c61ac65cc3c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 7 13:27:56 2005 +0000
* Automatically add propagated build inputs to user environments.
Maybe this is a bad idea.
commit 9a7f95882c5e32ad5c41799016f749964221cad4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 4 11:12:48 2005 +0000
* Basic blacklist checker. Each element in a user environment is
checked against every item in a blacklist.
commit 4bbdcfbb45112fc3b025f0feff7b995ee373b091
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 3 13:58:02 2005 +0000
* Don't use fork() in copyPath(), but a string buffer.
commit 9e6bca876518fbcd32c67d72721310f6b60f6f75
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 3 13:10:52 2005 +0000
* Channel fix.
commit 86cb3cc55468a9e83e3646acedfaedb6a0253b05
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 3 13:10:44 2005 +0000
* Increase Berkeley DB limits a bit more.
* Maintain the cleanup invariant in clearSubstitutes().
commit 0107fba48e9466855af2ed8fc84edfec2e0de1ee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 2 15:57:35 2005 +0000
* Concept for a simple blacklist.
commit 07b4399fb6f04d0cae58b8cf0a13efeeaf9d590b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 2 15:57:06 2005 +0000
* `nix-store -q --hash' to quickly query the hash of the contents of a
store path (which is stored in the database).
commit 9e50e648a47c1ef3b734bf12945c8b29a8c8f9f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 1 11:27:38 2005 +0000
* Doh!
commit 8d364e5baa53060fb039d8d30f96520781625efe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 1 11:27:22 2005 +0000
* Add missing file to dist.
commit db322a47ffb17be3f75ea864e0732d8f948aaf19
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 1 10:33:55 2005 +0000
* Use a weighted use heuristic to disambiguate between multiple
occurances of a component. If the shortest path distance between a
component P and Q in the referers graph is D, then the contribution
of Q to the use of P is 1 / R^D, where R >= 1, typically 2. This
expresses that distant indirect uses are less important than nearby
uses.
For instance, this can disambiguate between the bootstrap GCC in
Nixpkgs and the GCC of the final stdenv (the former has more uses,
but they are further away), and between the GCC of the final stdenv
and the GCC+G77 build (the latter has very few uses).
commit 2c4302dd7a437c3153d6de704fb5ddec004ea308
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 28 14:12:06 2005 +0000
* Added a disambiguation heuristic: if two components have the same
name but differ to much in sice (by more than a factor of 3), then
never generate a patch.
commit 8376fff1518415a0d48b34e91298c846b0ab6b95
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 25 16:12:52 2005 +0000
* Add a version number to manifests.
commit 8d3c346559a2528e4606d8a5b61c8a4d5457697d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 25 15:58:00 2005 +0000
* Pause if errors occur.
commit 6bafeafb884d72ac920ec667eeea143309ed64b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 25 15:42:52 2005 +0000
* nix-install-package: Use the new (trivial) package format generated
by the build farm. See e.g.,
http://catamaran.labs.cs.uu.nl/dist/nixpkgs-0.8/nixpkgs-0.7pre2302/;
the user can click on packages, and they will be installed (assuming
the `application/nix-package' MIME type has been associated with
`nix-install-package').
Nix expressions are no longer involved: a "package" is just a
pointer to a manifest, and the top-level store derivation to be
added to the user environment. This makes these packages
independent from Nix expression evolution.
Note that we install the store derivation ($drvPath), not the
resulting output path ($outPath). This is equivalent, except that
installing the derivation maintains the back-link from the output
path to the derivation that built it. This is useful for
maintenance.
* Automatically re-exec in an xterm so that the user sees something
when `nix-install-package' is run from a browser.
commit 3259ae58119b93ca48a267ec90d7e1efb929fef8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 24 17:36:42 2005 +0000
* Properly specify the hash algorithm in the manifests, and read it
too.
* Change the default hash for nix-prefetch-url back to md5, since
that's what we use in Nixpkgs (for now; a birthday attack is rather
unlikely there).
commit 95e870a113e98bf23222535d842e525021a15f10
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 24 14:06:18 2005 +0000
* (Unnecessary) refactoring.
commit bfaf83a0fd19cec3354a0d957ae5c58040f75c56
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 23 11:19:27 2005 +0000
* When multiple derivations are specified in `nix-store -r', don't
continue building when one fails unless `--keep-going' is
specified.
* When `--keep-going' is specified, print out the set of failing
derivations at the end (otherwise it can be hard to find out which
failed).
commit 3a2c3f0cf265075b130d9d2a25b9c8334c560b33
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 22 21:14:41 2005 +0000
* Support for fixed-output hashes over directory trees (i.e., over the
NAR dump of the path).
commit eda2c3c2537562e3b18c02a47b19e47ba3d37598
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 22 15:23:24 2005 +0000
* Compatibility hack so that Nixpkgs can continue to do hash checking
in `fetchurl' in Nix <= 0.7, but doesn't in Nix 0.8.
commit 3c1630131e26efc90164bd8ca57870d9c4ad402b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 18 09:50:20 2005 +0000
* Subtle bug in the builder: if a subgoal that is instantiated
multiple times is also a top-level goal, then the second and later
instantiations would never be created because there would be a
stable pointer to the first one that would keep it alive in the
WeakGoalMap.
* Some tracing code for debugging this kind of problem.
commit 398463a72adf95b29bd86ba2ea66a08ed4e49541
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 18 08:40:52 2005 +0000
* `make check' fix.
commit e0181f56be2384b4ed93c0cacd5b2bbd13795dba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 15:57:46 2005 +0000
* `nix-store -q --tree' shows a tree representing the dependency graph
of the given derivation. Useful for getting a quick overview of how
something was built. E.g., to find out how the `baffle' program in
your user environment was built, you can do
$ nix-store -q --tree $(nix-store -qd $(which baffle))
Tree nesting depth is minimised (?) by topologically sorting paths
under the relation A < B iff A \in closure(B).
commit 74ab0695b5bec5c7239744a89df5b2a7112e916b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 15:48:50 2005 +0000
* Compatibility hack with older user environments.
commit 8a3a96dd5b009d337c0cd12b58a41c943d0aa516
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 13:55:18 2005 +0000
* Switch to the calling user context for some more operations in a
setuid installation.
commit 88273f9574fc137301b6a65669eb20f18d7a3b61
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 13:54:45 2005 +0000
* Put build logs in $prefix/var/nix/log/drvs/.
commit fb5dae8694acbabab68aaccbc64796719fcb7b02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 17 10:06:12 2005 +0000
* Fix nix-channel.
* Add `--help' flag; fixes NIX-5.
* Add `--remove' flag; fixes NIX-6.
* Add `--list' flag.
commit 202d5bbda578fcc8ff564c107f5f9dcfd5b1bc2b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 15 12:05:47 2005 +0000
* Compatibility with older GCCs.
commit e17910cfb5ddeca2c136bc0a951318beea2e8a13
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 15 10:49:31 2005 +0000
* And yet another installation source: the ability to copy user
environment elements from one user environment to another, e.g.,
$ nix-env -i --from-profile /nix/var/nix/profiles/other-profile aterm
copies the `aterm' component installed in the `other-profile' to the
user's current profile.
commit 0083562f759223f3ef7ace4f269137cf68bf1295
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 15 09:39:12 2005 +0000
* Fix broken GC test.
commit 8992fce3da844e3cfc7cbc563cbf5313980c16dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 17:35:10 2005 +0000
* It is now possible to add store derivations or paths directly to a
user environment, e.g.,
$ nix-env -i /nix/store/z58v41v21xd3ywrqk1vmvdwlagjx7f10-aterm-2.3.1.drv
or
$ nix-env -i /nix/store/hsyj5pbn0d9iz7q0aj0fga7cpaadvp1l-aterm-2.3.1
This is useful because it allows Nix expressions to be bypassed
entirely. For instance, if only a nix-pull manifest is provided,
plus the top-level path of some component, it can be installed
without having to supply the Nix expression (e.g., for obfuscation,
or to be independent of Nix expression language changes or context
dependencies).
commit e446d342b77e0babb200afd6b6275df2c70cfaee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 17:07:43 2005 +0000
* Added an installation source `--from-expression' (or `-E') to
install derivations from a Nix expression specified on the command
line. This is particularly useful for disambiguation if there are
multiple derivations with the same name. For instance, in Nixpkgs,
to install the Firefox wrapper rather than the plain Firefox
component:
$ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper'
The Nix expressions should be functions to which the default Nix
expression (in this case, `i686-linux.nix') is passed, hence `x:
...'.
This might also be a nice way to deal with high-level (user-level)
variability, e.g.,
$ nix-env -f ./server.nix -i -E 'x: x {port = 8080; ssl = false;}'
commit 0cb016c209a6cbfc57a93a3f353a556924d31b50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 16:16:02 2005 +0000
* Refactoring. Hope this doesn't break the semantics of `-u' ;-)
commit a04a5de8f70e5c34be0f0f7ea3c6f2cd50d56982
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 14:16:56 2005 +0000
* Implement the `gc-keep-derivations' global configuretion flag.
commit 6a8ef36fe62c1b53572b0cf64685ece6190b22e5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 13:07:09 2005 +0000
* Global configuration option `env-keep-derivations' to store pointer
to derivations in user environments. Nice for developers (since it
prevents build-time-only dependencies from being GC'ed, in
conjunction with `gc-keep-outputs'). Turned off by default.
commit b0aba6ec2ac09d5ecdf0068b91010cdee1caae9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 10:44:57 2005 +0000
* Don't keep the derivation symlink when creating profile generations.
commit 32429142cd267196d68b6706b5d340d03c0a1dc2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 14 09:53:11 2005 +0000
* Type error in constructor call (caught by GCC 3.3, but not 3.4!).
commit 20ce2642fc0052a9f70faf194cc0c31d3f88926e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 11 16:56:45 2005 +0000
* Refactoring to support different installation sources in nix-env.
* Set the references for the user environment manifest properly.
* Don't copy the manifest (this was accidental).
* Don't store derivation paths in the manifest (maybe this should be
made optional). This cleans up the semantics of nix-env, which were
weird.
* Hash on the output paths of activated components, not on derivation
paths. This is because we don't know the derivation path of already
installed components anymore, and it allows the installation of
components by store path (skipping Nix expressions entirely).
* Query options `--out-path' and `--drv-path' to show the output and
derivation paths of components, respectively (the latter replaces
the `--expr' query).
commit 80870d9291813f265a6e078c92aa535ef0b70a47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 11 16:03:47 2005 +0000
* Input sources should be in the set of all referenceable paths too.
commit 3a99616968a7ffcc8f51bda7a781d3233aa9b428
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 14:37:24 2005 +0000
* Commit more often to prevent out-of-memory errors.
commit 98df735b5149bc1e39ce6b0bae13fbf7cebcdc05
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 12:57:13 2005 +0000
* Propagate the deriver of a path through the substitute mechanism.
* Removed some dead code (successor stuff) from nix-push.
* Updated terminology in the tests (store expr -> drv path).
* Check that the deriver is set properly in the tests.
commit 582e01c06f9ecee25a31c34562926b41dc2856eb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 9 09:50:29 2005 +0000
* Automatically upgrade <= 0.7 Nix stores to the new schema (so that
existing user environments continue to work).
* `nix-store --verify': detect incomplete closures.
commit c5474398433225e40c8868b0952aebe36da2c849
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 8 13:48:53 2005 +0000
* Subflag in `--verify': `nix-store --verify --check-contents' checks
that the contents of store paths has not changed by comparing hashes
of their current contents to the hashes stored in the database.
commit 3d74274b37a0f3b841ad860143f9c17401c3d7c4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 8 13:23:55 2005 +0000
* Updated `nix-store --verify' to the new schema.
commit 60feff82cf4dd89c9039914c5b3ef8e1b8acf8e7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 8 13:00:39 2005 +0000
* Set umask to prevent permission problems.
commit 48ebe4527e5af974832bc39f15fcd46ac740effa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 8 11:40:19 2005 +0000
* Better error reporting in readmanifest.
* Use force flag in `mv' to prevent silly interactive questions (this
happens with shared Nix stores).
commit fbc434ee4c39e7516f3634371442899864786584
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 7 14:32:44 2005 +0000
* `nix-store -qb' to query derivation environment bindings. Useful
for finding build-time dependencies (possibly after a build). E.g.,
$ nix-store -qb aterm $(nix-store -qd $(which strc))
/nix/store/jw7c7s65n1gwhxpn35j9rgcci6ilzxym-aterm-2.3.1
* Arguments to nix-store can be files within store objects, e.g.,
/nix/store/jw7c...-aterm-2.3.1/bin/baffle.
* Idem for garbage collector roots.
commit 450c358e2055488897349bf50951cce16ad9bc90
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 7 13:40:40 2005 +0000
* Maintain a database table (`derivers') that maps output paths to the
derivation that produced them.
* `nix-store -qd PATH' prints out the derivation that produced a path.
commit a37338815de6affd44f927712143f626c8e6d79d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 22:07:48 2005 +0000
* A GC setting `gc-keep-outputs' to specify whether output paths of
derivations should be kept.
commit 2e6bf723e4d63d661d26443a4477a040a96c7257
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 20:53:14 2005 +0000
* Added a global configuration file (/nix/etc/nix/nix.conf). It
contains options for the garbage collector right now, but other
stuff can be added here later.
commit 9f6835c2829310f3c58abb39002a4a580e3ae35e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 17:52:11 2005 +0000
* Remove debug code.
commit c3981d81f65eda945f7a48d10ce7600fc0419f58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 17:50:48 2005 +0000
* Make check fixes.
commit 65b6c8ab4c7832abdad46a29ce2ef18d289b2471
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 15:05:32 2005 +0000
* Move root finding from `nix-collect-garbage' to `nix-store --gc'.
This was necessary becase root finding must be done after
acquisition of the global GC lock.
This makes `nix-collect-garbage' obsolete; it is now just a wrapper
around `nix-store --gc'.
* Automatically remove stale GC roots (i.e., indirect GC roots that
point to non-existent paths).
commit 630ae0c9d7f65a2d6bef85a5194b4d704e54eded
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 13:48:46 2005 +0000
* nix-build: use an indirection scheme to make it easier for users to
get rid of GC roots. Nix-build places a symlink `result' in the
current directory. Previously, removing that symlink would not
remove the store path being linked to as a GC root. Now, the GC
root created by nix-build is actually a symlink in
`/nix/var/nix/gcroots/auto' to `result'. So if that symlink is
removed the GC root automatically becomes invalid (since it can no
longer be resolved). The root itself is not automatically removed -
the garbage collector should delete dangling roots.
commit dcc37c236c66ba463bd61fec23d046485d8a412f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 12:36:25 2005 +0000
* nix-store, nix-instantiate: added an option `--add-root' to
immediately add the result as a permanent GC root. This is the only
way to prevent a race with the garbage collector. For instance, the
old style
ln -s $(nix-store -r $(nix-instantiate foo.nix)) \
/nix/var/nix/gcroots/result
has two time windows in which the garbage collector can interfere
(by GC'ing the derivation and the output, respectively). On the
other hand,
nix-store --add-root /nix/var/nix/gcroots/result -r \
$(nix-instantiate --add-root /nix/var/nix/gcroots/drv \
foo.nix)
is safe.
* nix-build: use `--add-root' to prevent GC races.
commit a6b65fd5e107416588a6572a88518d8816abcb12
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 09:54:56 2005 +0000
* Get rid of hardcoded paths.
commit 06b44242860d62e12f9abe018c6f974ceaa30bb9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 1 09:23:38 2005 +0000
* Add missing files to dist.
* Fix GC and substitute bugs related to self-references. Add a
regression test.
commit 32fa82a56a2c4a937c91f72be16339b4ddf7cdf1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 31 22:23:49 2005 +0000
* Acquire a global GC lock to prevent new temporary root files from
being created after the garbage collector has read the temproots
directory. This blocks the creation of new processes, but the
garbage collector could periodically release the GC lock to allow
them to run.
commit 89c9bc11abc02cc746838bfef101e5fecc59a6c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 31 22:01:55 2005 +0000
* Add a test for a more subtle race: a process starting after the
temporary root files have been read but creating outputs before the
store directory has been read.
commit 207bdcbe86bac5fb9e650d26b22ae33c667151e4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 31 21:20:59 2005 +0000
* Automatically remove temporary root files.
commit 252c9c91abe146e9c6b16d795c6566df4adafe56
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 31 14:00:43 2005 +0000
* Topologically sort paths under the references relation to ensure
that they are deleted in an order that maintains the closure
invariant.
* Presence of a path in a temporary roots file does not imply that all
paths in its closure are also present, so add the closure.
commit 33c5d23b814e16687808d5f2d79798fef7dc2a8a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 31 12:19:53 2005 +0000
* Don't delete active lock files.
commit 1328aa33077fd1cf84869e366c82b8ea1d1abb5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 31 10:27:25 2005 +0000
* Start of concurrent garbage collection. Processes write temporary
roots to a per-process temporary file in /nix/var/nix/temproots
while holding a write lock on that file. The garbage collector
acquires read locks on all those files, thus blocking further
progress in other Nix processes, and reads the sets of temporary
roots.
commit a7668411a10c79ad40c9c18caf2570d5c9f52182
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 28 20:36:46 2005 +0000
* Add a test to check whether concurrent garbage collection (i.e.,
running the collector while builds are in progress) works
correctly. The test currently fails.
commit 22cfdfa2460921a282fc924cce5fb26378b9fc9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 28 13:19:16 2005 +0000
* Use NIX_STORE environment variable to locate the store (in addition
to NIX_STORE_DIR) so that Nix invocations in builders in `make
check' work correctly if the store doesn't exist.
commit 9ab0bc9395e8e9af453b649142c98242bb890ac8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 28 11:05:56 2005 +0000
* Another horrible `make check' hack.
commit 0ea8b6993a76a24afb1a1f38699d80193249fa71
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 28 11:05:46 2005 +0000
* Only invalidate paths when they are in fact valid.
commit ac2f665853331088b5b48f9edad609df9f79f78f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 19:15:12 2005 +0000
* Set execute permission.
commit a85d1849af4ce25cb283a62e4ba9e3d5ccf92c25
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 19:00:48 2005 +0000
* Missing dependency; only a problem when building from Subversion.
commit e5c16c95829f4f14763ba1f66f6e26f5f1792b29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 17:48:50 2005 +0000
* Add missing substitutes files to dist.
* Add a garbage collector test.
commit 8a3eef22e38136513370f0dfb3cf7866ec2abaa3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 17:48:14 2005 +0000
* Fix deadlock.
commit c60a4943ba913a282a35b18e725b69859270dc22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 16:18:39 2005 +0000
* Update referers mappings when updating/clearing the references
mapping.
* Do things in the right order in invalidatePath().
commit 4e37548a1ed23bc46aa803257608b6e66ee00879
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 15:31:49 2005 +0000
* Remove deleted files from EXTRA_DIST (again).
commit c505702265833a762d681952bcc72562d64a242e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 15:21:29 2005 +0000
* Fix and simplify the garbage collector (it's still not concurrent,
though). In particular it's now much easier to register a GC root.
Just place a symlink to whatever store path it is that you want to
keep in /nix/var/nix/gcroots.
commit 59682e618805701f9c249736514df6db457895f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 27 12:19:25 2005 +0000
* Make lock removal safe by signalling to blocked processes that the
lock they are waiting on has become stale (we do this by writing a
meaningless token to the unlinked file).
commit a24b78e9f1a7326badb6c38d5d63aeb6ccdf9970
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 21:28:25 2005 +0000
* Maintain the references/referers relation also for derivations.
This simplifies garbage collection and `nix-store --query
--requisites' since we no longer need to treat derivations
specially.
* Better maintaining of the invariants, e.g., setReferences() can only
be called on a valid/substitutable path.
commit 2a2756b85643de6355b7b9e3cc47574e7df82303
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 20:27:40 2005 +0000
* Simplification: registerSubstitutes -> registerSubstitute. We no
longer need the former since there we no longer have the
substitutes-rev table (which triggered a O(n^2) cost in updating
them).
commit a9340fa67222bf7ab9057d132af387031b00997d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 17:25:20 2005 +0000
* Remove removed files from EXTRA_DIST.
commit 498f4915cc9dc461b18789288063759e0aded805
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 17:24:14 2005 +0000
* Re-enable all tests.
commit 066da4ab852ebe4288536149824ea175dc36cad4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 17:08:52 2005 +0000
* Really fix the substitute mechanism, i.e., ensure the closure
invariant by registering references through the manifest.
* Added a test for nix-pull.
commit c6290e42bc8890e2036013773a98e3551352c91a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 13:00:12 2005 +0000
* Fix the `--fallback' switch.
* Fix the substitutes tests.
commit 581fc477838e9cf9e5d9657920ef63ea836050ee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 11:55:43 2005 +0000
* Fix the build hook mechanism; pass the pointer graph to the hook.
commit 52bf9b86bb79369b7f7b5b8a5726b83ee154da6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 11:18:03 2005 +0000
* In nix-store: added query `--referers-closure' that returns the
closure of the referers relation rather than the references
relation, i.e., the set of all paths that directly or indirectly
refer to the given path. Note that contrary to the references
closure this set is not fixed; it can change as paths are added to
or removed from the store.
commit 80faa2f98af8616ab89ac2af63431b887a84fb32
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 25 10:55:33 2005 +0000
* In nix-store: change `--build' back to `--realise'. Also brought
back the query flag `--force-realise'.
* Fixed some of the tests.
commit 6a0a2d559336b3a7a165fb0f87f5e70caa9d8d72
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 20 16:01:07 2005 +0000
* Terminology fixes.
commit 6bb5efadeceb8c4666c227a44113709bb47d23cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 20 15:25:01 2005 +0000
* Ensure that derivation names and sources don't end in `.drv'.
commit 05f0430de1d8eeae222a1306d4d0f7f407c8ce7d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 20 14:10:19 2005 +0000
* Another change to low-level derivations. The last one this year, I
promise :-) This allows derivations to specify on *what* output
paths of input derivations they are dependent. This helps to
prevent unnecessary downloads. For instance, a build might be
dependent on the `devel' and `lib' outputs of some library
component, but not the `docs' output.
commit 6ff48e77f6da3c523a29c254b315d83e310290b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 21:55:02 2005 +0000
* Set the Perl search path properly (reported by Roy van den Broek).
commit e0f4e587c3a5110f57fbf4e85e14fdc606b1eaf6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 16:59:56 2005 +0000
* Nix-store queries `--references' and `referers' to query the pointer
graph. That is, `nix-store --query --references PATH' shows the set
of paths referenced by PATH, and `nix-store --query --referers PATH'
shows the set of paths referencing PATH.
commit 96de272b48f8e9bdabffddb699ed4f2292d4f1d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 16:39:47 2005 +0000
* Renamed `normalise.cc' -> `build.cc', `storeexprs.cc' ->
`derivations.cc', etc.
* Store the SHA-256 content hash of store paths in the database after
they have been built/added. This is so that we can check whether
the store has been messed with (a la `rpm --verify').
* When registering path validity, verify that the closure property
holds.
commit ef5f254a55a2d6db09d3d0549ed45701558027e0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 15:02:02 2005 +0000
* `nix-store --build' now builds its arguments in parallel instead of
sequentially (within the limits set by `--jobs'). This should
greatly improve the utilisation of the build farm when doing Nixpkgs
builds.
commit 06c77bf7a861221d41b5db9fad3002f13a14ed0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 14:36:00 2005 +0000
* Change extension `.store' to `.drv'.
* Re-enable `nix-store --query --requisites'.
commit 863dcff6c5ffc163010ec1f9e6819bb9aaaadc29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 11:16:11 2005 +0000
* Started removing closure store expressions, i.e., the explicit
representation of closures as ATerms in the Nix store. Instead, the
file system pointer graph is now stored in the Nix database. This
has many advantages:
- It greatly simplifies the implementation (we can drop the notion
of `successors', and so on).
- It makes registering roots for the garbage collector much easier.
Instead of specifying the closure expression as a root, you can
simply specify the store path that must be retained as a root.
This could not be done previously, since there was no way to find
the closure store expression containing a given store path.
- Better traceability: it is now possible to query what paths are
referenced by a path, and what paths refer to a path.
commit e9762e2d10c4a837e3d75d53e3a24452f07f47ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 19 11:04:24 2005 +0000
* Support arities > 6.
commit 6d493751c331e7b695f82e9c259423efa7741f59
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 18 11:15:50 2005 +0000
* Get --readonly-mode to work again.
commit 32aac8748a1439289af6b80efe9d518e123d6cc7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 17 19:01:48 2005 +0000
* Actually check that the result of fixed-output derivations matches
the specified hash.
commit f3dc2312501358e29b70bec977fd96f626c46392
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 17 16:55:19 2005 +0000
* Removed the `id' attribute hack.
* Formalise the notion of fixed-output derivations, i.e., derivations
for which a cryptographic hash of the output is known in advance.
Changes to such derivations should not propagate upwards through the
dependency graph. Previously this was done by specifying the hash
component of the output path through the `id' attribute, but this is
insecure since you can lie about it (i.e., you can specify any hash
and then produce a completely different output). Now the
responsibility for checking the output is moved from the builder to
Nix itself.
A fixed-output derivation can be created by specifying the
`outputHash' and `outputHashAlgo' attributes, the latter taking
values `md5', `sha1', and `sha256', and the former specifying the
actual hash in hexadecimal or in base-32 (auto-detected by looking
at the length of the attribute value). MD5 is included for
compatibility but should be considered deprecated.
* Removed the `drvPath' pseudo-attribute in derivation results. It's
no longer necessary.
* Cleaned up the support for multiple output paths in derivation store
expressions. Each output now has a unique identifier (e.g., `out',
`devel', `docs'). Previously there was no way to tell output paths
apart at the store expression level.
* `nix-hash' now has a flag `--base32' to specify that the hash should
be printed in base-32 notation.
* `fetchurl' accepts parameters `sha256' and `sha1' in addition to
`md5'.
* `nix-prefetch-url' now prints out a SHA-1 hash in base-32. (TODO: a
flag to specify the hash.)
commit d58a11e019813902b6c4547ca61a127938b2cc20
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 16:04:03 2005 +0000
* Shorten SHA-256 hashes used in store path name generation to 160
bits, then encode them in a radix-32 representation (using digits
and letters except e, o, u, and t). This produces store paths like
/nix/store/4i0zb0z7f88mwghjirkz702a71dcfivn-aterm-2.3.1. The nice
thing about this is that the hash part of the file name is still 32
characters, as before with MD5.
(Of course, shortening SHA-256 to 160 bits makes it no better than
SHA-160 in theory, but hopefully it's a bit more resistant to
attacks; it's certainly a lot slower.)
commit 9530cc31700f68fd229eee69eabd2baa099f404a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 13:51:38 2005 +0000
* Start move towards SHA-256 hashes instead of MD5.
* Start cleaning up unique store path generation (they weren't always
unique; in particular the suffix ("-aterm-2.2", "-builder.sh") was
not part of the hash, therefore changes to the suffix would cause
multiple store objects with the same hash).
commit a7b94e87d7d28f763a708876cba46c8f2484b526
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 13:50:09 2005 +0000
* Missing file.
commit 9ee88bb2f2fed3bcf34eb5e5caadced2e77a85da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 13:50:00 2005 +0000
* Use absolute paths.
commit 63791eb05b236afcea510d769a8943f8be3dbc9c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 12:03:04 2005 +0000
* Add SHA-256.
* Tests for the various hashes.
commit 37b51a9aa6d5d0fb97bad0d1a27d27304da277c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 14 10:16:33 2005 +0000
* Removed some dead code.
commit 7e8961f72056f53ccf78eba0ee8c240bc2310ab8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 13 17:39:26 2005 +0000
* Added SHA-1 support. `nix-hash' now has an option `--type sha1' to
select SHA-1 hashing.
commit 73992371a3bc16b27b22e53d5f7ae600dea9cf60
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 13 15:44:44 2005 +0000
* Refactoring to support SHA-1.
commit d46b4262dc84689c3916583b91ed9fc6dafefdd6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 12 13:23:12 2005 +0000
* Bump version number to 0.8.
commit b17e7cf9794b406aa26dd2ccbe2f64c1ba981d99
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 12 10:40:59 2005 +0000
* Script to remove patches from manifests.
commit 0bc41f632b22814514b1d6784fa02454febd2fd4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 12 10:37:18 2005 +0000
* Print out less garbage.
commit 7d75616f2ca4e72db7088767e052b66de5718a80
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 12 10:27:46 2005 +0000
* NEWS and manual update for release 0.7.
commit 6af4a5a71ffee704c4760be4259d69bb7e21b870
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 5 09:58:12 2005 +0000
* Prototype store optimiser. It searched the Nix store for identical
files and hard-links them to each other to save disk space.
Currently it doesn't actually do the hard-linking, it just reports
the amount of space saved if it did.
commit a03397be4c176c142871e7337dfef7734cd508ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 4 17:38:26 2005 +0000
* Cygwin compatibility.
commit f28ea27d83741caf38b8ac7de317d13a2904f54a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 31 11:07:32 2004 +0000
* Remove old stuff.
commit c53898cb650d14f9d888e28e48496e15db00fb47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 31 11:07:12 2004 +0000
* If a patch already exists, it must still be included in the manifest.
commit 35b76a81c42df1f07f4de711eb1bcf681eac3c3a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 30 17:19:47 2004 +0000
* More instrumentation (statistics go to /nix/var/log/nix/downloads).
commit 3745cecc6a569f09a7fdb95363b2c7eeaf59b687
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 30 17:09:57 2004 +0000
* Fix handling of chained patches: don't skip patches if intermediate
paths are missing, etc.
commit 581bcb986f22e2d60f2c01b4be27f50d478df587
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 30 16:34:54 2004 +0000
* Some logging for evaluation.
commit 6270aa727d63ce4a4d27280f233a55f4c67d8285
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 29 22:17:26 2004 +0000
* Propagate patches from the source distribution to the destination
distribution insofar they are applicable.
commit 4f07ebc67e74629724c441352a58b12143383129
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 29 22:08:48 2004 +0000
* Integrated bsdiff/bspatch 4.2 (from
http://www.daemonology.net/bsdiff/bsdiff-4.2.tar.gz) into the source
tree. The license is a bit peculiar, but it does allow verbatim
copying, which is what we do here (i.e., so don't make any changes
to the sources).
commit 54d8f0858825e9ae4c8fdf54b7c2019edee05237
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 29 19:32:55 2004 +0000
* Reject patches larger than the full archives they produce.
commit 2fdb27e7f21c99174d35556575e3d25bf2bdc23e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 29 19:04:21 2004 +0000
* Atomic file replacement is good.
commit e1e9c036f9313ac6bf160dba67e694b7868f1567
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 29 18:58:15 2004 +0000
* A utility to generate patches between releases based on their
manifests.
commit 77fc1c6c5c4f662ab9b15ff09300f2a626597bc8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 29 17:29:24 2004 +0000
* Use aterm 2.3.1.
commit 9022cf9adfd3504e40d52fa2891663bf33fa2f9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 28 21:12:00 2004 +0000
* A small utility to add the Size and NarHash fields to old manifests.
commit 4bf58d53795d53331094e5cc83187602d8d37730
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 28 21:11:28 2004 +0000
* Added a function to write manifests.
commit 3d1b2101ccfd34f15b108f54a563a616cb679109
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 20 16:38:50 2004 +0000
* Place manifests in /nix/var/nix/manifests.
* Use the new patch downloader.
commit 7eed57e784068ae6e2e9bf4409639067df467cd3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 20 14:57:03 2004 +0000
* Sync with changed substitute mechanism.
* Accept the NarHash line.
* Clear substitutes in `nix-channel --update'.
commit 96c3d8a61550545549dfa31c62e68d16f4e89c0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 20 14:38:04 2004 +0000
* I love test sets.
commit 8b9697e57596aaf142799ae6bec8bb53155dba78
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 20 14:16:55 2004 +0000
* An operation `nix-store --clear-substitutes' to remove all
registered substitute mappings.
commit fa9259f5f519386b4f32ac9490bc73459773e589
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 20 13:43:32 2004 +0000
* Simplify the substitute mechanism:
- Drop the store expression. So now a substitute is just a
command-line invocation (a program name + arguments). If you
register a substitute you are responsible for registering the
expression that built it (if any) as a root of the garbage
collector.
- Drop the substitutes-rev DB table.
commit 015beb7cd04ee75d58bf09ef89816f9301cda646
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 17 13:46:07 2004 +0000
* Typo: genericBuilder -> genericBuild.
commit 4d25b0b0bb9977598802b0d9647530f7c2fde430
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 16 15:31:50 2004 +0000
* Fix nix-pull.
commit f4041cc175df8bc3fa5810948cc2a33eb1159a06
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 16 14:59:05 2004 +0000
* Commit old changed to bdiff.sh - but bdiff.sh is obsolete.
commit 77970f8dafb540a598fd90ad360c42fbea36bf30
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Dec 16 14:31:49 2004 +0000
* Remove `prebuilts.conf' file, it's not like anybody was using it.
* Add /nix/var/nix/manifests directory.
commit e3b051aeeb968528d918b6af6c1e1df0bd7de958
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 16:56:18 2004 +0000
* Include the size of the bzipped archive (necessary for computing the
cheapest download path), as well as the hash of the contents of the
path (necessary for checking patch applicability).
commit 862f4c154e883611ba9dfefe921c87e6423075ea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 13:47:38 2004 +0000
* Patch deployment. `download.pl' (intended to be used in the
substitute mechanism) creates a store path by downloading full NAR
archives and/or patches specified in the available manifests.
Any combination of present paths, full downloads, and patches can be
used to construct the target path. In particular, patches can be
chained in sequence; and full NAR archives of the target path can be
omitted (i.e., patch-only deployment is possible). A shortest path
algorithm is used to find the smallest set of files to be downloaded
(the edge weights are currently file sizes, but one can imagine
taking the network speed to the various source into account).
Patches are binary deltas between two store paths. To be precise,
they are the output of the `bsdiff' program applied to the NAR
archives obtained by dumping (`nix-store --dump') the two store
paths. The advantage of diff'ing NAR archives (and not, say, doing
file-by-file diffs) is that file renames/moves are handled
automatically. The disadvantage is that we cannot optimise creation
of unchanged files (by hard-linking).
commit dca48aed349375b8515a32ac58dce48f48f7264e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 13 13:35:36 2004 +0000
* Allow an optional hash to be provided. This prevents redundant
fetches.
commit 71926ee18803071e64754465faf3d57d6dc9bbda
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 21:04:28 2004 +0000
* Print out statistics comparing our performance to bzip2.
commit 13f77276d11610171bc7774406b65b6cb73d453a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 19:22:16 2004 +0000
* utime() follows symlinks, so don't change the mtime if the file is a
symlink.
commit eee6fe478e5a0275b2da382216a5b8ec24e04290
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 19:12:55 2004 +0000
* Proof-of-concept for binary patch deployment.
commit f17553a212e726abdfc96af5657968c24a829d0d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 15:30:44 2004 +0000
* Remove debug statement.
commit 4115d8d8ce29113d9cb4efe7018dfb11f8038978
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 29 15:09:29 2004 +0000
* Canonicalise metadata of all files in store paths (set the mtime to
0, set the mode to either 444 or 555, set the group to the default).
commit 5d5318c2ff57a110883a0d404f3673c76cd491b4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 14 14:00:45 2004 +0000
* Bump version number to 0.7.
commit 9f8964a0622716e68935ce7e25e860a63f609f49
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 14 10:42:16 2004 +0000
* More manual fixes.
commit 0b79a1208228298d3abda7c03153c1abec2406d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 14 00:24:57 2004 +0000
* Manual fixes.
commit 54c7a870d5b6324462ea293e3e5a8bb59c7d5ac3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 12 23:56:37 2004 +0000
* Document --delete-generations and other nix-env options.
commit c2b0d6b02ffaaa6e47eb24c3dca30beeea387aff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 12 23:22:08 2004 +0000
* Document --eval-only and --parse-only options in nix-instantiate.
commit 32c73268502e35af54953e23038018edb8ce5685
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 9 14:06:56 2004 +0000
* Typos.
commit 92ee003dc985e6f8331270068b10ca52e9cef793
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 8 15:20:52 2004 +0000
* Fix broken format string.
commit d6db574ec127757c05c24f53c71e4116caaa762b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 8 11:32:10 2004 +0000
* Check exit status of pipe elements.
commit b8aaef5e4e25daa838157c7b3a8165b633901646
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 7 22:12:16 2004 +0000
* Documented the standard environment, including the generic builder.
commit 2c3b29c5cabfafe340eda9104d34d28c2a4f2e90
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 7 20:36:45 2004 +0000
* Everything you always wanted to know about functions and derivations
but were afraid to ask.
commit ea6581b691136f8545e9ab48d9ad339ad7019333
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 7 20:36:10 2004 +0000
* Drop the grammar appendix.
commit 09e7f06818bb29c19ce395876860e57444e836c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 7 20:30:02 2004 +0000
* Put something in here.
commit 1bac7a10e64049361f4ebdb592aa07ad3dbb4c53
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 7 18:58:49 2004 +0000
* Operators, comments.
commit 55b35d6d776e6f204d446fdadf9e30ed712f0899
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 7 13:53:07 2004 +0000
* Lets, inheritance, assertions.
commit 0b1ee4802b00124e785693c84f508c4f9f3fffdd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 5 21:12:23 2004 +0000
* Typo fix.
commit 5f0300d18c41234c0edb93e04b98e3473ad8021e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 5 21:11:01 2004 +0000
* Generic builders.
commit 3e9d2038b46cc479a97f0c0e0f280b2f83b3c544
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 5 15:39:30 2004 +0000
* Start of language reference.
commit 6ca9c7f0a91a2998ecd0063ff68f01e6eca12759
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 5 13:10:08 2004 +0000
* Finished GNU Hello walkthrough.
commit 8b934694f27c309b6f39ae2dede8130dc591ed49
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 4 20:21:08 2004 +0000
* Manual: writing Nix expressions.
commit feb3ceaee034cf5783264eb9dc6bd2dd62298341
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 4 20:20:39 2004 +0000
* Better error messages.
commit cb7ccb528bbaeb30d09fbb41e57ab75d3121e1bc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 3 18:12:03 2004 +0000
* string2ATerm -> overloaded toATerm.
commit 4cbd845aa491b5cf534f8c031d285fc454933868
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 3 16:51:09 2004 +0000
* Don't propagate our CFLAGS to the ATerm library since it breaks at
-O2.
commit 5f2c5a306cf59d3b2400aba5c1be403e4b6e79c5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 2 08:25:29 2004 +0000
* chapter -> appendix.
commit 0913f5a6151cd9ef84c6cd82fcc71c55699ddacb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 1 16:21:37 2004 +0000
* Section about channels.
commit ee5dcfade2a1c5ee47313b4a971245ec6c07cfa2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 1 16:03:35 2004 +0000
* Section about garbage collection.
commit cbe8de592d747e603c8657247d280faf5eb584a3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 1 12:02:44 2004 +0000
* Profiles section.
commit b05a596d61a5e062fc07380f8e6421fcfcb37f07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 31 17:08:48 2004 +0000
* Document setuid Nix installs.
commit 0d80d237c5d817c60c420a8a7870e296f202c1b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 31 16:13:25 2004 +0000
* Add figures to `make install' / `make dist'.
commit 2aa1f4717bdf9432a75f13088ec79644be9a7d88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Oct 31 12:01:16 2004 +0000
* Fix `File exists' errors if the `result' symlink exists but is
dangling.
commit f8ac8d1ec835cf070afd62c0cef14a81e9a49302
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 29 15:26:26 2004 +0000
* Began adding build farm docs.
commit a69534fc217666d53a418605de0ebb0879cbb2f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 29 11:22:49 2004 +0000
* Drop ATmake / ATMatcher also in handling store expressions.
commit ed09821859e8e585c8479a3c3bf95e76d518d66f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 27 13:12:58 2004 +0000
* Use `atdiff' instead of `cmp' for checking test output.
* Don't use local file names in tests since they will produce
different parse trees depending on the current directory.
commit 3277c9432ab718c8b80c54b228f8d5fbf94fb033
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 27 13:00:31 2004 +0000
* Bug fix in parsing of /* ... */ comments; due to longest match
regexp there could be only one such comment per file.
commit 463e2817c55fbd5b026d7dd630541b990b82418a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 27 12:41:53 2004 +0000
* Remove ancient Fix tests.
* Add automated Nix expression language tests.
commit f09618b63a3e842adc59360c9bb4cf0ad37246ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 27 10:24:44 2004 +0000
* Turn on read-only mode in queries. This prevents redundant store I/O.
commit c7bea941b04710b4a4f1b64c1274207d355633dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 27 10:05:51 2004 +0000
* Oops, I did it again.
commit 210ab0296dc340e5dd0829e282ad02d5d36bca62
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 27 00:02:31 2004 +0000
* Add file to `make dist'.
commit c52dda95a69e02cd62d5ddac6ecf2229fe0c478f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 23:30:18 2004 +0000
* Bug: check that term is an application.
commit 5fe9222b36ad49d74c84edb04d6bc4a7d844be01
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 22:54:26 2004 +0000
* Don't use ATmake / ATmatch anymore, nor the ATMatcher class.
Instead we generate data bindings (build and match functions) for
the constructors specified in `constructors.def'. In particular
this removes the conversions between AFuns and strings, and Nix
expression evaluation now seems 3 to 4 times faster.
commit eb8284ddaa66448d369647f68cb9f89b93a187de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 17:10:09 2004 +0000
* Evaluate argument to `import'.
commit 033d7c65930c7613fa21510f03984d764fcdb7d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 17:04:55 2004 +0000
* Doh!
commit 9fa07b376dd52ee8bbcc074e59d36af3f3f2536d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 17:01:35 2004 +0000
* String/path concatenation operator (`+').
commit ee401afad81dc7759c66829372826f98268ae606
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 26 16:59:36 2004 +0000
* Mode `--parse-only' to parse the input (on stdin, `-'), and print
out the AST as an ATerm.
* Mode `--eval-only' to parse and evaluate the input, and print the
resulting normal form as an ATerm.
Neither of these modes require store/DB write permission.
commit 37d7abd69402f0e7a78d4d2f2d78996409a8563a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 25 16:54:56 2004 +0000
* New language feature: with expressions.
The expression `with E1; E2' evaluates to E2 with all bindings in
the attribute set E1 substituted. E.g.,
with {x = 123;}; x
evaluates to 123. That is, the attribute set E1 is in scope in E2.
This is particularly useful when importing files containing lots
definitions. E.g., instead of
let {
inherit (import ./foo.nix) a b c d e f;
body = ... a ... f ...;
}
we can now say
with import ./foo.nix;
... a ... f ...
I.e., we don't have to say what variables should be brought into scope.
commit f4d44a002688262d33093494a7fea1bb11b97ac9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 25 14:38:23 2004 +0000
* Allow certain operations to succeed even if we don't have write
permission to the Nix store or database. E.g., `nix-env -qa' will
work, but `nix-env -qas' won't (the latter needs DB access). The
option `--readonly-mode' forces this mode; otherwise, it's only
activated when the database cannot be opened.
commit 3ade3e7721df981614bbb2420baeb84e58085967
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 25 13:51:34 2004 +0000
* Revert r1594 - it didn't solve the problem. Instead add
svn-revision to distributions, which should fix it.
commit 2248becfd3363a5de52ef6b10edf4c2d774bfa1e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 25 12:15:50 2004 +0000
* Make sure that the prerelease version is included in `--version'.
commit 50b9caac14bff656b6705efbb09e15ba9dc22d22
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 21 09:22:16 2004 +0000
* Updated NEWS for the upcoming 0.6 release.
commit 2155c0a673ee1d72a9961ec5e4a864b7c797ec44
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 20 14:42:38 2004 +0000
* Register channels as roots of the garbage collector (in
$(localstatedir)/nix/gcroots/channels).
* In setuid installations, create gcroots/tmp and gcroots/channels
group-writable.
commit 88888160d239ed68118ba1d5f94cad0a0ca7521f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 20 14:40:54 2004 +0000
* Fix nix-prefetch-url in setuid Nix installations.
commit 99da51d4debda195d8d264b9c060fe4304359e4f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 20 14:05:48 2004 +0000
* Show error messages from curl.
commit 2cd590d96c7bfa6843384073102099b545097c93
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 18 12:22:14 2004 +0000
* Instead of — use the actual Unicode character. By the way, to
edit the manual, you should have something like
(modify-coding-system-alist 'file "\\.xml\\>" 'utf-8)
in your ~/.emacs.
commit 692204e0c5565d14fce0a62527bf2b0b91f82753
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 14 16:43:09 2004 +0000
* Rewrite of package management stuff.
commit d830b2c1df3b80a1dffec40cbea8e9af7d0e0a11
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 14 15:09:55 2004 +0000
* In `nix-env -q', sort derivations by name *without* case
sensitivity.
commit febd8bed1b341b56d58d43ebb09710504f997da9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 14 11:55:12 2004 +0000
* Split overview chapter into a chapter on package management and a
chapter on writing Nix expressions.
commit 98c69e51728d18ff528b8873ef63c87dbe430772
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 14 11:54:41 2004 +0000
* Unindent.
commit 371c57d8a7c0ee58de82f68c9dfb116cee7e00a9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 13 15:35:47 2004 +0000
* Updated the quick start section. Use channels instead of
downloading Nix expressions and calling nix-pull. This is so
user-friendly that even a Mac user can do it! :-)
commit 2b20701f7895101c8ef8c989fccf702081615120
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 13 15:08:35 2004 +0000
* Better introduction.
* Set notes in a different color than warnings.
commit 13172427806ad41fb3896c2e3ced1cf9672bb081
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 22 12:15:04 2004 +0000
* Make store objects created by substitutes read-only.
commit 995d08208eb52dfa42451733c4b20add2730de9f
Author: Niels Janssen <njanssen@cs.uu.nl>
Date: Sun Sep 19 15:53:37 2004 +0000
* prevent collision on log directory
commit b357284a323b86b96828e38dcb2d86b67f172de5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Sep 12 19:08:57 2004 +0000
* Fallback didn't work for subderivations of an unnormalised the main
derivation, since NormalisationGoal would first run a
NormalisationGoal on the subderivation (a no-op, since in a
situation where we need fallback the successor is known), and then
runs a RealisationGoal on the normal form, which then cannot do a
fallback because it doesn't know the derivation expression for which
it is a normal form.
Tossed out the 2-phase normalisation/realisation in
NormalisationGoal and SubstitutionGoal since it's no longer needed -
a RealisationGoal will run a NormalisationGoal if necessary.
commit dcc433de47d4bf4a27fe63bc8996e946164ae885
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Sep 10 13:32:08 2004 +0000
* Operation `--delete-generations' to delete generations of a
profile. Arguments are either generation number, or `old' to delete
all non-current generations. Typical use:
$ nix-env --delete-generations old
$ nix-collect-garbage
* istringstream -> string2Int.
commit c16be6ac92b86981e8e4bb6703e694b675a28b0d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 9 21:19:20 2004 +0000
* Remove write permission from store objects after they have been
added to the store. Bug reported by Martin.
commit 47f87072ad42338a9b6397a250abf2775d051d8e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 9 21:12:53 2004 +0000
* A very dirty hack to make setuid installations a bit nicer to use.
Previously there was the problem that all files read by nix-env
etc. should be reachable and readable by the Nix user. So for
instance building a Nix expression in your home directory meant that
the home directory should have at least g+x or o+x permission so
that the Nix user could reach the Nix expression. Now we just
switch back to the original user just prior to reading sources and
the like. The places where this happens are somewhat arbitrary,
however. Any scope that has a live SwitchToOriginalUser object in
it is executed as the original user.
* Back out r1385. setreuid() sets the saved uid to the new
real/effective uid, which prevents us from switching back to the
original uid. setresuid() doesn't have this problem (although the
manpage has a bug: specifying -1 for the saved uid doesn't leave it
unchanged; an explicit value must be specified).
commit 5396304c73190c6898981caf653fc1b28be71f70
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 9 15:55:31 2004 +0000
* Use setre[ug]id() instead of setres[ug]id(), since the former is
more common than the latter (which exists only on Linux and
FreeBSD). We don't really care about dropping the saved IDs since
there apparently is no way to quiry them in any case, so it can't
influence the build (unlike the effective IDs which are checked by
Perl for instance).
commit e043fc7d0b68bedaabe236c2f2080a33bb967ee5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 9 14:16:02 2004 +0000
* Set the umask to known value (0022). This is important in a
setuid installation, since the calling user may have a more fascist
umask (say, 0077), which would cause the store objects built by Nix
to be unreadable to anyone other than the Nix user.
commit 550d960586c1532ea1066b8df418c6629f0e7288
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 8 12:07:19 2004 +0000
* Hack for perl(readmanifest) dependency.
commit 17c8252fc932874b7ca9b7269c96b178022302f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 6 10:05:21 2004 +0000
* Spec file options to create the Nix user and group in the RPM
pre-install script. By default this is turned off; you should edit
the spec file to enable it.
commit fb28cfc86dff6bbacb71f69a862afd3384aee986
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Sep 6 08:17:55 2004 +0000
* Add some variability to RPM spec files: allow setuid options to be
set on the rpmbuild command line.
commit 5c443b65501903f636b00b908bb8eb10e022402e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 31 16:13:10 2004 +0000
* Main the `substitutes-rev' table again, but now in a way that
doesn't take \Theta(n^2) space/time complexity.
commit c25f2883b149bf71931f963d29241fe012360633
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 31 10:50:08 2004 +0000
* Quadruple the Berkeley DB locking limits to get rid of out of memory
errors while running `nix-store --verify'.
commit fe122c5a15db5399a10fcfd97b3bbb97c782c8b8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 30 11:51:36 2004 +0000
* Removed nrWaitees field. It was redundant with waitees.size() and
could get out of sync if multiple input derivations mapped to the
same closure expression (since waitees is a set).
commit eb233e728f06ec2b5cbcfc85059fa91a1150f291
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 25 16:54:08 2004 +0000
* `--min-age' flag in nix-store and nix-collect-garbage to only delete
unreachable paths that haven't been used for N hours. For instance,
`nix-collect-garbage --min-age 168' only deletes paths that haven't
been accessed in the last week.
This is useful for instance in the build farm where many derivations
can be shared between consecutive builds, and we wouldn't want a
garbage collect to throw them all away. We could of course register
them as roots, but then we'd to unregister them at some point, which
would be a pain to manage. The `--min-age' flag gives us a sort of
MRU caching scheme.
BUG: this really shouldn't be in gc.cc since that violates
mechanism/policy separation.
commit fdec72c6cc720be899431c32f99221e8c4b88cd0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 25 15:39:13 2004 +0000
* `nix-collect-garbage' now actually performs a garbage collection, it
doesn't just print the set of paths that should be deleted. So
there is no more need to pipe the result into `nix-store --delete'
(which doesn't even exist anymore).
commit 818047881e4906c670104851f69c3179ecc7fb1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 25 11:43:49 2004 +0000
* Put the garbage collector in nix-store: operation `--gc',
suboperations `--print-live', `--print-dead', and `--delete'. The
roots are not determined by nix-store; they are read from standard
input. This is to make it easy to customise what the roots are.
The collector now no longer fails when store expressions are missing
(which legally happens when using substitutes). It never tries to
fetch paths through substitutes.
TODO: acquire a global lock on the store while garbage collecting.
* Removed `nix-store --delete'.
commit 9994c1dd9fe19a3bb8f7bbddbcd5622c9c30d85b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 24 11:46:05 2004 +0000
* Validate derivation names. In particular don't allow spaces.
* Drop support for the outPath attribute in derivations.
commit 8f58733ef16bdefe3cdb004bea986b6a0b893331
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 20 15:47:58 2004 +0000
* The gid should also match.
commit 1c90fabccc0b859d9a357c96bfbc0c19a4ce17da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 20 15:31:46 2004 +0000
* Unbreak programs that are not setuid (such as nix-hash).
commit e77fbe0fa2f7c2cfaee734dba049f0d8dd3dae15
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 20 15:22:33 2004 +0000
* On systems that have the setresuid() and setresgid() system calls to
set the real uid and gid to the effective uid and gid, the Nix
binaries can be installed as owned by the Nix user and group instead
of root, so no root involvement of any kind is necessary.
Linux and FreeBSD have these functions.
commit 2d35116c13e0c11210cb712f9ce6e8a38058f350
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 20 14:49:05 2004 +0000
* Setuid support for sharing a Nix installation between multiple
users.
If the configure flag `--enable-setuid' is used, the Nix programs
nix-env, nix-store, etc. are installed with the setuid bit turned on
so that they are executed as the user and group specified by
`--with-nix-user=USER' and `--with-nix-group=GROUP', respectively
(with defaults `nix' and `nix').
The setuid programs drop all special privileges if they are executed
by a user who is not a member of the Nix group.
The setuid feature is a quick hack to enable sharing of a Nix
installation between users who trust each other. It is not
generally secure, since any user in the Nix group can modify (by
building an appropriate derivation) any object in the store, and for
instance inject trojans into binaries used by other users.
The setuid programs are owned by root, not the Nix user. This is
because on Unix normal users cannot change the real uid, only the
effective uid. Many programs don't work properly when the real uid
differs from the effective uid. For instance, Perl will turn on
taint mode. However, the setuid programs drop all root privileges
immediately, changing all uids and gids to the Nix user and group.
commit 8f1dcdfc0ae05c403fe59b592093d3e61e87f1b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 19 09:09:09 2004 +0000
* Make sure that no build hook is set by default in the tests.
* Don't use `seq' - some primitive, obsolete operating systems
(Darwin) don't have it.
commit 1eddee59f22b56a4b098921083780990dc1f0468
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 18 12:19:06 2004 +0000
* The default verbosity level of all Nix commands is now lvlInfo.
* Builder output is written to standard error by default.
* The option `-B' is gone.
* The option `-Q' suppresses builder output.
The result of this is that most Nix invocations shouldn't need any
flags w.r.t. logging.
commit 937ce0cd214c12276a2c373b515dc2541d1582fd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 18 12:11:31 2004 +0000
* Flag `--no-link' suppresses symlinking to the output path.
* Handle multiple derivations correctly.
commit 966bd9d19fb43b6a6022572eb7d80c1e03bfaf3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 13 09:57:51 2004 +0000
* WTF? More canonical system name problems ("athlon-linux" instead of
"i686-linux").
commit 62fe5c4a22453c763e967f04bda062df8241c487
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 11 19:03:13 2004 +0000
* The predecessor of a successor need not be present. This in
particular happens on distributed builds or when using push/pull.
commit ae1a1efa410fa66a0afbfae25ad423feee4b1e77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 5 14:53:27 2004 +0000
* Clean up the temporary directory for hook communication (and don't
print out incorrect "build failed" messages).
commit d8989b1fb482fc7b6f29945e5c3b8bb197f4539c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 11:27:53 2004 +0000
* Every real language has a `map' function.
commit bbfdd64741546863c2412d780097b1fe2457395e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 10:59:20 2004 +0000
* Allow primops with more that 1 arguments.
commit e3a50f7e25c552a78974fae684484d27a36b7c60
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 4 09:25:21 2004 +0000
* Creating a file nix-support/no-scan in the output path of a
derivation disables scanning for dependencies. Use at your own
risk. This is a quick hack to speed up UML image generation (image
are very big, say 1 GB).
It would be better if the scanner were faster, and didn't read the
whole file into memory.
commit 18ebd7b03071ebbb38cea9eca39a5e7e2e0cf2ea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 30 14:18:48 2004 +0000
* Doh!
commit 5373aed1a8087a7f6f7e428f693d0f2d36d35eca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 30 14:17:05 2004 +0000
* Use ATerm 2.2.
* Include bootstrap.sh in dist.
commit 16c8b4c8e533292aef40b83a40eea2b0f621e534
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 30 13:45:13 2004 +0000
* A script to generate the Auto* stuff.
commit e8a95108c0df56b95de9252e1cef1f74546f7f40
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 28 13:32:45 2004 +0000
* Nix-build places a symlink `result' in the current directory to the
store object just built.
commit 9bf7a5f516c9f6a9445e76d3166d173f5ab958bb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 18 21:08:24 2004 +0000
* Don't pass `--with-system'.
commit 39eaecbc982246a511810be578ef1ebbe9fd3c10
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 18 21:07:27 2004 +0000
* Slightly better heuristic for picking the canonical system type.
Now SuSE and Red Hat should yield the same type (`i686-linux'). Mac
OS X should now give `powerpc-darwin' (i.e., the version number is
gone).
commit 064a36cb5454f32a45aac55f2a47532fc96dda25
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 9 13:06:12 2004 +0000
* Hardcode the system id to be `i686-linux'.
commit c1a18f543e8f94568d085f88c66f0312c9d362d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 6 11:21:34 2004 +0000
* Fixed format string error.
commit 056cd1d3b7778bbe177d74aea3aadca9e1a7be79
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 1 16:24:35 2004 +0000
* Don't go into a (sometimes infinite) loop calling the build hook.
commit 638ce339a52da893693f667c8b330a2adefdd92a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 1 14:25:26 2004 +0000
* Nix-instantiate now accepts sets of derivations (just like nix-env).
commit 292d6468ec73212a2ada3bd5f7f3f6e897f9086e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 1 13:56:56 2004 +0000
* Nix-env operations now by default filter out any derivations for
system types other than the current system. I.e., `nix-env -i'
won't install derivations for other system types, and `nix-env -q'
won't show them. The flag `--system-filter SYSTEM' can be used to
override the system type used for filtering (but not for
building!). The value `*' can be used not to filter anything.
commit 8f6254e8234c5f4a16b1b7d632065ebb0162b307
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 1 13:35:10 2004 +0000
* Align the columns in the output of `nix-env -q'.
commit 593bc23d8b310b32b66227b36b72fd525087df83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 1 13:13:37 2004 +0000
* Allow the system attribute of derivations to be queried in
`nix-env -q'.
* Queries can now be combined, e.g., `nix-env -q --status --system'.
commit b584253af461b02f70ea3244a10d2569c85f2095
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 1 11:11:16 2004 +0000
* Include some missing headers.
commit f5d5ffe536398fa1b0612a3613ed68734ebe8a60
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 29 09:41:50 2004 +0000
* Write build logs to disk again.
commit 00aadf478b61264247df3c0c6e43304d9fa0c053
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 28 14:51:42 2004 +0000
* Use ATerm 2.1.
commit 151e61fa5a94950d3701f6df0b40fa970e3cf320
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 28 14:40:26 2004 +0000
* By default, `nix-env -i' now deletes previously installed
derivations with names matching the derivations being installed.
The option `--preserve-installed / -P' overrides this behaviour.
commit 4d2946c516aefd26daec8b2f4c4248e43ce85a62
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 28 13:51:24 2004 +0000
* In a realisation goal, check the result of the corresponding
normalisation goal.
commit 24286e15c9822833c39d268e521522b9933db28e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 28 13:37:05 2004 +0000
* `nix-env -u' now allows a specific version to be specified when
upgrading.
This fixes a bug reported by Martin:
$ nix-env -i foo-1.0
$ nix-env -u foo-1.0
upgrading foo-1.0 to foo-1.1
commit 2746a879e23a97639b23fe6e5335e0cfcc7d5085
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 28 12:07:07 2004 +0000
* Typo.
commit 91dc023665e22eb5637bf08c405e91ac9060c357
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 28 10:42:57 2004 +0000
* Added a switch `--fallback'. From the manual:
Whenever Nix attempts to realise a derivation for which a closure is
already known, but this closure cannot be realised, fall back on
normalising the derivation.
The most common scenario in which this is useful is when we have
registered substitutes in order to perform binary distribution from,
say, a network repository. If the repository is down, the
realisation of the derivation will fail. When this option is
specified, Nix will build the derivation instead. Thus, binary
installation falls back on a source installation. This option is
not the default since it is generally not desirable for a transient
failure in obtaining the substitutes to lead to a full build from
source (with the related consumption of resources).
commit b113edeab780216b0590045b932be685d1399e9b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 25 15:36:09 2004 +0000
* A flag `--keep-going / -k' to keep building goals if one fails, as
much as possible. (This is similar to GNU Make's `-k' flag.)
* Refactoring to implement this: previously we just bombed out when
a build failed, but now we have to clean up. In particular this
means that goals must be freed quickly --- they shouldn't hang
around until the worker exits. So the worker now maintains weak
pointers in order not to prevent garbage collection.
* Documented the `-k' and `-j' flags.
commit e4883211f9482ec3255bd4e682635493e03466ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 25 10:21:44 2004 +0000
* Don't throw an exception when a build fails. Just terminate the
goal and allow the problem to be handled elsewhere (e.g., at
top-level).
commit 795d9f8b08a266ef99f9668f9b060db1282cd622
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 24 14:36:50 2004 +0000
* Obsolete.
commit a29c8ac51ca813a34eebb497340807e4b274170c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 24 14:35:01 2004 +0000
* Add a test to check that when we cannot realise a closure
expression, we should invalidate it and go back to the derivation
for which it is a successor.
commit ec326276217ad5b7761327da567f79bb5cc17f32
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 24 13:40:38 2004 +0000
* Multiple and/or failing substitutes now work.
commit 8052aef4866e236ef0bb5d5675bbae330abb9b9b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jun 24 12:56:24 2004 +0000
* A test for multiple and/or failing substitutes.
commit 66c7f347591c0c4e26e018672c487a3090e36e5e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 17:07:32 2004 +0000
* Arghhhhhh
commit 05a5362d63dd2fc85bb74321244fc0e94689a4bf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 17:04:10 2004 +0000
* Some more diagnostics changes.
commit d051cd40e16119ed441276f5b2cb74b7983062c3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 15:17:04 2004 +0000
* Nix-instantiate can return multiple store expressions.
commit 3093af58a7e9d3f0315a1a1040d3cfeaea051ba6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 15:12:34 2004 +0000
* A utility script `nix-build' that builds Nix expressions and prints
their output paths (and only that) on standard output.
commit b302e5f63b96c945fa66d391c2d3165d7003a297
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 15:06:43 2004 +0000
* We don't really need this here.
commit 83ae1723da5d905a24894a4a1edb25ffc77f6fc4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 15:01:01 2004 +0000
* Well, it's better than printf.
commit 72bc9a522f04cc8d8cb761a02bb9bf281b94567d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 14:48:59 2004 +0000
* Started making Nix's diagnostic messages a bit more useful.
commit 5e2cf44a4d5d70f0dbed7b21257bd6d15538b3b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 11:03:41 2004 +0000
* Put WEXITSTATUS stuff somewhere else.
commit 84007a09588b21487cbd3869bcb26c3e2c05b605
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 10:21:44 2004 +0000
* Reduce gratuitous cut & pasting.
commit c9fbd2dfd51eebcb561f9b548c10c68ad89652e5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 09:51:44 2004 +0000
* Wrapper class around pids.
commit 155d7c8dfa46da054beaf37d6415d52613e2bb17
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 09:00:31 2004 +0000
* Substitutes should occupy a build slot.
commit c4cb6ea2bc77f1f9239ce81ffc7a0fa6b540b1ab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 22 08:50:25 2004 +0000
* Refactoring.
commit 88fb4f6e537ebea37fe0aaa4a2b044cf70d32178
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 12:20:47 2004 +0000
* Missing files added to `make dist'.
commit 2db9748221ce285ac434c849eeed249950dd0d39
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 10:01:17 2004 +0000
* Remove debug output.
commit 37ee6cef992c1a80e790a294b75db8c116be8bbb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 09:51:23 2004 +0000
* Adapted nix-pull to use the new substitute mechanism.
commit 3f3a3ae87b3d72d52842d9a2ffe7010f5b0066b9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 09:35:50 2004 +0000
* Acquire a lock on the output path when running a substitute. Also
delete obstructing invalid paths.
commit 72c857f0eb923c3126600a5c97bfb30fedd859c1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 08:51:55 2004 +0000
* Ugh, nasty Heisenbug due to an uninitialiased variable. The bug
only caused a crash if the program was *not* invoked with a high
verbosity level.
commit be1a917beb4577dd359a5e8ea17ca69dd228e6ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 07:46:02 2004 +0000
* Remove obstructing invalid store paths add[Text]ToStore().
commit daf0a923c7c77300dfb09ee34c1ae31c87002a0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 07:38:17 2004 +0000
* Wrap calls to registerSubstitute() in a single transaction to
improve throughput.
* Don't build the `substitute-rev' table for now, since it caused
Theta(N^2) time and log file consumption when adding N substitutes.
Maybe we can do without it.
commit 15c60ca1b64a4e5dc874f60c764f0ccc8899d740
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 21 07:36:01 2004 +0000
* Disable calls to fsync() since Berkeley DB's DB_TXN_WRITE_NOSYNC
flag doesn't seem to work as advertised.
commit 112ee89501a936ad9c492780be6b63f53b2eb9ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jun 20 19:17:54 2004 +0000
* Re-enable support for substitutes in the normaliser.
* A better substitute mechanism.
Instead of generating a store expression for each store path for
which we have a substitute, we can have a single store expression
that builds a generic program that is invoked to build the desired
store path, which is passed as an argument.
This means that operations like `nix-pull' only produce O(1) files
instead of O(N) files in the store when registering N substitutes.
(It consumes O(N) database storage, of course, but that's not a
performance problem).
* Added a test for the substitute mechanism.
* `nix-store --substitute' reads the substitutes from standard input,
instead of from the command line. This prevents us from running
into the kernel's limit on command line length.
commit bafb2357d1ab5f7aef8ce4495f5ab8b835359f63
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jun 20 19:08:59 2004 +0000
* README for the Emacs mode (written a while ago, but forgot to commit).
commit 85ae78176520fbba0420e5dc772d76144b564605
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jun 20 13:37:51 2004 +0000
* Refactoring.
commit 23bb902d1f65831d74a33051fdb8c0230b7a3e37
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jun 19 21:45:04 2004 +0000
* Re-enable build hooks.
commit 41ec982f3132c32991a48a82735a036f844e7299
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 18 18:09:32 2004 +0000
* Big refactoring. Move to a much more explicitly state machine based
approach. This makes it much easier to add extra complexity in the
normaliser / realiser (e.g., build hooks, substitutes).
commit 3454c685eec2aebe6f61f7deebc40162bab22e69
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 18 16:52:31 2004 +0000
* This is also useful.
commit 6ba26f27c3665ec5f72638a8c658b0aa68068410
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 18 09:20:51 2004 +0000
* Shared (garbage collecting) pointers. Copied from Boost.
commit 0b70231b9d9f2dfa5a9447fcd01fdb5c8f1fa0ea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 15 13:49:42 2004 +0000
* Refactoring.
commit 1bc6afefac7af8d4c917e898d6670d9b9d7f29f1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 8 13:21:03 2004 +0000
* Cleanup.
commit e8411948ff9a2017d6c50093076a538a113de8c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 4 14:31:57 2004 +0000
* A Nix mode for Emacs.
commit 5e4a2272bfb30f3e0e1d39a8cb7c6d2e7bfba161
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 18 14:52:35 2004 +0000
* Drain the output of the build hook to show error messages. Ugly
hack.
commit 19479899fb2f78f9cc1c40caf017a1bbeb6d8d3e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 18 12:57:26 2004 +0000
* Don't set the rpath here --- it's not portable.
commit 1d08093b4894e4ded9eaf591a2547a74d33e1bfb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 18 09:45:46 2004 +0000
* Go back to the old way of generating the system name, and allow it
to be specified in configure (using `--with-system=SYSTEM').
commit 8e9fd57ef9aa47214418212916e54c5644721335
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 18 09:45:18 2004 +0000
* setpgrp() is not POSIX (and on Mac OS X it's different than on
Linux), so use setpgid().
commit ace8872706a1ddbefde39ee66f0746df6861cc11
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 14 12:24:29 2004 +0000
* execl() requires a terminating 0.
* When a fast build wakes up a goal, try to start that goal in the
same iteration of the startBuild() loop of run(). Otherwise no job
might be started until the next job terminates.
commit 4fc00cbec139487e63a7edf6225a8590ed58a9f3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 13 22:52:37 2004 +0000
* Distributed builds and load balancing now seem to work pretty well.
(Though the `build-remote.pl' script has a gigantic race condition).
commit 2fa33049338aed07465f73b25c95168d6a61c8b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 13 20:28:20 2004 +0000
* Set the executable bit.
commit 25db6224544be0df483a661f5e2cc1ed595525ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 13 19:35:46 2004 +0000
* Load balancing. `build-remote.pl' will only execute up to a
per-machine maximum number of parallel jobs on a remote machine.
commit 3426d19547c889700a00e97fb62966ebd755f88b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 13 19:16:48 2004 +0000
* Perform all tests.
commit a8306cb98ff920b38db5e5bbfcbe71bb36859b3f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu May 13 19:14:49 2004 +0000
* The build hooks used to implement distributed builds can now be run
in parallel. Hooks are more efficient: locks on output paths are
only acquired when the hook says that it is willing to accept a
build job. Hooks now work in two phases. First, they should first
tell Nix whether they are willing to accept a job. Nix guarantuees
that no two hooks will ever be in the first phase at the same time
(this simplifies the implementation of hooks, since they don't have
to perform locking (?)). Second, if they accept a job, they are
then responsible for building it (on the remote system), and copying
the result back. These can be run in parallel with other hooks and
locally executed jobs.
The implementation is a bit messy right now, though.
* The directory `distributed' shows a (hacky) example of a hook that
distributes build jobs over a set of machines listed in a
configuration file.
commit 5087c8f645cf971ee6dfd11c5c56c6b2b752d7ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 14:30:57 2004 +0000
* Use `-j0'.
commit efa5fa1a91d5c4b29094d99b65e18b583d86dbc7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 14:20:32 2004 +0000
* A switch `-j NUMBER' to set the maximum number of parallel jobs (0 =
no limit).
* Add missing file to distribution.
commit 1f48aa0be7f1fe120cee44a208480b879583c5f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 13:49:10 2004 +0000
* Broken test.
commit aa5a5084e4855ff612d27913a920ffab073e7b42
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 13:32:26 2004 +0000
* Pass to the build hook all sorts of information useful for
distributing a build action to another machine. In particular, the
paths in the input closures, the output paths, and successor mapping
for sub-derivations.
commit 8c0b42f857b53993d95c5bc077e8f8a71028c5ac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed May 12 09:35:51 2004 +0000
* An quick and dirty hack to support distributed builds.
commit c8d3882cdc8f9e22c58af285c1996265c1af75d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 11 18:05:44 2004 +0000
* True parallel builds. Nix can now run as many build jobs in
parallel as possible (similar to GNU Make's `-j' switch). This is
useful on SMP systems, but it is especially useful for doing builds
on multiple machines. The idea is that a large derivation is
initiated on one master machine, which then distributes
sub-derivations to any number of slave machines. This should not
happen synchronously or in lock-step, so the master must be capable
of dealing with multiple parallel build jobs. We now have the
infrastructure to support this.
TODO: substitutes are currently broken.
commit aea436503e9126b06cd15acf1f0c6b738ffbc7de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 11 13:48:25 2004 +0000
* Ignore interrupt signals while handling an exception.
* Ignore EINTR in reads and writes.
commit a9858c9f26c5be743e0bbe1949954f6bd2497306
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 17:04:17 2004 +0000
* A test to verify that Nix executes build jobs in parallel, if
possible.
This test fails right now because this hasn't been implemented right
now. Yes, I'm doing Test-Driven Development! ;-)
commit f044ccf7025137ec541e165e7988772f27080a23
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 13:56:30 2004 +0000
* 1000th revision!
* A test to verify that locking of output paths (caused by concurrent
invocations of Nix) works correctly.
commit a7bbe739717c7419a374b29e6e4887325b1af7fd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 13:22:33 2004 +0000
* Another test.
commit ef093aac8f24535f6d0c75332ac7aeafbbe8c161
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 12:45:04 2004 +0000
* Grrr. TESTS are not included in EXTRA_DIST.
commit 256eeab7112da2d5fe1629ffb8b86640a894ee6d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 4 12:15:30 2004 +0000
* Allow the location of the store etc. to be specified using
environment variables.
* Started adding some automatic tests.
* Do a `make check' when building RPMs.
commit fd927c5d25f1518dcbf99a57223f46fe098d9011
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 13:44:26 2004 +0000
* Bump the version number.
commit 22371cbd3f382fd00e4f90bc88b28893d211b3f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 09:54:37 2004 +0000
* Fixed URL.
commit bcce9c1ff5d5bfeb1d9c51554e432b6bef91ac97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 26 09:52:06 2004 +0000
* Only add `-preRELEASE' to the version if STABLE != 1.
* Documented release procedures.
commit d4779abc042710638fb4afe419f83d4627c94004
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 23 15:16:08 2004 +0000
* Pass SYSTEM through config.h, and allow spaces.
commit 759c953196c75b7728bb2d946227f1597b99a4a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 22 14:17:57 2004 +0000
* Look for GC roots in @localstatedir@/nix/gcroots.
commit d7238bc84ebd8356db6d73a80171f1129bbe3d44
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 22 07:47:41 2004 +0000
* Don't create $(localstatedir)/nix/profiles if --disable-init-state
is specified.
commit b6df68c9429896ba6017f60d1ce3a95ede9afe72
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 14:57:46 2004 +0000
* Dist error.
commit 21655a70f5a6e80b477d8bf758aa24eb0fcbdbfe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 14:54:05 2004 +0000
* Channels. These allow you to stay current with an evolving set of
Nix expressions.
To subscribe to a channel (needs to be done only once):
nix-channel --add \
http://catamaran.labs.cs.uu.nl/dist/nix/channels/nixpkgs-unstable
This just adds the given URL to ~/.nix-channels (which can also be
edited manually).
To update from all channels:
nix-channel --update
This fetches the latest expressions and pulls cache manifests. The
default Nix expression (~/.nix-defexpr) is made to point to the
conjunction of the expressions downloaded from all channels.
So to update all installed derivations in the current user
environment:
nix-channel --update
nix-env --upgrade '*'
If you are really courageous, you can put this in a cronjob or
something.
You can subscribe to multiple channels. It is not entirely clear
what happens when there are name clashes between derivations from
different channels. From nix-env/main.cc it appears that the one
with the lowest (highest?) hash will be used, which is pretty
meaningless.
commit f79e9c2d22345eeb0c721a8cf5375101d33dc4c9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 10:54:46 2004 +0000
* Do initialise state (the DB etc.) when doing a `make install',
unless `--disable-init-state' is passed to configure.
commit 8e459d919dbce7c6d45d90ef9a9385133cfae15e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 21 09:37:37 2004 +0000
* Recurse into attribute sets and lists when getting derivations from
an expression.
commit 7cce0c34e1821b08c066a25e2cffcf0910d1f145
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 15 15:14:16 2004 +0000
* Allow extra parameters to be passed to Curl through the `CURL_FLAGS'
environment variable. This is useful for passing authentication
information (it won't show up in `ps'). Hacky - nix-push should
abstract over the use of Curl.
commit 2c5a8bf49f6ed5f6584bac6b8abae1def86f95f7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 10:45:11 2004 +0000
* Use @storedir@, not @prefix@/store.
commit b275f2ed3b2ae8fc22912122a5a4cdd5ef0fe0cd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 08:09:27 2004 +0000
* `*.gcroot' files can now containing multiple roots.
commit a4d2b22c8ca5064f1da614914c7ea336eedd65c4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 14 08:08:55 2004 +0000
* Be stricter in verifying store paths.
commit 87bf541f23723f6a8c7f05c89984c5df0c450ec2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 8 15:51:26 2004 +0000
* Documented the primops.
commit b0c9baf1b5843acbb954d21bcb5cacc897236c3b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 8 13:31:57 2004 +0000
* EBNF grammar for the Nix expression language.
commit 153429520a8d2ed906a272f6d0e23c6c2b54fa41
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 6 15:55:27 2004 +0000
* Distributed the wrong file.
commit 2be8ac48bb4349bdd61e993ccf325a7b9e167627
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 6 11:42:28 2004 +0000
* Make the creation of user environments much faster and more storage
efficient by creating only a single symlink to entire directory
trees unless a collission occurs.
commit bf3863b546dcb9bd62e86c0f17d8b12b2d08b874
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 6 08:40:19 2004 +0000
* Fail if prerequisites are missing.
commit 03f1d1ecb5ef69c8c065c83373f9f9f749995c50
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 6 08:18:51 2004 +0000
* Switched from wget to curl.
* Made the dependencies on bzip2 and the shell explicit.
commit 59b94ee18ac0cba5c7b261ee72550a4d3db0acb5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Apr 5 22:27:41 2004 +0000
* When something goes wrong in the evaluation of a Nix expression,
print a nice backtrace of the stack, rather than vomiting a gigantic
(and useless) aterm on the screen. Example:
error: while evaluating file `.../pkgs/system/test.nix':
while evaluating attribute `subversion' at `.../pkgs/system/all-packages-generic.nix', line 533:
while evaluating function at `.../pkgs/applications/version-management/subversion/default.nix', line 1:
assertion failed at `.../pkgs/applications/version-management/subversion/default.nix', line 13
Since the Nix expression language is lazy, the trace may be
misleading. The purpose is to provide a hint as to the location of
the problem.
commit a520b1cbc3327dfb8e3c6f503dfd0bd41e0a6d55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 2 10:49:37 2004 +0000
* Print a more useful error message in case of an invalid derivation
binding.
commit c4ac2a164af1c4198852844ae4fcfb99c7e8c110
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 30 15:05:35 2004 +0000
* The recent change in nixpkgs of calling `stdenv.mkDerivation'
instead of `derivation' triggered a huge slowdown in the Nix
expression evaluator. Total execution time of `nix-env -qa' went up
by a factor of 60 or so.
This scalability problem was caused by expressions such as
(x: y: ... x ...) a b
where `a' is a large term (say, the one in
`all-packages-generic.nix'). Then the first beta-reduction would
produce
(y: ... a ...) b
by substituting `a' for `x'. The second beta-reduction would then
substitute `b' for `y' into the body `... a ...', which is a large
term due to `a', and thus causes a large traversal to be performed
by substitute() in the second reduction. This is however entirely
redundant, since `a' cannot contain free variables (since we never
substitute below a weak head normal form).
The solution is to wrap substituted terms into a `Closed'
constructor, i.e.,
subst(subs, Var(x)) = Closed(e) iff subs[x] = e
have substitution not descent into closed terms,
subst(subs, Closed(x)) = Closed(x)
and otherwise ignore them for evaluation,
eval(Closed(x)) = eval(x).
* Fix a typo that caused incorrect substitutions to be performed in
simple lambdas, e.g., `(x: x: x) a' would reduce to `(x: a)'.
commit df101d6fca1d60d4159056e87dd1b3d6c2855661
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 29 12:10:15 2004 +0000
* Specify Perl as a dependency for the RPM.
commit ac4d39f9db28743b6c1e9def7a61241a50b02335
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 28 21:15:01 2004 +0000
* Added an operator `?' to test for attribute existence, e.g.,
`attrs ? x' yields true iff `attrs' has an attribute named `x'.
commit f958bcdf1f9f66759a2512e4b7c0b0ba5647960a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 28 20:58:28 2004 +0000
* Added an operator `~' to select paths within a derivation. E.g.,
{stdenv, bash}: derivation {
builder = bash ~ /bin/sh;
args = ["-e" "-x" ./builder.sh];
...
}
Here the attribute `builder' will evaluate to, e.g.,
`/nix/store/1234abcd...-bash-2.0.1/bin/sh'.
commit db3e644c1ce7d856dbaca7718fa0af8231c486d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 28 20:34:22 2004 +0000
* Added plain lambdas, e.g., `let { id = x: x; const = x: y: x; }'.
`bla:' is now no longer parsed as a URL.
* Re-enabled support for the `args' attribute in derivations to
specify command line arguments to the builder, e.g.,
...
builder = /usr/bin/python;
args = ["-c" ./builder.py];
...
commit f8cd904e05b95c5a3ca7cf570c0503a25a2095ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 27 17:58:04 2004 +0000
* Disallow the Nix store or any of its parents from being symlinks.
This is because the contents of these symlinks are not incorporated
into the hashes of derivations, and could therefore cause a mismatch
between the build system and the target system. E.g., if
`/nix/store' is a symlink to `/data/nix/store', then a builder could
expand this path and store the result. If on the target system
`/nix/store' is not a symlink, or is a symlink that points somewhere
else, we have a dangling pointer.
The trigger for this change is that gcc 3.3.3 does exactly that (it
applies realpath() to some files, such as libraries, which causes
our impurity checker to bail out.)
An annoying side-effect of this change is that it makes it harder to
move the Nix store to a different file system. On Linux, bind
mounts can be used instead of symlink for this purpose (e.g., `mount
-o bind /data/nix/store /nix/store').
commit f0f7a9f29962c55a6c2082b44c9befbd912c2f53
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Mar 27 15:33:19 2004 +0000
* Do not close a nesting level twice after close() has been
called explicitly on a Nest object.
commit 7823db2137d8079bcf512aba4ce46f1373693517
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 22 21:42:28 2004 +0000
* Some more nesting.
commit 777e13b94b2da466c16a5836b52413aa9d246cd5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 22 20:53:49 2004 +0000
* Nix now has three different formats for the log information it
writes to stderr:
- `pretty': the old nested style (default)
- `escapes': uses escape codes to indicate nesting and message
level; can be processed using `log2xml'
- `flat': just plain text, no nesting
These can be set using `--log-type TYPE' or the NIX_LOG_TYPE
environment variable.
commit 79bb0008ec9afa8d8cee9e6b807a579bcb1c92ab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 19 14:45:45 2004 +0000
* `null' is a normal form.
commit e6253b58cdb6b3836a616821b7f5dc66790ac989
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 18 21:32:15 2004 +0000
* Escape codes to force line breaks to be ignored.
commit 3f3c4cce5a6552016a040999f64dc989d203a9ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 18 21:04:14 2004 +0000
* Added an extra escape code to signal "unimportant" messages. If a tree only has
unimportant messages, it is collapsed by the default.
* Also added an optional integer argument to the escape code for opening a nesting
level to indicate lack of importance. If set, the tree is collapsed by default.
commit 84c617966b8a78b7385aff04f1ac9b3bb7391898
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 18 18:26:22 2004 +0000
* Collapsable trees.
commit c2fc2c13c981e28ff673221da47cc93a7ed9291f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 18 14:58:16 2004 +0000
* Use unordered lists, which is more sensible semantically for
representing tree structures.
commit a784fd5792a5447ad2b7dac63bea2a0b2fc379c3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 18 13:04:05 2004 +0000
* Don't use tables. Konqueror likes this much better.
commit 8ce3dd488711d0eca43c64ccc04903eeba135836
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 17 16:55:53 2004 +0000
* Display the popup directly over the abbreviation.
commit 8330c8202aa77ab65ce6344a45c5ecce287fd988
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 17 16:52:48 2004 +0000
* A simpler way of implementing the store reference popups, thanks to
Martin and CSS guru Martijn Vermaat.
commit b5539e7a30da963af3e5967e2af2524a5e99efbb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 16 12:47:09 2004 +0000
* Store paths are now abbreviated in the generated HTML file.
Hovering over the abbreviated path will reveal the full path. This
probably only works in Mozilla.
commit 9d2669d218d03d64c69a702a96fc87ee1fd3a9d0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 15 21:51:14 2004 +0000
* Added a utility that can be used to produce nice HTML pages from Nix
build logs. The program `log2xml' converts a Nix build log (read
from standard input) into XML file that can then be converted to
XHTML by the `log2html.xsl' stylesheet. The CSS stylesheet
`logfile.css' is necessary to make it look good.
This is primarily useful if the log file has a *tree structure*,
i.e., that sub-tasks such as the various phases of a build (unpack,
configure, make, etc.) or recursive invocations of Make are
represented as such. While a log file is in principle an
unstructured plain text file, builders can communicate this tree
structure to `log2xml' by using escape sequences:
- "\e[p" starts a new nesting level; the first line following the
escape code is the header;
- "\e[q" ends the current nesting level.
The generic builder in nixpkgs (not yet committed) uses this. It
shouldn't be to hard to patch GNU Make to speak this protocol.
Further improvements to the generated HTML pages are to allow
collapsing/expanding of subtrees, and to abbreviate store paths (but
to show the full path by hovering the mouse over it).
commit beda10f5a2a69ac32ad91c8a80477fde19be6a83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 15 15:23:53 2004 +0000
* Make perl a dependency of Nix.
commit a5619f1dffbf3600dd16b51e84ae3c999edc439c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 12 10:45:08 2004 +0000
* Set the NIX_STORE and NIX_BUILD_TOP environment variables in
builders to point to the store and the temporary build directory,
respectively. Useful for purity checking.
* Also set TEMPDIR, TMPDIR, TEMP, and TEMP to NIX_BUILD_TOP to make
sure that tools in the builder store temporary files in the right
location.
commit 7f0ed370da62b867d90ba5346f4b9f217fbbe10f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 20 11:32:30 2004 +0000
* Use $(storedir) instead of $(prefix)/store.
commit dbf547645d26baee030d7db0535e0c0be72c13cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Feb 19 13:11:12 2004 +0000
* Resolve an ambiguity between ifs and attribute selection, e.g., `if
b then x else y.z'.
commit 86b7efbdbe3c2da0f788df3ee7839cf3b88f7120
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 16 16:48:06 2004 +0000
* Don't build ATerm library if we don't need to.
commit 0dfdafdf6de4f741ff60637843f0e7900384cd9f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 16 16:37:16 2004 +0000
* Allow linking against an external Berkeley DB / ATerm library.
commit f34de121401bb43c6cfab892b2b254e42652ba90
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 16 15:23:19 2004 +0000
* Allow the location of the store to be specified (--with-store-dir).
* Do not create stuff in localstatedir when doing `make install'
(since we may not have write access). In general, installation of
constant code/data should be separate from the initialisation of
mutable state.
commit fbc48a469c80201f0d159a9b9f48a22ce5f36984
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 16 09:18:35 2004 +0000
* Inherited attributes in recursive attribute sets are in scope of the
non-inherited attributes.
commit 76c0e85929dc747288a8fe66a7bb77673cf2aa7e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Feb 14 21:44:18 2004 +0000
* The environment variable NIX_ROOT can now be set to execute Nix in a
chroot() environment.
* A operation `--validpath' to register path validity. Useful for
bootstrapping in a pure Nix environment.
* Safety checks: ensure that files involved in store operations are in
the store.
commit 6f5a5ea5ea7fa80bc709c4a2b14ea4395ebe7469
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 13 10:45:09 2004 +0000
* Regression fix: realise substitutes and detect cycles.
commit 1ad9d1124727dd48beaec36b006bba856350905d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 13 10:43:31 2004 +0000
* Only include predecessors that are themselves being pushed.
Otherwise the substitute mechanism can break in subtle ways.
commit 00fe1a506f045e612b0564ab0b5aff3917e26bd3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 11 10:25:31 2004 +0000
* When creating a new generation, also make the normal form of the
derivation (i.e., the closure store expression) a root of the
garbage collector. This ensures that running `nix-collect-garbage
--no-successors' is safe.
commit 92e832348db13637875c4f529ed0aa83d3d34493
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 10 16:14:47 2004 +0000
* Lots of manual stuff. Reference pages for most Nix commands.
* nix-pull now requires the full url to the manifest, i.e.,
`/MANIFEST/' is no longer automatically appended.
* nix-prefetch-url works again.
commit 6551b36790d47477087fc3a7f7bb779f28e42d8e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 10 13:42:58 2004 +0000
* Print what generation we are switching to; honour --dry-run flag.
commit 0616b7feea26786c298052b0779614b2888b482a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 10 11:51:16 2004 +0000
* Documented the most important nix-env flags.
commit 618aa69b015bd3ee1f6e19f3025e31fae0241826
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 9 11:59:39 2004 +0000
* In `--upgrade': added flags `--lt', `--leq', `--always' to specify
whether we want to upgrade if the current version is less than the
available version (default), when it is less or equal, or always.
* Added a flag `--dry-run' to show what would happen in `--install',
`--uninstall', and `--upgrade', without actually performing the
operation.
commit 06a75a7e0c1813d90c205e654da43a32812ce5f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Feb 8 14:07:43 2004 +0000
* A command `--switch-generation' to switch to a specific generation
of the current profile, e.g.,
$ nix-env --list-generations
...
39 2004-02-02 17:53:53
40 2004-02-02 17:55:18
41 2004-02-02 17:55:41
42 2004-02-02 17:55:50 (current)
$ nix-env --switch-generation 39
$ ls -l /nix/var/nix/profiles/default
... default -> default-39-link
* Also a command `--rollback' which is just a convenience operation to
rollback to the oldest generation younger than the current one.
Note that generations properly form a tree. E.g., if after
switching to generation 39, we perform an installation action,
a generation 43 is created which is a descendant of 39, not 42. So
a rollback from 43 ought to go back to 39. This is not currently
implemented; generations form a linear sequence.
commit b8675aee5470c5387e4bfe4906e4ab1e94b610b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 6 16:16:55 2004 +0000
* In `--list-generations', show what the current generation is.
commit 73ab2ed4fd1c3cd974851be4f13e7a276ab16acf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 6 16:03:27 2004 +0000
* A command `--list-generations' to show all generations for a
profile.
commit 7c0fa4474f0010f8266b85e891ca6049595ecb32
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 6 14:57:10 2004 +0000
* More refactoring.
commit 7abf9911d997b241f1e6b58805140fbfe1f2771d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 6 14:49:41 2004 +0000
* Refactoring.
commit 49bafe1faf4eedf0f059740be4f99c700ee93fe7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 6 10:59:06 2004 +0000
* Use the profile pointed to by ~/.nix-profile if no --profile
argument is specified.
commit 66e94d3275e9a0a549c28b7d0ad5f3f897e2fbf0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Feb 6 10:30:20 2004 +0000
* Improvements to profiles. Generations are now per-profile, e.g.,
default -> default-94-link
default-82-link -> /nix/store/cc4480...
default-83-link -> /nix/store/caeec8...
...
default-94-link -> /nix/store/2896ca...
experimental -> experimental-2-link
experimental-1-link -> /nix/store/cc4480...
experimental-2-link -> /nix/store/a3148f...
* `--profile' / `-p' -> `--switch-profile' / `-S'
* `--link' / `-l' -> `--profile' / `-p'
* The default profile is stored in $prefix/var/nix/profiles.
$prefix/var/nix/links is gone. Profiles can be stored anywhere.
* The current profile is now referenced from ~/.nix-profile, not
~/.nix-userenv.
* The roots to the garbage collector now have extension `.gcroot', not
`.id'.
commit d445da7a7b3cbb4822bcad3904a36f0d914917d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 4 17:23:26 2004 +0000
* Extended the `inherit' syntax to optionally select attributes from
other attribute sets, rather than the current scope. E.g.,
{inherit (pkgs) gcc binutils;}
is equivalent to
{gcc = pkgs.gcc; binutils = pkgs.binutils;}
I am not so happy about the syntax.
commit 9d25466b34a5f7c1c8b1c273976cf59c33961a6c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 4 16:49:51 2004 +0000
* An attribute set update operator (//). E.g.,
{x=1; y=2; z=3;} // {y=4;} => {x=1; y=4; z=3;}
commit 6d46e647ba16e19100dcd0abda9ca5a81ccf764f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 4 16:20:51 2004 +0000
* Fixed the old envpkgs filename.
commit 9b44480612dd30a7292ec94a88e4018b8f18e3f0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Feb 4 16:03:29 2004 +0000
* Use a map to lookup primops.
* Various performance improvements in the evaluator.
* Do not link against unused (and missing!) libraries (-lsglr, etc.).
commit c4f7ae4aa5fc7071cfa853ec5d75aaf00e7a97fc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Feb 3 14:45:34 2004 +0000
* Verify that all variables in a Nix expression are defined.
commit 1c9c0a5a46822be60c999f0196567c9e17cf5fa3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 2 21:39:33 2004 +0000
* Added syntactic sugar to the construction of attribute sets to
`inherit' variables from the surrounding lexical scope.
E.g.,
{stdenv, libfoo}: derivation {
builder = ./bla;
inherit stdenv libfoo;
xyzzy = 1;
}
is equivalent to
{stdenv, libfoo}: derivation {
builder = ./bla;
stdenv = stdenv;
libfoo = libfoo;
xyzzy = 1;
}
Note that for mutually recursive attribute set definitions (`rec
{...}'), this also works, that is, `rec {inherit x;}' is equivalent
to `let {fresh = x; body = rec {x = fresh;};}', *not*
`rec {x = x}'.
commit d9f30fe7c74ae8518a575c0d15ee00aa46a2229a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Feb 2 10:51:54 2004 +0000
* Sort `nix-env -q' output by derivation name.
* `--version' flag for all commands.
* Manual updates.
commit 47c003cb5999344aa2e4cb9f912551e33a94cd41
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 30 17:14:08 2004 +0000
* Doh!
commit 619f20775dae99ad5cd04ff6e7f7cde693d912f0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 30 17:06:03 2004 +0000
* Parser numbers again.
* Include missing files in distributions.
commit c6257185139bf5f298b19177867f3afa8e5472b7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 30 16:32:14 2004 +0000
* Detect flex and bison; updated the manual.
commit c5baaafae69394082817ede9e6eb3910c4601a72
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 30 15:21:42 2004 +0000
* Replaced the SDF parser by a substantially faster Bison/Flex
parser (roughly 80x faster).
The absolutely latest version of Bison (1.875c) is required for
reentrant GLR support, as well as a recent version of Flex (say,
2.5.31). Note that most Unix distributions ship with the
prehistoric Flex 2.5.4, which doesn't support reentrancy.
commit abd1878b26200ba3fa75592637aa87e04f52100d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 29 14:24:53 2004 +0000
* Optimised the SDF grammar.
commit 3648d1c732379ef5d0f74cc3c2e5b876a7f2c9a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 22 13:04:57 2004 +0000
* Explicitly compute the release name.
commit cdb50886f40e879d7b9abcfdd3ff4ac9d66f6242
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 22 09:35:35 2004 +0000
* Typos.
commit 3c4bc7276a4599867c46e872858550499a94c641
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 22 09:17:55 2004 +0000
* Added a note about adding /nix/etc/profile.d/nix.sh to the profile.
commit 4f72b408a5b0cf4401362960000763322eeb1846
Author: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Thu Jan 22 08:47:59 2004 +0000
Typos and url losser -> catamaran
commit 840551ebdb6ca09ab733081dd0e92daee73ba900
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 21 16:41:17 2004 +0000
* Extra bit `S' in `--query --status' output: show whether there are
any substitutes for the derivation.
commit 1109ea068097d4c5e3a4dfdeececf4590c52329a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 21 14:49:32 2004 +0000
* Fixed a subtle uninitialised variable bug in ATermMaps copied from
ATermMaps. Found thanks to Valgrind!
commit 47f19b6293357a8bdc3a2290813765170f241b58
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 20 20:36:58 2004 +0000
* Absolutise the specified path in `--import' and `--profile'.
commit 4db7ef3fcc7c392dc03fc02a22886a8c9bcbcacb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 20 17:18:41 2004 +0000
* Fixed URL.
commit 3778586b2aaf2b5c905866d91d6f67e617ceb203
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 20 15:37:55 2004 +0000
* Nix Quick Start guide.
commit 8baf50f10821e6def3006af8ff8b8739c66b028a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 20 11:49:32 2004 +0000
* Manual updates.
* Updated the README. Now it just refers to the manual.
commit 699989b2168bed80cc1383e5bf3c8326d55a3cc1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 19 09:01:28 2004 +0000
* Ignore exit code from strip.
commit 3a4a4aaa8820e3483b64b3e2d25ee523c0a0cb44
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 19 08:49:25 2004 +0000
* Strip binaries in RPMs.
commit f899e8ce4df3e700ae5b47279c16edc0efb4aeed
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 16 15:17:36 2004 +0000
* Test whether the symlink, not its target, exists.
commit b1c5f3c10dbcbbb9469ba7147bb26acf6a9aa733
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 16 14:54:39 2004 +0000
* Doh! Edited `readmanifest.pm' instead of `readmanifest.pm.in'.
commit 291030b900ffe5b9934729a3dce9b73c4effe715
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 15 20:58:44 2004 +0000
* Remove debug message.
commit 447089a5f699f085661287dec4b3d88219f67068
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 15 20:23:55 2004 +0000
* Catch SIGINT to terminate cleanly when the user tries to interrupt
Nix. This is to prevent Berkeley DB from becoming wedged.
Unfortunately it is not possible to throw C++ exceptions from a
signal handler. In fact, you can't do much of anything except
change variables of type `volatile sig_atomic_t'. So we set an
interrupt flag in the signal handler and check it at various
strategic locations in the code (by calling checkInterrupt()).
Since this is unlikely to cover all cases (e.g., (semi-)infinite
loops), sometimes SIGTERM may now be required to kill Nix.
commit 08719c6c97e25fb362eeb7463d8b764ecefc53cb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 15 20:13:54 2004 +0000
* Obsolete.
commit 55e11bc0d3e3c440503ee71d21c3ef5e34431cbb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 15 14:43:00 2004 +0000
* In `nix-env --query --status', determine the `I' bit by looking at
the output path of a derivation, not the path of its store
expression. This ensures that changes that affect the path of the
store expression but not the output path, do not affect the
`installed' state of a derivation.
commit 9a404e45c9e8257e2d353d569e189a4b003159b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 14 14:20:33 2004 +0000
* Synchronous `nix-pull' with `nix-push'.
* Use curl instead of wget.
commit 16f9b133ec8c1fc6226d486e5170dd3a43aa35a7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 14 11:13:08 2004 +0000
* Improved `nix-push': it now uses HTTP PUT (instead of rsync) to copy
files. Target location is no longer hard-coded; it accepts a number
of URLs on the command line.
* `nix-install-package': compatibility fixes.
commit ff9af107d3aa1362af906972c490773eeaaad4b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 13 16:35:43 2004 +0000
* Option `-B' to always show the output of builders, regardless of
verbosity level.
commit 3495d153b317a0853abd7114f29b44517f7c3813
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 13 13:37:25 2004 +0000
* Periodically checkpoint the log.
commit 698e880c9f03b3aaade13897de3498a5915ea8fd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 13 12:36:43 2004 +0000
* Tricky: make sure that the accessor count is not reset to 0 if
recovery fails.
commit 23fbc72f5d65725dd1804efe695aaa84580a8637
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 13 11:53:12 2004 +0000
* Print error messages, not debug messages.
commit 4c4fe7a114968a9c7accd86499f029314530f44c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 12 10:44:48 2004 +0000
* Changed the extension for store expressions from ".nix" to ".store"
(following the Usenix paper).
commit 46a71c857c617b5acbf3d1fdb8fb7e676a4881a2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 9 14:18:28 2004 +0000
* Option `--force-realise' in `nix-store --query'.
commit 30b31a8f6190dad40ca972b445420e10f47a9afc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 8 16:56:40 2004 +0000
* Start of nix-env reference.
* Some CSS tweaks.
commit b5942155314ea4b479fabde6ce236866f5ef4b97
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 8 15:01:37 2004 +0000
* Manual updates.
commit 5346536b626a047d53f9c44d6562cfaeffe27f14
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jan 8 10:45:23 2004 +0000
* Include version number in manual.
commit 7959354379416bd8513cb00e636c0310e42eaa01
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 7 15:53:14 2004 +0000
* Upgraded to Berkeley DB 4.2.52. The main advantage of 4.2 is that
it automatically removes log files when they are no longer needed.
*** IMPORTANT ***
If you have an existing Nix installation, you must checkpoint the
Nix database to prevent recent transactions from being undone. Do
the following:
- optional: make a backup of $prefix/var/nix/db.
- run `db_checkpoint' from Berkeley DB 4.1:
$ db_checkpoint -h $prefix/var/nix/db -1
- optional (?): run `db_recover' from Berkeley DB 4.1:
$ db_recover -h $prefix/var/nix/db
- remove $prefix/var/nix/db/log* and $prefix/var/nix/db/__db*
commit abe8c8c2aa24646955b78cd2c826483d8d8a1149
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jan 7 10:59:38 2004 +0000
* Include images/ in distribution.
commit 1ff986d51a4fc7f77a80f5c23351f9d2cbb26550
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 6 16:38:32 2004 +0000
* book -> manual
commit 2f0b93904bf88e9d2bf9d623b35991dd6dd0c521
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jan 6 16:35:07 2004 +0000
* Install images.
commit 4a373a3e9ac07a2d4c43d495c0a44883106ecfde
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 5 16:26:43 2004 +0000
* Implemented Eelco V.'s `nix-env -I' command to specify the default
path of the Nix expression to be used with the import, upgrade, and
query commands. For instance,
$ nix-env -I ~/nixpkgs/pkgs/system/i686-linux.nix
$ nix-env --query --available [aka -qa]
sylpheed-0.9.7
bison-1.875
pango-1.2.5
subversion-0.35.1
...
$ nix-env -i sylpheed
$ nix-env -u subversion
There can be only one default at a time.
* If the path to a Nix expression is a symlink, follow the symlink
prior to resolving relative path references in the expression.
commit f83c5e3e5f3e6b33c095d6559a4b3cd5922e88ce
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jan 5 11:18:59 2004 +0000
* Implemented Eelco V.'s `-p' command to switch profiles. It switches
the symlink ~/.nix-userenv to the given argument (which defaults to
.../links/current). /etc/profile.d/nix-profile creates this symlink
if it doesn't exist yet. Example use:
$ nix-env -l my_profile -i foo.nix subversion quake
$ nix-env -p my_profile
I don't like the term "profile". Let's deprecate it :-)
commit 0e68af0ce380b09c14ff36084499c0d8a6590b25
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 2 16:09:59 2004 +0000
* RPM sucks.
commit 9ff365709541b8f50fddcf667ded07a5b9f774de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 2 16:04:53 2004 +0000
* Generate RPM spec file.
commit 0e09cc12c08ad2db0b8620ca537bd81ca45c05df
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jan 2 14:58:25 2004 +0000
* Add $prefix/store to the RPM.
* Allow extra flags to be passed to RPM.
commit 94175e978a87a79f3362879898dc1cf7d08d7791
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 30 20:09:00 2003 +0000
* RPM spec file.
* Respect DESTDIR variable.
commit 68f2fadb788f8d401fad6fd1db1cfac283e5e337
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 23 22:15:12 2003 +0000
* nix-pull requires libexecdir to be substituted.
commit 392b7e0f8ecd50f98017021253386714f0771752
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 23 22:13:36 2003 +0000
* Fixed a bug in the upgrade operation.
commit 833f2fc92da8d31c62eb35dae8b3861829a1383a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 22 16:40:46 2003 +0000
* GCC 2.95 compatibility.
commit cf0287c09e8b5816c65dd265c4ef167865d70172
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 22 16:04:00 2003 +0000
* Upgrade operation in `nix-env'. For instance, you can say
nix-env -u foo.nix strategoxt
to replace the installed `strategoxt' derivation with the one from `foo.nix', if
the latter has a higher version number. This is a no-op if `strategoxt' is not
installed. Wildcards are also accepted, so
nix-env -u foo.nix '*'
will replace any installed derivation with newer versions from `foo.nix', if
available.
The notion of "version number" is somewhat ad hoc, but should be useful in most
cases, as evidenced by the following unit tests for the version comparator:
TEST("1.0", "2.3", -1);
TEST("2.1", "2.3", -1);
TEST("2.3", "2.3", 0);
TEST("2.5", "2.3", 1);
TEST("3.1", "2.3", 1);
TEST("2.3.1", "2.3", 1);
TEST("2.3.1", "2.3a", 1);
TEST("2.3pre1", "2.3", -1);
TEST("2.3pre3", "2.3pre12", -1);
TEST("2.3a", "2.3c", -1);
TEST("2.3pre1", "2.3c", -1);
TEST("2.3pre1", "2.3q", -1);
(-1 = less, 0 = equal, 1 = greater)
* A new verbosity level `lvlInfo', between `lvlError' and `lvlTalkative'. This is
the default for `nix-env', so without any `-v' flags users should get useful
output, e.g.,
$ nix-env -u foo.nix strategoxt
upgrading `strategoxt-0.9.2' to `strategoxt-0.9.3'
commit f3c978384698a0b9b0f5dee41f98e6208f269347
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 21 23:58:56 2003 +0000
* Version numbers can be omitted in install/uninstall. E.g.,
nix-env -i foo.nix subversion
The version number part of a derivation name is defined as everything following the
first dash not followed by a letter.
commit a81b621202844f58ae7202e592324f1232107810
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 21 22:34:41 2003 +0000
* `-u' -> `-e'.
* `--link' / `-l' flag to specify the switch symlink to use (by default,
/nix/var/nix/links/current).
commit 0a753e182aa0f50ea7062f2d9e02306b34266e37
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 21 22:02:58 2003 +0000
* Oops.
commit df7a718786c83e1eca908864820bb05ab964c451
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 21 21:57:09 2003 +0000
* Man pages in sections.
commit 397c8ba898a522512ea56a3d2ae78dedda01bd77
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 21 21:56:54 2003 +0000
* Missing semicolons.
commit 528f1d1867de8b653eed516f8448096d7d138978
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Dec 21 17:09:16 2003 +0000
* Bug fix: parallel builds of the same derivation failed due to lock file removal.
commit 06c5a7075d85636ba1fedce1fc5b131cdcffd5f8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 5 11:25:38 2003 +0000
* Refactoring: put the manifest-reading code in a separate file.
commit cff6fd22ebfbfdbbda9b30c68cb61e25db718147
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Dec 5 11:05:19 2003 +0000
* Allow successors that don't exist but have a substitute.
* Integrity: check in successor / substitute registration whether
the target path exists or has a substitute.
commit feaab52203a51a4abec23f5d878f6f4dea29dcd5
Author: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Thu Dec 4 14:38:31 2003 +0000
* Fix for too long command lines when calling `nix-store
--register-[substitutes|successors].
commit 00d4f907e1b9bfab0c51a4459d5f0e6a105fc1d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Dec 3 09:33:03 2003 +0000
* Get rid of the icons in warnings etc.
commit 31fd72ee1722e10dac4e3f4f55f8270ffd1ba22d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 2 16:29:41 2003 +0000
* Epigraph ;-)
commit 16d971bce70a2b3aab1d3c60101e00f264159c07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 2 15:36:49 2003 +0000
* A nice stylesheet for the manual.
commit 0d3a1a8582a7b0120e35c507165db6d02ceea258
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 2 12:37:37 2003 +0000
* Add missing files to `make dist'.
commit 0c804c677543350a2f80206a4f47adc9b7d460e3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Dec 2 10:21:40 2003 +0000
* Regression fix: query flags (e.g., "-qsf") were broken.
commit a3ca74a1c34d68c94fb3c723fb75f3f27f81e2a9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 1 16:34:35 2003 +0000
* Bug fix in nix-push.
commit 078e20885e0805e04669f9b334a516a6d8d12763
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 1 15:55:05 2003 +0000
* Help text for all (non-script) programs, so no more:
$ nix-instantiate --help
error: unknown flag `--help`
Try `nix-instantiate --help' for more information.
:-)
commit 905d5b91fa6fa64e549f9019f9fab4150f00c13a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 1 14:52:51 2003 +0000
* Manual fixes (thanks to Merijn).
commit 83ffd4f282ea78c77c69f6b0719daa87fdc20efc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 1 14:40:24 2003 +0000
* Fix `make check'.
commit 5d2b424804ec93567ddf15639f84c4098d80f659
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Dec 1 14:36:50 2003 +0000
* Use a system name that does not include the OS manufacturer (i.e.,
"i686-linux" instead of "i686-suse-linux").
commit dc05f29cf6e1c5ee557441951116ee3fb35e0e00
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 27 14:58:32 2003 +0000
* Manual updates.
commit 7b0e29b4dc42946b64fc3d616caa33ae442d94c6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 16:09:27 2003 +0000
* Overview of nix-env. Recommended reading. :-)
commit 62d9b31d0a86fc0fc5b198e4d46722573432918c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 14:25:39 2003 +0000
* Updates.
commit f6a30ab264506ca966180666dff45310d176659d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 12:30:16 2003 +0000
* Updates.
commit 2a4bac5459f42764b39ac70f906f5dd3330a3ac5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 11:24:13 2003 +0000
* Refactoring.
* Convert tabs to spaces.
commit bd0ce1a4be6612cf53d9d31f1cbe1b25085ccf75
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 10:47:54 2003 +0000
* Minor fix.
commit 80f8c38384605f99ac43bdd3ae637e72996ca2da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 10:41:59 2003 +0000
* Typo fix.
commit c38ba181ede6b46f28d5a70bf0243bcd003f943b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 26 10:41:21 2003 +0000
* Configure flags to specify the location of the DocBook DTD / stylesheets.
commit 4da9316c8fa576cad77bf398785765e165f6865c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 16:49:23 2003 +0000
* Use svn-revision to construct package version.
commit 6d5877ea122f1d8aede4f9b9d2ac247d1b896093
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 13:43:48 2003 +0000
* Use --nonet flag to prevent fetching of DTD.
commit 12e805cfb032e403e4dd6f410b7e3f24bbc89a98
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 13:06:12 2003 +0000
* Don't hardcode the path to the DocBook DTD/stylesheets.
commit ba73f94b3bba9c19726443556b0124fe63dccee6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 13:03:48 2003 +0000
* Another fix.
commit 66c115ef5faabb1bcd47ac0d375aeee39b300c43
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 13:01:21 2003 +0000
* More `make dist' fixes.
commit c3ee8c9166e32031a61c397594be4aef127862d4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 12:35:52 2003 +0000
* `make dist' fix.
commit 6e8c19714af00b8340eea6eecf1c38fc6b09f6de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 25 12:05:48 2003 +0000
* Allow integer bindings in derivations.
commit d1d87badf6d07c9d319c555593be5c6d0bd08bb4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 16:38:46 2003 +0000
* Bug fix. Hmm, I thought I'd fixed this before :-|
commit 604c45e960f27be9e26e44dbc85fa0f00a097670
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 12:10:16 2003 +0000
* Autoconf sucks.
commit e7ea52d3b336e6336c801eb8f868c0b8dd464910
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 11:11:40 2003 +0000
* One-click installation :-)
The script nix-install-package takes a `Nix package file' (which
contains one or more derivations, along with URLs of Nix caches),
unpacks it, pulls the caches, and installs the derivations in the
user's environment.
For best results, associate the command `xterm -e
/nix/bin/nix-install-package' with the MIME type
`application/x-nix-package' and visit
http://losser.st-lab.cs.uu.nl/~eelco/test/.
commit b8572678930568efcf0b44523e6a2a65afef7c43
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 11:01:19 2003 +0000
* Allow the top-level expression to be a derivation.
* Hack: `nix-env -i *' installs all available derivations.
commit 496934a99ce509ac94a99a938d7d79d1b38461ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 09:25:08 2003 +0000
* Fix nix-pull.
commit c9cb1fa21f4454a214f4cd62aef2ccc35a8f89af
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 09:24:52 2003 +0000
* Bug fix in path invalidation.
* More consistency checks.
commit 60e86b124f09763b1f0f55fc4c635a255bd028d2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 24 08:20:49 2003 +0000
* Get rid of tab characters.
commit af7e6fe22e8db606eb92c044140c00e6d8fe61cc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 22 21:12:36 2003 +0000
* Don't use a hard-coded path.
commit 9486dda1152d18b502fc31ff1d6aed4eba6f2fe3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 22 20:39:51 2003 +0000
* Fix nix-push.
commit ab0bc4999a49efbc8e1c25989662a96e32fa0cc5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 22 18:45:56 2003 +0000
* Maintain integrity of the substitute and successor mappings when
deleting a path in the store.
* Allow absolute paths in Nix expressions.
* Get nix-prefetch-url to work again.
* Various other fixes.
commit 40d9eb14dfb842c51e9f86818b43ae7711e1a5d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 22 15:58:34 2003 +0000
* Fix the garbage collector.
commit 7a02d954186d6ba1ea41d9917d63f9fab84736b3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 21 16:05:19 2003 +0000
* Remove lock files after building.
commit 06208d1d8677eaea1fb56dd09832f43154bbab5d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Nov 21 14:23:18 2003 +0000
* Uninstallation.
commit 2e9042bd1e7e3a322f072f0bf98510698afa626a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 20 13:48:48 2003 +0000
* Uninstall command (doesn't work yet).
commit e0b5a492f537cacee7eadc47f44817908a0ab05a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 21:32:03 2003 +0000
* Installation: add the previously installed packages. Switch to the new
configuration.
* Status queries.
commit 9898746ef3732979bf30e9048021b6232ddf15ac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 17:27:16 2003 +0000
* nix-env: a tool to manage user environments.
* Replace all directory reading code by a generic readDirectory()
function.
commit fd7ac09f1073179d9ac439c3e9fb12a1bf00a7d5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 12:03:01 2003 +0000
* Refactoring (step 2).
commit ac68840e79ce74f05ee8b31bb1d528c98b9c7f76
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 11:35:41 2003 +0000
* Refactoring: put the Nix expression evaluator in its own library so
that it can be used by multiple programs.
commit 2be8b5917a8040fac72e7970e94bbb436e8c35d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 19 10:04:03 2003 +0000
* Use `sdftable -s' to get warnings about the grammar.
* Several bug fixes in the grammar.
* Allow one-line comments (#... and //...) to end in EOF.
commit 38946e1378d50cf2921c509635e2119216fc9b0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 12:07:39 2003 +0000
* Forgot this one.
commit dfc9c64ead7f24d51ed1a232e4b3ecafa8384f2e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 12:06:07 2003 +0000
* "Fix expression" -> "Nix expression".
* More refactoring.
commit b1117ef29d35822647bda32f8cd3887f4f6eaede
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 11:38:25 2003 +0000
* nix -> nix-store, fix -> nix-instantiate.
commit ce92d1bf1434562f5b80320c503768c4d06f1f8d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 11:22:29 2003 +0000
* "Nix expression" -> "store expression".
* More refactoring.
commit 9f0f020929c9e093405cc6193d2f227cab763912
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 10:55:27 2003 +0000
* libnix -> libstore.
commit 8798fae30450a88c339c8f23d7e0c75f5df2ef1c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Nov 18 10:47:59 2003 +0000
* Source tree refactoring.
commit 45610ae675f6f8d6ecbd48c495cb7012b143d531
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 16 18:31:29 2003 +0000
* An forward non-random access input iterator class for ATermLists.
commit 3e5a019a070cbaac7d1248e208c66da9fdb23313
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 16 17:46:31 2003 +0000
* Some utility functions for working with ATerms.
commit 06ae269c7c5cdda32072f3f00cf644e540ba12cd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 10 11:00:38 2003 +0000
* Do not filter when parsing. This is much faster.
* Add some rejections and lexical restrictions to the grammar to make
this work.
commit 15801c88fad38253b19ac2ea77e7597deab5fd6b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 9 10:35:45 2003 +0000
* Turned the msg() and debug() functions into macros, since they
turned out to be a huge performance bottleneck (the text to printed
would always be evaluated, even when it was above the verbosity
level). This reduces fix-ng execution time by over 50%.
gprof(1) is very useful. :-)
commit d2e3a132fe6796b2ac038ccb20e7aa32afc1a85f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 9 10:31:56 2003 +0000
* Pass CFLAGS to the subpackages.
commit 90e26d392c7ac4c2a69163f881f73916e6fba3c1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 6 15:24:31 2003 +0000
* Allow null in derivation bindings.
commit cfaea07444a0011aa7d91ce1bcc8f105b8f283fa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 6 14:41:49 2003 +0000
* `null' is a nullary primop.
commit 569e7940f878f27b0fb9d3c8e8abfc29f3379103
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Nov 6 14:41:29 2003 +0000
* Allow `+' in path names.
commit fa18f1f184ba89b3dfe592e77a276da42d326f42
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 5 16:27:40 2003 +0000
* Assertions.
* Logical operators (!, &&, ||, ->).
commit e17e95a82892b31c8063f2ace1b21c79e82e6f6d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 5 16:20:57 2003 +0000
* Print a shared textual ATerm if the term if very large. Due to
substitutions, Fix terms are very large when printed as trees (in
memory, they are quite compact due to sharing).
commit 80bb477cc4ea5226ae760726730b3e09d21559de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Nov 5 15:34:12 2003 +0000
* Default function arguments.
commit 0690c1c9c01dd5889dbfccf2da6cb99f5c4e151b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 3 20:30:40 2003 +0000
* Work around problems with the ATerm library.
The ATerm library doesn't search the heap for pointers to ATerms
when garbage collecting. As a result, C++ containers such as
`map<ATerm, ATerm>' will cause pointer to be hidden from the garbage
collector, causing crashes. Instead, we now use ATermTables.
commit ff3132427839888933c3779844bf35ca9e189cb9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 3 18:21:53 2003 +0000
* Ignore options passed to the aterm library.
commit e2655aa332a33b56d9168928511a598fc9b0c1e6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 3 11:59:35 2003 +0000
* Shorter list syntax ([a b c] instead of [a, b, c]).
commit ad0976f8d5f2afbca4e2fe6cbb3d2c2e53760222
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Nov 3 10:21:30 2003 +0000
* Grammar changes. Attributes in attribute sets are now delimited with
semicolons instead of comma's. Final semicolon in the set is optional.
commit 40986312bb00f0101a6634db42080daee03f887b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 2 17:36:15 2003 +0000
* Boolean constants.
commit adf9a45469f55258446d383333aa2ca79cfb0536
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Nov 2 16:31:35 2003 +0000
* Primops: baseNameOf, toString.
commit c8268ca9917061466a3448028ea524d9842e1ac9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 1 23:29:02 2003 +0000
* Fast builds.
commit 7de1b2a6980f71cfbf36f7250e247f6eafd763d9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 1 21:11:52 2003 +0000
* Print the exit code of the builder.
commit 16104446712acf7e381039199eaf39dfa0fcea35
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 1 19:15:08 2003 +0000
* Conditions, string equality.
commit 1b4184ccbb01634792897d3412c489b989674567
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 1 19:10:41 2003 +0000
* Let syntax.
commit a2a9bacd8296ed1ddb6105b649a062fe65c27759
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Nov 1 19:10:19 2003 +0000
* Filter the substitution list when descending into a recursive
attribute set.
commit 449411e5113084da323d265f1b1313d9a5ca64aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 31 19:20:03 2003 +0000
* Typo fix.
commit 9210d4d530b68b5f19ac7062f129c88ccdc03e04
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 31 17:09:31 2003 +0000
* Working evaluator.
* Mutually recursive attribute sets.
* Print evaluator efficiency statistics.
commit f1c1a3c97f1dc81b2d9b19f58589b4b8a5ed196e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 31 12:21:01 2003 +0000
* Allow empty attribute (argument) sets.
commit 7db08cc9244c374903180c8e816ecf81f6ff1d79
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 31 11:22:56 2003 +0000
* Use SGparseString() instead of SGparseFile() because the latter is
buggy. It fails to clear an internal variable (SG_textIndex)
between invocations, so it can be called only once during a program
execution.
commit 403cb9327f5c298cb6a85a87241962df4a90857b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 30 16:48:26 2003 +0000
* Factor out evaluation into a separate file.
commit 9f8f39aa3cdb54532a85e41f14985fc6a530fb36
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 30 16:18:40 2003 +0000
* Clean up the imploded parse tree. Quotes around strings are
removed, paths are absolutised relative to the path containing the
expression we just parsed, and integer literals are converted to
actual integers.
commit e537844f4ebc53df13f52722fb16bbeb1f4cbd18
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 30 16:11:24 2003 +0000
* Bottomup rewrite function.
commit 442b09ea33dcf516a6f5244ed2c362682e1347b0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 30 16:10:56 2003 +0000
* Don't use a search path.
commit 933b3f677d0338b264d4e758f8932bb7f2454c46
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 30 16:10:20 2003 +0000
* Attribute selection operator.
commit b95a3dc45bcbbe8a0985bab82146ed00afcf0239
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 29 16:05:03 2003 +0000
* Basic grammar and parser for the Fix language. We use libsglr and
friends to do the parsing. The parse table is embedded in the Fix
executable using bin2c, which converts an arbitrary file into a C
character array.
commit 4d728f6a36c83ff684426788df775b385fae9e88
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 29 15:05:18 2003 +0000
* Forked new version of Fix.
commit f31661a3b593a15fe061bb398f1814d9c37902a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 29 15:04:50 2003 +0000
* Add sdf2-bundle to externals.
commit 7102455cba5ceb13e7f3558716ee0a49fff1c58f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 27 18:43:09 2003 +0000
* Don't cache the manifest.
commit 92eea8fc4e7a2e4d6d0dda604ecd22c60367b76e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 23 10:51:55 2003 +0000
* Fix a race condition in addTextToStore().
commit c4e7d324b826d1197a90bf7f4f4b593e406e1087
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 22 13:29:40 2003 +0000
* Use writeFull().
commit 9d95aafe8ccf9d037dc97bb875bc62b919d8b123
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 22 11:04:57 2003 +0000
* Ad hoc per-package logging. When Nix performs a derivation, it now
writes stdout/stderr of the builder to ${prefix}/var/log/nix/x,
where x is the file name of the derivation expression, e.g.,
/nix/var/log/nix/54256391624be04fcb426048ae3ea0a4-d-pan-0.14.2.nix
Note that consecutive builds of the same expression overwrite,
rather than append to, existing log files.
commit 143427f90b9b54bd957cd50a2110157ddfedeeaf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 22 10:53:46 2003 +0000
* Dead code removal.
commit 4a8948b7a60e751dd809f279f1baa434ea09a4d3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 22 10:48:22 2003 +0000
* Some wrapper classes to ensure that file descriptors / directory
handles are closed when they go out of scope.
commit c62433751d5fce8c25a802989c50fee993f39c2d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 20 10:05:01 2003 +0000
* Finished refactoring the tree.
commit 53e376d836133a660223198c7bb8308fb912375e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 20 09:20:11 2003 +0000
* Refactored the source tree.
commit 0eab306466fdb186c692521dd1f2b949e56c54da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Oct 20 09:08:44 2003 +0000
* NarPath -> NarName.
commit a0a7a4e0875c2cfdd2895bb1b4a16c998cde576e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 19:24:04 2003 +0000
* Remove some debug output.
commit 0791282b2f42313c94dd9bc85b24428e585cd099
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 16:29:57 2003 +0000
* Substitutes and nix-pull now work again.
* Fixed a segfault caused by the buffering of stderr.
* Fix now allows the specification of the full output path. This
should be used with great care, since it by-passes the normal hash
generation.
* Incremented the version number to 0.4 (prerelease).
commit ab5e8767fafb2d62213e3f1558ead2882bc65c05
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 13:13:39 2003 +0000
* Get nix-push to work again.
* Fixed svn:ignore on externals/.
commit c78bf115248f62fa355e7a9b2b9532b37e693085
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 11:55:37 2003 +0000
* Enable buffering of stderr in C++.
commit f7c7aad1351a0ed58f458e485968af498d542b5b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 08:52:44 2003 +0000
* Upgraded to Berkeley DB 4.1.25 and do not synchronously flush the
log on commit. This means that there is a small change that some
transactions may be rolled back in case of a system crash, but this
should not be a problem (it merely might cause some expression
realisations to be rolled back), and it vastly improves performance.
* Upgraded to ATerm 2.0.5 (which also includes Armijn's 64-bit
patches).
commit 181aa3dc4198d2e2cfa89d3ebb53a96fa567e12f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 16 08:06:19 2003 +0000
* Don't sort the result of `--query --list'.
commit ebff82222c7b946e70e539389c0027529b6c7ad0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 15 12:42:39 2003 +0000
* Refactoring: move all database manipulation into store.cc.
* Removed `--query --generators'.
commit 5fc71276430e8e6a4588fa54da692f81d5ada585
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 15 10:34:50 2003 +0000
* Keep sources (derivation expression) by default, `--no-source' to
override.
commit c190f051ac34b2df51402bf593150de97f491d86
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 14 15:33:00 2003 +0000
* Automatically recover the database in case of a crash.
commit 1d61e473c88568fae7ef5edebc77acd53e4126f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 10 15:25:21 2003 +0000
* New query `nix --query --predecessors' to print the predecessors of
a Nix expression.
commit 0abe185688aa19c9ca87c9d22e24a54b4b359969
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 10 15:14:29 2003 +0000
* `nix --verify': check and repair reverse mapping for successors.
commit d3d5e77810cca11cca95bbb6f0f5e15d23f31eea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 10 14:46:28 2003 +0000
* Reverse mappings for the successor and substitute mappings.
commit 1eb4da156cca1b1981ab1f60bb9797ed1e93101a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Oct 10 13:22:29 2003 +0000
* Performance improvement: don't register already registered terms,
thus greatly reducing the number of db transactions.
commit 08b7319f5bca01f46916faaec0f9de420404a5ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 9 15:38:31 2003 +0000
* Follow successors by default (use `--no-successors' to override).
commit 6409c215e56cbcd10177edf358f7d0702d687099
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 9 15:37:20 2003 +0000
* Fixed nix-switch.
commit 6baa2c442035fb06652a7fad9d51df1ce41c05f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Oct 8 15:06:59 2003 +0000
* Get rid of identifiers since they are redundant now. This greatly
simplifies stuff.
* The format of Nix expressions and the database schema changed
because of this, so it's best to delete old Nix installations.
commit b9f4942bd2f8aae44db6caa5a4ebe5680880fec2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 7 14:37:41 2003 +0000
* string -> Path.
commit 5d4171f7fb548e06ecd2440f57322b3c77f1074e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Oct 7 12:27:49 2003 +0000
* Synchronise terminology with the ICSE paper (e.g., slice -> closure,
fstate -> Nix expression).
* Fix src/test.cc.
commit 563afb7fcc9d6aabec9b867372ea8d651fd12e89
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 2 15:48:47 2003 +0000
* Use passive FTP in wget.
commit e78f753aa830e795fcb05920f30b0bd6d04bed0e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 2 12:22:19 2003 +0000
* Include the right files in a distribution.
commit 4193d62e08964e2c26b27674e33327bf0417bab5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Oct 2 11:55:38 2003 +0000
* Nix now respects $TMPDIR for the creation of temporary build directories.
* Retry creation of a temporary directory (with a different name) in the
case of EEXIST.
commit 6d478597c7672efc546b6720c8404ffb5f998612
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 24 08:40:40 2003 +0000
* Argggg...
commit 9fb94f4f2f33b8fe26e4842558a13c6c62e6eded
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 24 08:39:49 2003 +0000
* Forgot a file.
commit 9ba2397ea971aba101235413afe27518e0b7a2ba
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 24 08:28:04 2003 +0000
* Added missing files to `make dist'.
commit 41730f57798a9acba1fa07397cb06ba6a260ea70
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Sep 23 14:26:58 2003 +0000
* Put the SVN revision number in the version string.
commit 1c7d6bf5fcddae13b6226d61fe60cfccb8d2c359
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 11 10:23:55 2003 +0000
* Removed references to char_traits so that boost/format also works on
GCC 2.95.
commit d930a9bc5a69b33dc7fe707838ccdd72e89f8079
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Sep 11 08:31:29 2003 +0000
* Added some missing #includes.
commit 803a924b77730f6f7e04dde0cbfda2522f06a2b1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 3 14:49:58 2003 +0000
* Make nicer dot graphs. Also show the inner structure of slices.
commit c0bbed0959665bc51909b285654db2a3cf120502
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Sep 3 11:20:18 2003 +0000
* Factored out dot graph generation into a separate file.
commit 0d2bc686817306502b71f5ca2cd49cb1d501247c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 29 13:12:30 2003 +0000
* Do not show the output of the builder unless the verbosity is at
least at debug level (-vvv). The output is still appended to the
build log in /nix/var/log/nix.
commit 25304af72ed5c8fd50aa1da01c5872567ebe6ba2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 28 10:51:52 2003 +0000
* Set a path.
commit b0185173147c3eb629cc6b996459cf6ce2d608fe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 28 10:51:14 2003 +0000
* Do not try to remove write permission from symlinks, since chmod()
follows symlinks. (Note that the permissions on symlinks are
ignored anyway.)
commit c4f1f49574b4fe55bef7952bd0fcc2bd626b0db2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 28 10:10:12 2003 +0000
* nix-push generated invalid (old-style) slices.
* nar.sh needs a path.
commit 31be53cd0a50ef9e3ddf64f79222e8e8dd1d05aa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 14:56:11 2003 +0000
* Fix the atrocious (exponential? factorial?) time complexity in
`nix --query --requisites'.
commit 920193beb1a7b8894d100c63adadf00ad855dd64
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 25 14:36:04 2003 +0000
* Don't continue when the call to nix fails.
commit a88144215c263e62528108dfae1e781058344ef2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 22 20:12:44 2003 +0000
* Remove write permission from output paths after they have been built.
* Point $HOME to a non-existing path when building to prevent certain tools (such as
wget) from falling back on /etc/passwd to locate the home directory (which we
don't want them to look at since it's not declared as an input).
commit 56b98c3857b89d4f81f0127c53cfce6d8e48a71f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 22 11:29:20 2003 +0000
* Some work on the introduction.
commit 956801fcc2ac75fd4041f61619451d2935fa2598
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 20 14:11:40 2003 +0000
* Use maps and sets in the FState data type. This ensures normalisation of
slices and derivations w.r.t. order of paths, slice elements, etc.
commit 624c48260f1b4eec86daa0da5f33d4cbb963a361
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 20 12:39:56 2003 +0000
* Change the abstract syntax of slices. It used to be that ids were used as
keys to reference slice elements, e.g.,
Slice(["1ef7..."], [("/nix/store/1ef7...-foo", "1ef7", ["8c99..."]), ...])
This was wrong, since ids represent contents, not locations. Therefore we
now have:
Slice(["/nix/store/1ef7..."], [("/nix/store/1ef7...-foo", "1ef7", ["/nix/store/8c99-..."]), ...])
* Fix a bug in the computation of slice closures that could cause slice
elements to be duplicated.
commit 710175e6a0f737f108e802d6b0c3de0af04e500c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 20 11:31:15 2003 +0000
* Bumped the version number to 0.3.
commit ed0db2e0d80ac538fbb1f9869922be4fbf7bfeab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 20 11:30:45 2003 +0000
* Fixed a serious bug in the computation of slices. Sometimes the slices
would not be properly closed under the path reference relation.
commit 1472cc482503a39d173b5dcd34686fd6c3c644d6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 19 13:07:38 2003 +0000
* Pipe /dev/null into stdin.
commit 2de850479101e5a378c87d1392ea03c63ce224cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 19 09:04:47 2003 +0000
* Delete the temporary directories of failed builds by default, and an
option `--keep-failed' to override this behaviour.
commit 31e4aa64396858e3b6ef8477397c84cbd80670fc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 18 16:32:55 2003 +0000
* Allow lists in package bindings, e.g.,
("srcs", [Relative("foo/bar.c"), Relative("foo/baz.h")])
The result is an environment variable that contains the path names of the
inputs separated by spaces (so this is not safe for values containing
spaces).
commit ebbb6ce578ab383bec7a61c364d2be27c0bad22f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 18 14:54:54 2003 +0000
* Most shells initialise PATH to some default (/bin:/usr/bin:...)
when PATH is not set. We don't want this, so fill it in with
some dummy value.
commit c32e01eab2363085160bfebc2d9ab506d265c7e4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 18 08:52:49 2003 +0000
* Revision 300!
* Put `@' in front of echo's in the Makefile.
commit 08f9cfe267934dac5a7da869e9ebadf215220217
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 18 08:35:16 2003 +0000
* No longer automatically download Berkeley DB / ATerm.
commit 96c7b98bf0f852d7afee9251c4ce9492310e6a87
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 15 13:01:45 2003 +0000
* Argument support in Fix. Arguments can be passed through the
builder using the `args' binding:
("args", ["bla", True, IncludeFix("aterm/aterm.fix")])
Note that packages can also be declared as inputs by specifying them
in the argument list.
commit 555347744d116b0152a04d4fdb08258276d34199
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 15 12:32:37 2003 +0000
* Derivation expressions now can specify arguments to be passed to the
builder. Note that this unfortunately causes all Fix-computed
hashes to change.
commit e374dbf89b0ba9a4f5835ef9ac30eda6df1dce6a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 15 10:13:41 2003 +0000
* A script `nix-prefetch-url' to fetch a URL, place it in the Nix
store, and print its hash.
commit 01e30360d46ce940d8b83f4ff7a71e8464c1422b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 15 09:39:33 2003 +0000
* Don't use a temporary file.
commit 163db7367fb45955069b46014e60224b1bc037b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 15 09:21:19 2003 +0000
* Fix can now read expressions from stdin (by saying `fix -').
commit 161aab582bb3d794414c0275ff8216292f85ab5c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 18:24:40 2003 +0000
* Use a catalog when calling xsltproc.
commit a24cb1936141981c3b3d5cd30433bb1e57d7dc76
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 18:17:02 2003 +0000
* Use xmllint instead of nsgmls to validate the manual.
commit 9ee3b7a37a658dc5d3d1831e4155629e18a866f4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 12:37:50 2003 +0000
* Function application test cases.
commit dc0ef2ca98ddf21586b68089d28df59ef3e756dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 12:37:31 2003 +0000
* Detect infinite loops using blackholing.
commit 2e16ff22ac6f3a4ea6684026a609856f29d86499
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 11:27:02 2003 +0000
* Fix man page.
commit 5cde23f8698e7cdde220f30504b339b7237fd5f2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 09:49:31 2003 +0000
* Function() takes a list of formals.
commit 0a2de7f543ac23b8576a232c0ecf6a5f49c1884a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 14 09:29:07 2003 +0000
* Lam -> Function. Doh!
commit 95b49f804456cf532e61478d7f604aed381173d7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 13 15:17:57 2003 +0000
* Manual updates.
commit 68022552d295e5a223b87a1a96814fd2586350ed
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 13 15:17:36 2003 +0000
* Put the pre-built manual and man pages in the tar distribution.
commit c34a153ae5614ab879ff19194ff396ffb21b7b55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 13 10:45:01 2003 +0000
* Documented the `--query' operation.
commit b4f88d0ec364f00196127ea29e8db5033368e23a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 13 09:13:52 2003 +0000
* Split the book.xml into several xml files.
commit 469f1eba561403639e777721cacd59e0a6cdc39d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 12 15:06:49 2003 +0000
* Documented some Nix operations.
commit e405ca506efa608c3636023a98994c05f09ecf0c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 12 13:54:42 2003 +0000
* Generate man pages from the manual.
commit c602930e08a508fce76b16f6f7f1fdfaed3b91ab
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 8 14:55:56 2003 +0000
* deletePath(): some operating systems (e.g., Mac OS X) don't like it
when we delete entries from a directory while we are reading it.
So read the directory into memory, then delete its contents.
commit 4b7b0bd12ca59f84b7adada64818086ece684447
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 7 15:27:14 2003 +0000
* Started on the introduction.
commit 74867e72f29f8850892bd30b9c5aa5272bc49d75
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Aug 7 14:17:18 2003 +0000
* Start of manual; installation instructions.
commit f8035d06f2031fb1bdf30eee82a1beb707bbe044
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 6 14:48:29 2003 +0000
* Allow a name to be given to a system configuration through `--name
NAME'. E.g., on the losser Subversion server, I do `nix-switch --name
svn $(fix ...)' to atomically upgrade the server (the SVN server
uses the Apache and Subversion installations in /nix/var/nix/links/svn).
commit 9ad39df2823ea11ac670dd3006ab2b8fcf73e6a8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 6 10:00:30 2003 +0000
* `==' is not a valid operator.
commit d551062ec4cf33b73df4e0d38671cbe6ca03abc5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 6 09:35:05 2003 +0000
* Scan for wget and use the full path in fetchurl.sh.
* Use nix-hash (not md5sum) in fetchurl.sh.
commit 236eb59293194071ac518c12d0cc6fe0a3f0ac5f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 6 09:34:04 2003 +0000
* Allow locks on paths to be acquired recursively (that is, if the
process is already holding a lock on a path, it may acquire the lock
again without blocking or failing). (This might be dangerous, not
sure). Necessary for fast builds to work.
commit 720f06e3b05502df2dc84afb7a3ad2ea5518246a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 6 09:06:32 2003 +0000
* A flag `--flat' to just compute the MD5 checksum of the contents of
a regular file. I.e., `nix-hash --flat' is equivalent to the
coreutils `md5sum' command (which doesn't exist on all systems).
commit 37483672d425bc3b7be8e1deb049fd04c80be0cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Aug 6 09:05:04 2003 +0000
* App -> Call.
* Allow booleans in package environment bindings (True maps to "1",
False maps to "").
commit d34b4d4f287a62de915a4bf75caf18d236e9b7e4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 13:05:30 2003 +0000
* Conditionals.
commit b9c9b461ea3a90d7344a76c072b1f9a3e9d77144
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 12:30:06 2003 +0000
* Made nix-push much faster.
commit 4ce652640b01c97d4df287cbc0ec6766a1438fd2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 12:29:47 2003 +0000
* Cache result of fstatePaths(). TODO: do this in fstore.cc.
commit fd30f52cfca861d109652b6ad5a533e5c108f3e9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 11:14:24 2003 +0000
* Made nix-pull much faster by performing all Fix instantiations at
the same time.
commit 17f05dba775bb95858d9ac60ab9a9abcbe88b2fc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 11:13:38 2003 +0000
* Allow the top-level expression to be a list of expressions that
normalise to Nix expression.
commit d6b6b2d3a83aa2afe3cae361954d8aa640fd77da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Aug 5 09:47:20 2003 +0000
* Delete obstructed paths prior to building.
commit d2e963f7a39cebcc4c937f9060763386d72ce4db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Aug 4 07:09:36 2003 +0000
* Path locking in addToStore() and expandPath().
commit c95b4ad2906ce4076f04e0969b7080c0589a8cea
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 1 15:41:47 2003 +0000
* In normaliseFState(), wrap registration of the output paths and the
normal form in a single transaction to ensure that if we crash,
either everything is registered or nothing is. This is for
recoverability: unregistered paths in the store can be deleted
arbitrarily, while registered paths can only be deleted by running
the garbage collector.
commit d99d04e6442dcc39a24cebac01af117ce00a5006
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 1 15:06:23 2003 +0000
* Defensive programming against POSIX locking idiocy.
* Simplified realiseSlice().
commit 545145cd582cd80b857760ec11bb5a91b6271506
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 1 14:11:19 2003 +0000
* normaliseFState() now locks all output paths prior to building, thus
ensuring that simultaneous invocations of Nix don't clobber
each other's builds.
* Fixed a bug in `make install'.
commit 9df93f30bda81ffa3cf040c146347e02d3a56666
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Aug 1 09:01:51 2003 +0000
* Don't use substitutes in addToStore().
commit 06434072e7860f2eaac9581e979801b7b3493a1e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 31 19:49:11 2003 +0000
* Put the database verifier in a transaction.
commit 06d3d7355d1b0ec05e61d2e7fe67f8d7153c1ff9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 31 16:05:35 2003 +0000
* Enclose most operations that update the database in transactions.
* Open all database tables (Db objects) at initialisation time, not
every time they are used. This is necessary because tables have to
outlive all transactions that refer to them.
commit 177a7782aee4c4789ad5377b5993bfa0b692282e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 31 14:28:49 2003 +0000
* Use a more reasonable log file size (256 KB instead of 10 MB).
* Checkpoint on exit.
commit 4a013962bdd08ee0cf285136e4eca0f2c9c76b98
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 31 13:47:13 2003 +0000
* Started using Berkeley DB environments. This is necessary for
transaction support (but we don't actually use transactions yet).
commit 758bd4673a3553fcbd78c8f895d6efe839d3d538
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 31 13:13:27 2003 +0000
* Set execute bit.
commit 9f4c19276d023433ea05f6cc3637b4327bd23fbe
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 31 13:13:13 2003 +0000
* Basic makefile.
commit 26ff1cdf89cae33918dfdef2027d135e099ed3b2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 30 14:40:46 2003 +0000
* A better test case for Nix race conditions.
commit 64c617e9840b820b1d2d3ce2dd86a95506013b56
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 30 14:40:18 2003 +0000
* Directories for the manual.
commit 2ac02440dc065d19e5bd00b9a0c538525e12909d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 30 13:35:46 2003 +0000
* Test cases for races.
commit aaee69cfdef287406715fb3befd7debd3a5c6ce9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 30 10:14:58 2003 +0000
* INSTALL_DATA -> INSTALL_PROGRAM to ensure that the execute bit
remains set.
commit 83075304e5639dcab3d386eb7813c73b97c67685
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 30 09:49:47 2003 +0000
* Don't make the builder executable.
commit 1cb030736ec1e844b3bfce32def3725c8a422a1c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 17:56:39 2003 +0000
* Bug: Fix does not allow empty names, so don't generate them.
commit a01629894db0d961622b06c9c691c7cc0fbedff0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 15:19:03 2003 +0000
* Use `--query --requisites' and include successors when pushing. Don't
use `--query --generators' anymore.
commit 40f32ae00ac60885e7c0d8dcb4522895cba8e550
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 14:42:14 2003 +0000
* Typo: if -> elsif.
commit 884646593488bfacd851bec72b7ac1a4841bf458
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 14:28:17 2003 +0000
* Get garbage collection and cache population to work *properly*.
Renamed `fstateRefs' to `fstateRequisites'. The semantics of this
function is that it returns a list of all paths necessary to realise
a given expression. For a derive expression, this is the union of
requisites of the inputs; for a slice expression, it is the path of
each element in the slice. Also included are the paths of the
expressions themselves. Optionally, one can also include the
requisites of successor expressions (to recycle intermediate
results).
* `nix-switch' now distinguishes between an expression and its normal
form. Usually, only the normal form is registered as a root of the
garbage collector. With the `--source-root' flag, it will also
register the original expression as a root.
* `nix-collect-garbage' now has a flag `--keep-successors' which
causes successors not to be included in the list of garbage paths.
* `nix-collect-garbage' now has a flag `--invert' which will print all
paths that should *not* be garbage collected.
commit dc14a3de46ee08a28158a886b6abba2c4144f6cd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 10:53:27 2003 +0000
* Nicer dot graphs.
commit 79ba0431db223c1c08b46e8f3d1819e3457f21a0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 10:43:12 2003 +0000
* `fstateRefs' now works on derive expressions as well. TODO: make
this more efficient.
* A flag `-n' in 'nix --query' to normalise the argument. Default is
not to normalise.
commit 5acb45446e756c023bcb6f052331181671580a5e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 29 09:45:03 2003 +0000
* Let `nix --install' print out the id of the normal form.
* Some minor refactoring.
commit ce5fd1cc12f678627163d532acd7dd4251758198
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 28 16:07:01 2003 +0000
* Do not set LD_LIBRARY_PATH; it breaks many things. E.g., SuSE's ssh
dynamically links against libdb4 (?!), due to LD_LIBRARY_PATH it picks
up our libdb4 instead of SuSE's libdb4, but our libdb4 uses another
glibc so loading barfs.
Instead, all packages should use rpaths to store library locations in
executables/libraries. The disadvantage is that overriding rpaths is
harder. (It is possible by invoking the dynamic linker directly, e.g.,
`/lib/ld-linux.so.2 --ignore-path LIST program args...' to ignore the
rpath for the libraries in LIST). It would be better to use DT_RUNPATH,
which is consulted by the dynamic linker *after* LD_LIBRARY_PATH but
*before* ld.so.cache and the system directories.
commit dec8fbc52bab9cc19ac97c422e79e40fa70c2b13
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 28 14:13:42 2003 +0000
* Check for the pthread library (db4 needs it on some platforms).
commit 949c4fa1a863a804bdf1f985b55d5259f18838ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 28 12:19:23 2003 +0000
* `nix --help'.
* `nix --query --graph' to print a dot dependency graph of derive
expressions.
commit f21b3419575eec2b5bbcc12b035f21c23d57e24d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 15:03:36 2003 +0000
* Fix message.
commit 5d7a20dac3c7fd728fa885dd8dab6e170b860db9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 14:31:39 2003 +0000
* Prevent spurious rebuilds of db/aterm.
commit 0a0c1fcb4d0e42577ac0c7ac23bd9b908ecde49f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 13:43:16 2003 +0000
* The `-v' flag no longer takes an argument; it should be repeated
instead (e.g., `-vvvv' for lots of output). Default is to only
print error messages.
commit 3b521bb1bd53479896de89e7a24938039f92aace
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 13:35:17 2003 +0000
* Do sync the database, since not doing so caused database changes not
to reach the disk at all. Looks like a bug.
commit 1a7468a57a11288a007c40d50ed28718d757a546
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 08:53:43 2003 +0000
* Debug levels. Use `--verbose / -v LEVEL' to display only messages
up to the given verbosity levels. These currently are:
lvlError = 0,
lvlNormal = 5,
lvlDebug = 10,
lvlDebugMore = 15
although only lvlError and lvlDebug are actually used right now.
commit b75719b98457c61857689ab135559a17034dd8ec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 24 08:24:32 2003 +0000
* Don't sync the database on close. This was killing performance.
(Of course, the real problem is that we open the database for
*every* operation; we should only open it once. And we should use
transactions.)
commit 39ce70025b59a545127d1ffdefa83b7cbfcd8be1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 23 15:53:34 2003 +0000
* Incorporated Berkeley DB and ATerm into the source tree.
* `make dist'.
commit 9202570f8c40f58f6444c2ec512104b305058977
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 22 20:02:33 2003 +0000
* libdb_cxx-4 -> libdb_cxx
commit e877c69d78fe75ae3531b3ed3cb4a4d7b390ccec
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 22 15:15:15 2003 +0000
* Substitutes now should produce a path with the same id as they are
substituting for (obvious, really).
* For greater efficiency, nix-pull/unnar will place the output in a
path that is probably the same as what is actually needed, thus
preventing a path copy.
* Even if a output id is given in a Fix package expression, ensure
that the resulting Nix derive expression has a different id. This
is because Nix expressions that are semantically equivalent (i.e.,
build the same result) might be different w.r.t. efficiency or
divergence. It is absolutely vital for the substitute mechanism
that such expressions are not used interchangeably.
commit df648c4967af7298fe55f75c7616e39e5b5e7d37
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 22 10:24:22 2003 +0000
* `nix --query --expansion' (`-qe') to get any path with content
corresponding to the given id.
commit d84931ee5607c152b4bc7eb23b7ab94ded9f85c7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 22:05:19 2003 +0000
* Changed nix-pull to match nix-push.
commit c7bdb76fe461e2335caeea01c16b39a2784fa506
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 21:34:56 2003 +0000
* Syntax fixes.
* When pushing, put the hash in the file name so that the
client can verify (proof-carrying file names?).
commit d5ee6f8700c7225a4ce34f6d92aae0d57bee3355
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 21:31:03 2003 +0000
* In `--query --generators', print out paths, not ids.
(There should really be a switch for this).
commit 2616e6a6f3f8c39e62071cf1c22cce5be90a1d9d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 20:58:34 2003 +0000
* Check for errors.
commit 9f4ad99e92096981c5dc9401aa241a2314078b47
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 20:58:21 2003 +0000
* Canonicalise path.
commit 249988a787d26046bf7b389594ff25029229e3d9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 20:07:12 2003 +0000
* Allow the output/expression id to be forced to a certain
value; this potentially dangerous feature enables better
sharing for those paths for which the content is known in
advance (e.g., because a content hash is given).
* Fast builds: if we can expand all output paths of a derive
expression, we don't have to build.
commit 49231fbe419d37717b0d951377fbfc9bf445dd55
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 14:46:01 2003 +0000
* Changes to the command line syntax of Nix.
* A function to find all Nix expressions whose output ids are
completely contained in some set. Useful for uploading relevant Nix
expressions to a shared cache.
commit 401452e57ae897d3e5829ed12bfcccac82548e91
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 21 08:55:49 2003 +0000
* Memoize the evaluation of Fix expressions to speed up computation.
commit 7984cfc7c18c85c5db42c5c7d57927b12c846ce0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 20 21:11:43 2003 +0000
* Argh, another short-write problem. Added wrappers around
read()/write() to fix this once and for all.
commit 667a6afb9dabcb3e5c851b910705b7eb1c87c9b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 20 19:30:53 2003 +0000
* Remove accidentally added file.
commit 6f1a0f948dc5a98f2efcdafb0fdde96bebbf90da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 20 19:29:38 2003 +0000
* Refactorings.
commit ab350eafd2c1a98ea98090fdb3bd9b7ae4f7336b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 18 07:42:57 2003 +0000
* Generate nar.sh, fetchurl.sh.
commit b3fc38bf6a407f962b83089b2e13cbc90dd53042
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 17 12:27:55 2003 +0000
* For debugging: `nix --verify' to check the consistency of the
database and store.
commit 71cc3ceae5c5dd97a0faa2dab3da3dd0c479b0b5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 17 11:25:14 2003 +0000
* Preserve the executable bit.
commit 54664b6fb74e964d70530d13e25459751d0c63fb
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 16 21:24:02 2003 +0000
* The write() system call can write less than the requested
number of bytes, e.g., in case of a signal like SIGSTOP.
This caused `nix --dump' to fail sometimes.
Note that this bug went unnoticed because the call to `nix
--dump' is in a pipeline, and the shell ignores non-zero
exit codes from all but the last element in the pipeline.
Is there any way to check the result of the initial elements
in the pipeline? (In other words, is it at all possible to
write reliable shell scripts?)
commit 335aa1c35d8835619b465df3f5629b435bac157d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 16 20:49:59 2003 +0000
* Doh!
commit 6822fd7bf472c9edc27c0e851f3efd67c2a99952
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 16 20:33:29 2003 +0000
* Bug fix: slices are transitive, so if we detect that an
input path is referenced in an output paths, we also have to
add all ids referenced by that input path.
* Better debug assertions to catch these sorts of errors.
commit 9d56ca219fb7af1c209458f81a8ce35a1b6afd28
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 16 20:00:51 2003 +0000
* Substitute fixes.
commit b9ecadee6e32eddac07d09a228f0dda2b340c7ac
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 16 11:05:59 2003 +0000
* Fix the -qr query.
commit c11bbcfd26e554ca044c1cce293097e4e87ef31e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 16 08:30:26 2003 +0000
* Fix self-referential outputs.
* Fix -qp query.
commit d41d085b771d0f87658fe22512178603b3a0c633
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 15 22:28:27 2003 +0000
* Get Fix and Nix to work again.
commit 7b3f44e05baa49b26dd7c1ed71265c6bbc946aa4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 15 21:24:05 2003 +0000
* The new normaliser now passes the unit tests.
commit f5b6fa5256efce5f7a963386cd16e441446f5746
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 15 16:28:54 2003 +0000
* Basic work on allowing derive expressions to build multiple paths.
This is not entirely trivial since this introduces the possibility
of mutual recursion.
* Made normal forms self-contained.
* Use unique ids, not content hashes, for content referencing.
commit 8898e86b4fe1ecf8b34a5cca2a7b9b38d395678c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 14 10:45:04 2003 +0000
* Get the garbage collector to work again.
commit 3509299aca833ed50faab146f985853255041cb2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 14 10:23:11 2003 +0000
* After building, scan for actual file system references as
opposed to declared references. This prunes the reference
graph, thus allowing better garbage collection and more
efficient derivate distribution.
commit 135b7d54db4e0ca56bda67946432fcf9d4f3ac5c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 13 21:43:57 2003 +0000
* Don't check for staleness by default.
commit e6363b05ae72ffd9d977ec3f0981ff9123c404a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 13 19:26:00 2003 +0000
* Pass $(prefix) and other variables through -D..., not
through config.h, to prevent silly Autoconf problems.
commit 9c620e4afa03e63ddaff2979396144de8d9298a5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 13 18:58:03 2003 +0000
* Generate the scripts so that we can substitute the prefix
etc. correctly.
* Fixed nix-switch.
commit 5304a1eb3a2bbcc379924d3f5a58b64ce77f4849
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sat Jul 12 11:03:14 2003 +0000
* Fetchurl: check md5 checksum.
commit 73b163c1a10f2ce675d9fc3d7ad02fad4bc6511f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 11 08:41:03 2003 +0000
* Fix a bug that caused Fix not to be deterministic (due to addToStore
returning different paths if the hash of the path to be added was
already available in the store under a different name).
commit c834a5c5975b9a62413b4aa9446f73d1c573c909
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 11 08:16:15 2003 +0000
* Fix handling of pipes (read(2) may not return the required
number of bytes in one call).
commit 822c072cfa0f1e4ac304343d78e024ba19da34a8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 20:34:29 2003 +0000
* Compress Nix archives when pushing them.
commit 9bcc31c94168717c8bd27b83bfab686264f63745
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 20:13:32 2003 +0000
* Working derivate sharing.
commit 81304a6bb595e64d868ef4eb4bfcc08014ced939
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 19:27:46 2003 +0000
* Convert tabs to spaces.
commit e5fbf5804192fa62d0edab0f6b323cc0c8d890f9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 18:48:11 2003 +0000
* A command to register successor fstate expressions.
Unifying substitutes and successors isn't very feasible for now,
since substitutes are only used when no path with a certain is
known. Therefore, a normal form of some expression stored as a
substitute would not be used unless the expression itself was
missing.
commit 8511571f653fcfbb724061dac330c544b6048722
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 15:24:50 2003 +0000
* Performance enhancement.
commit 1d1c3691d2fdf5aad0baceadd8596f23c1e0e1fa
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 15:11:48 2003 +0000
* The policy-free derivate sharing now *almost* works. :-) For any
hash for which no local expansion is available, Nix can execute a
`substitute' which should produce a path with such a hash.
This is policy-free since Nix does not in any way specify how the
substitute should work, i.e., it's an arbitrary (unnormalised)
fstate expression. For example, `nix-pull' registers substitutes
that fetch Nix archives from the network (through `wget') and unpack
them, but any other method is possible as well. This is an
improvement over the old Nix sharing scheme, which had a policy
(fetching through `wget') built in.
The sharing scheme doesn't work completely yet because successors
from fstate rewriting have to be registered on the receiving side.
Probably the whole successor stuff can be folded up into the
substitute mechanism; this would be a nice simplification.
commit d072485d2895d01dbbab1d899418726e3349343f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 13:41:28 2003 +0000
* Get `nix-push' working again. It now uses Nix/Fix to create Nix
archives (using the package in corepkgs/nar).
* queryPathByHash -> expandHash, and it takes an argument specifying
the target path (which may be empty).
* Install the core Fix packages in $prefix/share/fix. TODO: bootstrap
Nix and install Nix as a Fix package.
commit 5d4b90b689b09965be39c69aceddaf0b165598d0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 09:21:40 2003 +0000
* Actually go through the search directories when looking for files.
commit 089b43617501b19b94523b2211877841ed09e70e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 09:12:52 2003 +0000
* Deleted the sys directory.
commit b96239c65703afba195a952d9f21b9588c136ac7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 09:11:30 2003 +0000
* Moved the fetchutl package to corepkgs.
commit 9ebd78144a9c996e39ffc209c05a511f119f55ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Jul 10 09:09:48 2003 +0000
* Added a directory for standard Fix descriptors.
commit 6011bd0da24c100f86239ed826fa7b496bbdddf8
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 9 16:12:40 2003 +0000
* Outline of the new scheme for derivate distribution.
commit 2b95a9dc05d0a943859ba92bb301c294473758f1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jul 9 15:02:03 2003 +0000
* When computing the set of paths referenced by an expression, also
include the paths of the subterms.
commit 9a99dc736d814f41d2b3ceb92da2435ae2dd5632
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 20:26:22 2003 +0000
* Canonicalise paths so that Fix produces identical Nix
expressions for identical inputs.
commit cab3f4977a412681a77767ec7307ee642b61332d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 19:58:41 2003 +0000
* A path canonicaliser that doesn't depend on the existence of paths
(i.e., it doesn't use realpath(3), which is broken in any case).
Therefore it doesn't resolve symlinks.
commit 333f4963de6d174d852774a88ada852f77f57994
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 15:33:06 2003 +0000
* The output of a Derive() node is not a referenced path.
commit 40274c1f4f763e634dd031f7a6b4ba8ce2de7a82
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 13:22:08 2003 +0000
* A command to query the paths referenced by an fstate expression.
* Use a temporary directory for build actions.
commit a279137327ad5762bb26a23ce8ed7863812254ae
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 10:00:46 2003 +0000
* Get `--dump' and `--delete' to work again.
commit 85a913a3e78e43f7f90ef46ac041350bb5d61d1f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 09:59:00 2003 +0000
* Renamed `id' -> `name' to remove the implication of uniqueness.
commit 0b38b43bab28dd733e057d42853d57e44ec9a7c9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 09:54:47 2003 +0000
* deletePath() now removes the path from the hash2paths mapping.
commit ab644ad10b00a5fd23e8d8a705a7a8a8aaf53c57
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 09:53:46 2003 +0000
* BaseName() primitive for the generation of more sensible names
(especially in fetchurl.fix).
commit a5a90f501e471383a8dfccfe8af3c804cefa77cf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jul 8 08:35:06 2003 +0000
* Get rid of the `netsources' database.
* Rename the `refs' database to `hash2paths'.
commit be96c2189ca017612277ab6301164a5e2facfca5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 7 09:29:40 2003 +0000
* `--realise' -> `--install'.
commit 5895c160c466c0a97716ffdf5ef654eb1c3c6009
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 7 09:25:26 2003 +0000
* Make dbRefs a mapping from Hash to [Path].
commit 609a224848dd08cea35a89b03b64274c82f0a2a7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 7 07:44:57 2003 +0000
* Fixed `make check' as well.
commit 224c585aba5e450fa47e41c4cc19dac2d0c6fe2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jul 7 07:43:58 2003 +0000
* Refactoring on the file names.
commit 7952a8053c474e771d6ee14e3ab6dc15c9ddd895
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 6 15:11:02 2003 +0000
* A utility `nix-hash' to compute Nix path hashes.
commit bfa5d77211385cd8abe5d0833f84a8151ccab37d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 6 15:08:39 2003 +0000
* Bug fix: properly check result of open().
commit 82e3d8fafe0ac08589349094e3ea11022d995959
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jul 6 14:20:47 2003 +0000
* Got Fix working again.
commit f826e432aa442e569faaf3cb04d83bfa28bcf260
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 4 15:42:03 2003 +0000
* Refactoring: move initialisation and argument parsing into a shared
file.
commit 01b34fe5843df9888737699ee9f9fe2f161a1fa3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 4 15:29:58 2003 +0000
* Cleanup.
commit 207ff2caf0f48db0fb539e228ec5c3938a279f2a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jul 4 12:18:06 2003 +0000
* Caching of expression successors.
commit 40b5936691fe2448dea0080e2319cc340bc7c65c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 27 14:56:12 2003 +0000
* Realisation of Derive(...) expressions.
commit 3da9687854e029e9df3b612fd592d2d5a622bb20
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 27 13:55:12 2003 +0000
* Realisation of File(...) expressions.
commit bb03c45ca03e038c8b74fc1410f48d02ade4c59b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 27 13:41:42 2003 +0000
* Added the Boost format library which provides a safe printf
replacement.
commit d4c3edfaba91a0e5e1e9528749e5b1e178511a6d
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 27 09:55:31 2003 +0000
* Normalisation.
commit 3ec525258258ea50a411eb6b7d3c6aa7ecac708b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 25 15:50:37 2003 +0000
* Improved syntax and semantics for Nix expressions.
commit 2b07b0e7ebee69e6a64013dcdda363c393d3f4fc
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 25 14:58:56 2003 +0000
* Minor cleanups.
commit 692b562342ac7ead43ef06497f6a8b4b6e724ae5
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 23 14:40:49 2003 +0000
* `nix --delete' command.
commit c0cbaef4bece0c2447828739dd9622c329948064
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 23 14:08:34 2003 +0000
* `nix --restore' command.
commit 5f5cab0ac7c26783a4544feb31708d4f8e0f4a51
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 23 13:27:59 2003 +0000
* A function to restore from a Nix archive.
* addValue() can now import any dumpable FS object.
commit 85effedca3e4cc3c10ccd835c9ea4fb712418cb9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 20 14:11:31 2003 +0000
* Flags to indicate how values are specified on the command line
(--hash, --file, --name).
commit 5079ccb45537fe8de4b9579e274523734a3f634e
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 20 10:53:04 2003 +0000
* Move most of Nix into a library (libnix.a).
* Run `test' on `make check'.
commit 1849aa2a72d7f530e2c18d640528075bcdf8991c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Jun 20 10:40:25 2003 +0000
* Refactoring: move dump function into archive.cc.
commit 38e12df631cc45fda97942070d7ebea1bb9c7f2f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 14:34:43 2003 +0000
* `nix --dump' command.
commit aeaffec7857301a6d20d7901041918484666d567
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 14:34:03 2003 +0000
* Dump symlinks.
commit 94cf1f86bb5d8516583f0d39ad22dbc853019798
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 12:36:12 2003 +0000
* Lambdas, applications, substitutions.
commit bc57eb3c8a54df819bad9c300ff5569762f15c28
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 12:35:32 2003 +0000
* Set CPLUS_INCLUDE_PATH as well as C_INCLUDE_PATH. Otherwise g++
won't see header files under Nix control.
commit fab7b128b9890cf563fa3cab5578757241902ac2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Jun 18 08:07:28 2003 +0000
* Automake sucks.
commit 34fcf5fa0c0cc02edc6820b99d98e7ae278c6c00
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 17 21:12:58 2003 +0000
* Started integrating the new evaluation model into Nix.
* Cleaned up command-line syntax.
commit 7a96da3627220d11a985662446e8a75fb8cc2d40
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 17 15:47:25 2003 +0000
* Test for expression dereferencing.
commit 6656993f83fa125e7b72de3962fbb5dd71cc31a4
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 17 15:45:43 2003 +0000
* Derefencing of hashed expressions.
commit a7ab242fb42dad81dc1bccdca4b432587e0957dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Jun 17 13:37:44 2003 +0000
* Simplify the evaluator.
commit c739e2058560ad018dcf68e16fa683ca404d548c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 16 21:01:18 2003 +0000
* Argument processing.
commit 727beb798a701ff546adc65030f1562b87283947
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 16 16:16:09 2003 +0000
* Canonicalization: when hashing directories, sort the directory
entries by name.
commit 2f04e7102eaad3159073019af96e6e5c4f2c9bcf
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 16 15:59:23 2003 +0000
* Path hashing.
commit a09e66da5af348dc25e3b372ec9f518d3532f863
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 16 14:19:32 2003 +0000
* Description of path hashing algorithm.
commit 822794001cb4260b8c04a7bd2d50d890edae709a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 16 13:33:38 2003 +0000
* Started implementing the new evaluation model.
* Lots of refactorings.
* Unit tests.
commit b9f09b3268bf0c3d9ecd512dd3a0aa1247550cc2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Jun 16 07:03:40 2003 +0000
* AST for Nix expressions.
commit 21fe717ce2027187e553d1edec65ef68b5d3c702
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Jun 15 13:41:32 2003 +0000
* Refactoring: hash class.
commit f66055fa1ef3eb208666b5ace7b5ab16bf7e8980
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 30 20:53:36 2003 +0000
* Set umask to 0022 on startup.
commit 5908663f4209eed632b3973c97b25ff5a3dd3b17
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 30 17:01:21 2003 +0000
* Send log output to stderr.
commit d1f5fd7216066d4ed04df27546e3d3e0d362c71b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 30 15:21:52 2003 +0000
* Log the output of builders to $prefix/var/log/nix.
commit 64582f54be099eb92a75ed301c72681afa4db741
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 30 15:18:30 2003 +0000
* Open the database read-only when enumerating tables.
commit 383297e0e835b69e0f4d7c97a9b8d441c2872251
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 30 15:17:40 2003 +0000
* Don't set MANPATH. It's not necessary.
commit 84e235eae8581403716a87b37e9dc6210b8ad515
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri May 30 11:49:06 2003 +0000
* Set MANPATH and PKG_CONFIG_PATH.
commit 5e01b220b363524e02ec07da3943e02042218167
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 27 11:58:14 2003 +0000
* Fix the rsync destination.
commit 4d21cda0cd44db75f6b9f5942440a07303c06b4a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue May 27 09:55:47 2003 +0000
* Fix for big-endian platforms: check for endianness in MD5 computations.
This is done at runtime, which is inefficient, but I can't be bothered
to write an Autoconf test right now.
commit 9efad7659568ad2eeee5e2cf9cf1df9322d9eb33
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 26 15:09:10 2003 +0000
* FreeBSD / ISO C++ compatibility fixes.
commit d8bdf5b06e50ea4a618f2b69c4839f92086ebb29
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 26 14:19:25 2003 +0000
* Removed some debug code that prevented packages from building.
commit a9f2928ed6edb15faa1ad5fc563662a08a92ced1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 26 13:57:19 2003 +0000
* Moved the package descriptors and build scripts out of the Nix tree.
commit 8b930a0c94ba9013d015c735cfc38c40b151f491
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 26 13:45:00 2003 +0000
* Some refactoring.
commit f8d91f20e6c88510282263715a1b87c99afad5a1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon May 26 09:44:18 2003 +0000
* Nix can now fetch prebuilts (and other files) from the network, iff
a mapping from the hash to a url has been registered through `nix
regurl'.
* Bug fix in nix: don't pollute stdout when running tar, it made
nix-switch barf.
* Bug fix in nix-push-prebuilts: don't create a subdirectory on the
target when rsync'ing.
commit 13176d74cc522951e2c8ed6a878a04ddfce778ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 25 22:43:33 2003 +0000
* Updated Fix descriptors to reflect the new Fix abstract syntax.
commit 7dd91d3779b4f806ac0085e0ccc60416d81c1148
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun May 25 22:42:19 2003 +0000
* Prebuilt package sharing. We allow transparent binary deployment by
sharing package directories (i.e., the result of building a Nix
descriptor).
`nix-pull-prebuilts' obtains a list of all known prebuilts by
consulting the paths and URLs specified in
$prefix/etc/nix/prebuilts.conf. The mappings ($pkghash,
$prebuilthash) and ($prebuilthash, $location) are registered with
Nix so that it can use the prebuilt with hash $prebuilthash when
installing a package with hash $pkghash by downloading and unpacking
$location.
`nix-push-prebuilts' creates prebuilts for all packages for which no
prebuilt is known to exist. It can then optionally upload these
to the network through rsync.
`nix-[pull|push]-prebuilts' just provide a policy. Nix provides the
mechanism through the `nix [export|regprebuilt|regurl]' commands.
commit 0ef4b6d0f8dcaec093e3db366b6dfb6ba47f73a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 25 15:33:50 2003 +0000
* Cleaned up the semantics of Fix expressions.
* Conditionals and variables in Fix expressions. This allows, e.g.,
Descr(
[ Bind("pkgId", "subversion-0.21.0")
, Bind("httpsClient", Bool(True))
, Bind("httpServer", Bool(True))
, Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
, Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
...
])
which introduces domain feature variables httpsClient and httpServer
(i.e., whether Subversion is built with https client and webdav
server support); the values of the variables influences package
dependencies and the build scripts.
The next step is to allow that packages can express constraints on
each other. E.g., StrategoXT is dependent on an ATerm library with
the "gcc" variant enabled. In fact, this may cause several
Nix instantiations to be created from a single Fix descriptor. If
possible, Fix should try to find the least set of instantiations
that obeys the constraints.
commit d6d930a975cf0bfacb8a3117752452b89921b6ee
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 25 15:20:05 2003 +0000
* Bug fix: deleting the old links didn't work properly.
commit fcc5ae151bb78006e7acc5ab8bf6b54692281777
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 25 15:01:15 2003 +0000
* Remove build directory from a package directory after building it.
commit 76205df09cd6ac700f002f22e285440364d96ccd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 24 11:45:23 2003 +0000
* Removed old Nix descriptors.
commit 243370bc52b6ecc706cd7ad3a3c8075f74ac1fc0
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 24 11:43:11 2003 +0000
* nix-switch now removes the link to the previously activated system
package as a root of the garbage collector, unless `--keep' is
specified.
commit 24b3d0759e864fdf92fee1085e234535311029ef
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 24 11:41:50 2003 +0000
* File removed.
commit 9713e8577f752ef70c18a9cad62a4b0e88c769de
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Apr 24 11:41:24 2003 +0000
* getpkg, delpkg, and so on now accept multiple arguments.
commit 49e0d743d7348ba15f6c8125138c4e17b271d8c3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 23 21:21:06 2003 +0000
* Fix descriptors for Pan and its dependencies.
commit f546e0cda450642177da02895f39f34e3ce1a6ff
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 23 09:02:53 2003 +0000
* Fix descriptor for Subversion 0.21.0.
commit 6faa154c89220792afbee534e4d7e26b6cba7e90
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 23 07:23:01 2003 +0000
* Add "... || exit 1" to every command to catch failure.
commit e59c3246b96492b84c77aebe293ec68d96fe9305
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 23 07:21:57 2003 +0000
* Redirect stdout to stderr when executing the build script.
commit f7526febe4e60e3da61664a5fb58ff19a5882ded
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 9 13:03:00 2003 +0000
* A garbage collector for installed packages. nix-collect-garbage
doesn't actually delete any packages, it just prints their
descriptor hashes. So we can do
nix info $(nix-collect-garbage)
to print out the ids of the packages that would be deleted, and
nix delpkg $(nix-collect-garbage)
to actually delete them.
commit 30a6122f8061e8c3ac2d96078b75aafa63101f02
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 9 12:46:44 2003 +0000
* When we activate a descriptor in nix-switch, remember its hash.
This allows us to find out all `live' packages on the system by
doing
nix closure $(cat /nix/var/nix/links/*.hash)
which will print out the activated configurations and all packages
referenced by them. We could then garbage collect unused packages
by deleting the difference between `nix listinst' and the set
returned by `nix closure ...'.
commit b762f4df7f6b8d0a4b306fc7e1c2633c4802d1c2
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 9 12:37:49 2003 +0000
* In `fix --instantiate', only print out the hashes of the Nix
descriptors generated out of Fix descriptors specified on the
command line. This allows us to say:
nix-switch $(fix -i ./test/fixdescriptors/system.fix)
commit aa8fda4b54fbd84b7bc6b11904c156367683e8f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 9 12:26:48 2003 +0000
* We no longer use nix-populate standalone, rather we use it as a
build action for `system' packages (like system.fix) that have
dependencies on all packages we want to activate.
So the command sequence to switch to a new activation configuration
of the system would be:
$ fix -i .../fixdescriptors/system.fix
...
system.fix -> 89cf4713b37cc66989304abeb9ea189f
$ nix-switch 89cf4713b37cc66989304abeb9ea189f
* A nix-profile.sh script that can be included in .bashrc.
commit f56b7312b273546871a1eca7d34c60474d3c4050
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 8 15:36:54 2003 +0000
* Descriptor importing in Fix.
commit cc6eafb3d0a53c8bb02746411d3d41403ce9eb83
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 8 14:05:15 2003 +0000
* FreeBSD / gcc 2.95 compatibility fixes.
* A script to generate prebuilt registration scripts.
commit f7ef88df1fd6087deae02a53b8f18b64050f75db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 8 12:13:57 2003 +0000
* Added some installation instructions to the readme.
commit 0d2b24cdd103f21861ad42fd6d98e5d1cb252646
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 8 12:00:51 2003 +0000
* `Fix' is a high-level descriptor instantiator for Nix. It replaces
nix-instantiate.
commit 814b256da43ebdad79fe9544a59f6ae680da7cb9
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Apr 6 22:19:26 2003 +0000
* Better installation: make directories, create database.
* Fixed the register script.
commit 2eea8832f0bc5f15979b5f091c3ac5f04593f0ca
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Apr 6 22:17:47 2003 +0000
* The latest version of Pan.
commit 1447cf35bd633c365bb7584dedb41327951d0c07
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Apr 6 22:09:47 2003 +0000
* Delete source after building.
commit 136c00e881dd290d470923b0ce7760de2df5e0ad
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 4 16:14:56 2003 +0000
* Autoconf / Automake configuration and building.
commit ab723e341aab021624e93b7687c252acaeef9394
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Apr 4 12:02:40 2003 +0000
* Minor refactoring: use iterators to process arguments.
commit c68dca5dac87f710c880bcf78710a7be9609d29c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 2 15:34:44 2003 +0000
* Script to register pre-built packages.
commit 5bc26fb73fe997b05c2e43593d17de102c4249b7
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Apr 2 15:34:05 2003 +0000
* Importing and exporting of pre-built packages.
commit 383f9bb0f19f76fa4cdbdfb5327d82e77212c1b6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Apr 1 14:00:47 2003 +0000
* Use ATerms for Nix descriptors.
commit ced20f187e36927adc88ab628b67838f51155244
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 31 14:28:15 2003 +0000
* Nix descriptor for Subversion.
commit 31f177ef0a7463f59a28342032eb8948994ce1a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 28 16:27:23 2003 +0000
* Check for collissions.
commit 278ea4097e4deca33da1a08d746e8d80a620ce95
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 28 10:33:34 2003 +0000
* Don't fork in `nix run'.
commit f915f773495e9675a6cd514742666c8c12f005e6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 28 09:53:22 2003 +0000
* Allow arguments to be passed to programs in `nix run'.
commit 0f40a560cab23f70881e5af405ea112a869dc39a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 25 16:36:25 2003 +0000
* Added a script nix-activate which builds a list of "activated"
packages (i.e., the packages that should appear in the user's $PATH,
and so on). Based on this list, the script nix-populate creates a
hierarchy of symlinks to the relevant files in those packages (e.g.,
for pkg/bin and pkg/lib).
A nice property of nix-populate is that on each run it creates a
*new* tree, rather than updating the old one. It then atomically
switches over to the new tree. This allows atomic upgrades or
rollbacks on the set of activated packages.
commit 3f1a1457e9ad91f93151200fe43c7c33ea95417b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue Mar 25 11:39:51 2003 +0000
* Integrate hash into instantiated descriptor file names.
* Use MD5::Digest.
commit 73c53935d00660301e9408beabf1c80d6ef48610
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 24 17:49:56 2003 +0000
* For efficiency: md5 integrated into nix.
* Command `nix ensure' which is like `nix getpkg' except that if the
has refers to a run action it will just ensure that the imports are
there.
* Command `nix closure' to print out the closure of the set of
descriptors under the import relation, starting at a set of roots.
This can be used for garbage collection (e.g., given a list of
`activated' packages, we can delete all packages not reachable from
those).
* Command `nix graph' to print out a Dot graph of the dependency
graph.
* `nix-addroot' adds a root for the (unimplemented) garbage collector.
commit eeab86e0acbb32cdb360443dd6efe7031fed7295
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 24 16:43:52 2003 +0000
* Typo fix.
commit 2dc84e556911407fe75e1ceb6a9fe34ed21725db
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 24 12:49:40 2003 +0000
* Descriptors now have a "system" field specifying the platform that
the build or run action should be perfomed on. This ensures that
descriptors have different hashes on different platforms.
commit 9d2f128252ea9dc9b706bec2bfdaa35600190385
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon Mar 24 11:50:20 2003 +0000
* Refactoring.
commit 8d682ba551c44daecd427999114b9c520eef0296
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 23 23:28:28 2003 +0000
* A descriptor for running the Pan newsreader.
* Added descriptors for gtkspell and its support package pspell.
Gtkspell is an optional dependency of Pan, so we should add the
ability to nix-instantiate to instantiate variants of a package
based on a selection of features.
commit 20d165c34467338f07c4808783cd50318c38a47b
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Sun Mar 23 23:24:09 2003 +0000
* A command to run programs in Nix packages, that is, to execute a run
action. Run actions are described by uniquely hashed descriptors,
just like build actions. Therefore run actions can have
dependencies, but these need not be the same as the build time
dependencies (e.g., at runtime we can link against a different
version of a dynamic library). Example:
nix run 31d6bf4c171282367065e0deecd7c579
will run the Pan 0.13.91 newsreader with gtkspell support.
commit 800d8e950f13b9cb9099c5d1270a4385d5ae55da
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 21 15:58:40 2003 +0000
* Added a command to list installed packages.
commit 2e59698b78d3fcba6908d8478c15943834d9635f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 21 15:53:35 2003 +0000
* Added a command to verify the consistency of the database.
commit fa51d6fcd9ee7efc897e8e07a2db7a41f974d6a6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 21 14:11:44 2003 +0000
* Forgot to commit this one.
commit e582ee67cd682c13667daccf33e8071189ef946c
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 21 14:10:06 2003 +0000
* Fetch sources from the network.
commit 88d257b17f0f668798568d68e2d2063f31fe8a2f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 21 09:58:01 2003 +0000
* Renamed dist -> build.
commit 4c43711810c73a3899066b9401a9517f53e1b0f1
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 22:25:01 2003 +0000
* Descriptor templates for the Pan newsreader and all its
dependencies.
commit cadc3852e44bc625872ef18f4407bff6797ac5dd
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 22:23:48 2003 +0000
* nix-instantiate now instantiantes the closure of the set of
descriptor templates under the import relation. I.e., we can now
say:
nix-instantiate outdir foo.nix
which will create descriptors for foo.nix and all imported packages
in outdir/.
commit f7a98e081dac20858cda21a6190f8d0222e59728
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 16:53:00 2003 +0000
* Various updates.
commit b3594e9eaf2b80c7c585035c5538ee59c608688f
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 20 16:52:30 2003 +0000
* A script to instantiate package descriptors from templates.
commit 8999f923ea1a459b3e4d404745b001323647711a
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri Mar 14 16:43:14 2003 +0000
* Improved Nix. Resources (package descriptors and other source
files) are now referenced using their cryptographic hashes.
This ensures that if two package descriptors have the same contents,
then they describe the same package. This property is not as
trivial as it sounds: generally import relations cause this property
not to hold w.r.t. temporality. But since imports also use hashes
to reference other packages, equality follows by induction.
commit 18ebf518de325c7059648bfd6df464d8d5204bb3
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 13 16:28:32 2003 +0000
* Converted to C++.
commit 75d788b0f24e8de033a22c0869032549d602d4f6
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu Mar 13 14:24:49 2003 +0000
* Initial version of nix.
commit 841fcbd04755c7a2865c51c1e2d3b045976b7452
Author: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Wed Mar 12 13:32:24 2003 +0000
* And a trunk to go along with that.
| -rw-r--r-- | daemon.am | 7 | ||||
| -rw-r--r-- | nix/libstore/build.cc | 313 | ||||
| -rw-r--r-- | nix/libstore/gc.cc | 69 | ||||
| -rw-r--r-- | nix/libstore/globals.cc | 92 | ||||
| -rw-r--r-- | nix/libstore/globals.hh | 26 | ||||
| -rw-r--r-- | nix/libstore/local-store.cc | 81 | ||||
| -rw-r--r-- | nix/libstore/local-store.hh | 19 | ||||
| -rw-r--r-- | nix/libstore/optimise-store.cc | 16 | ||||
| -rw-r--r-- | nix/libstore/remote-store.cc | 31 | ||||
| -rw-r--r-- | nix/libstore/remote-store.hh | 5 | ||||
| -rw-r--r-- | nix/libstore/store-api.hh | 4 | ||||
| -rw-r--r-- | nix/libstore/worker-protocol.hh | 2 | ||||
| -rw-r--r-- | nix/libutil/archive.cc | 171 | ||||
| -rw-r--r-- | nix/libutil/archive.hh | 12 | ||||
| -rw-r--r-- | nix/libutil/serialise.cc | 27 | ||||
| -rw-r--r-- | nix/libutil/serialise.hh | 11 | ||||
| -rw-r--r-- | nix/libutil/types.hh | 17 | ||||
| -rw-r--r-- | nix/libutil/util.cc | 176 | ||||
| -rw-r--r-- | nix/libutil/util.hh | 30 | ||||
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 25 | ||||
| -rw-r--r-- | nix/nix-daemon/nix-daemon.cc | 134 | ||||
| -rw-r--r-- | tests/guix-archive.sh | 3 |
22 files changed, 750 insertions, 521 deletions
diff --git a/daemon.am b/daemon.am index 9d6516ae6c..50b488923a 100644 --- a/daemon.am +++ b/daemon.am @@ -25,8 +25,8 @@ CLEANFILES += $(BUILT_SOURCES) noinst_LIBRARIES = libformat.a libutil.a libstore.a -# Use '-std=c++0x' for 'std::shared_ptr'. -AM_CXXFLAGS = -Wall -std=c++0x +# Use '-std=c++11' for 'std::shared_ptr', 'auto', lambdas, and more. +AM_CXXFLAGS = -Wall -std=c++11 libformat_a_SOURCES = \ nix/boost/format/free_funcs.cc \ @@ -112,7 +112,8 @@ libstore_a_CPPFLAGS = \ -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ - -DOPENSSL_PATH="\"guix-authenticate\"" + -DOPENSSL_PATH="\"guix-authenticate\"" \ + -DDEFAULT_CHROOT_DIRS="\"\"" libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \ $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index f38cd29940..009fcb2c0c 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -57,9 +57,8 @@ #include <netinet/ip.h> #endif -#if HAVE_SYS_PERSONALITY_H +#if __linux__ #include <sys/personality.h> -#define CAN_DO_LINUX32_BUILDS #endif #if HAVE_STATVFS @@ -85,8 +84,12 @@ class Goal; typedef std::shared_ptr<Goal> GoalPtr; typedef std::weak_ptr<Goal> WeakGoalPtr; +struct CompareGoalPtrs { + bool operator() (const GoalPtr & a, const GoalPtr & b); +}; + /* Set of goals. */ -typedef set<GoalPtr> Goals; +typedef set<GoalPtr, CompareGoalPtrs> Goals; typedef list<WeakGoalPtr> WeakGoals; /* A map of paths to goals (and the other way around). */ @@ -173,11 +176,20 @@ public: (important!), etc. */ virtual void cancel(bool timeout) = 0; + virtual string key() = 0; + protected: void amDone(ExitCode result); }; +bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) { + string s1 = a->key(); + string s2 = b->key(); + return s1 < s2; +} + + /* A mapping used to remember for each child process to what goal it belongs, and file descriptors for receiving log data and output path creation commands. */ @@ -238,6 +250,9 @@ public: failure). */ bool permanentFailure; + /* Set if at least one derivation had a timeout. */ + bool timedOut; + LocalStore & store; std::shared_ptr<HookInstance> hook; @@ -301,6 +316,7 @@ public: void addToWeakGoals(WeakGoals & goals, GoalPtr p) { // FIXME: necessary? + // FIXME: O(n) foreach (WeakGoals::iterator, i, goals) if (i->lock() == p) return; goals.push_back(p); @@ -374,8 +390,6 @@ void Goal::trace(const format & f) /* Common initialisation performed in child processes. */ static void commonChildInit(Pipe & logPipe) { - restoreAffinity(); - /* Put the child in a separate session (and thus a separate process group) so that it has no controlling terminal (meaning that e.g. ssh cannot open /dev/tty) and it doesn't receive @@ -590,7 +604,9 @@ HookInstance::HookInstance() { debug("starting build hook"); - Path buildHook = absPath(getEnv("NIX_BUILD_HOOK")); + Path buildHook = getEnv("NIX_BUILD_HOOK"); + if (string(buildHook, 0, 1) != "/") buildHook = settings.nixLibexecDir + "/nix/" + buildHook; + buildHook = canonPath(buildHook); /* Create a pipe to get the output of the child. */ fromHook.create(); @@ -602,44 +618,30 @@ HookInstance::HookInstance() builderOut.create(); /* Fork the hook. */ - pid = maybeVfork(); - switch (pid) { - - case -1: - throw SysError("unable to fork"); + pid = startProcess([&]() { - case 0: - try { /* child */ + commonChildInit(fromHook); - commonChildInit(fromHook); + if (chdir("/") == -1) throw SysError("changing into `/"); - if (chdir("/") == -1) throw SysError("changing into `/"); + /* Dup the communication pipes. */ + if (dup2(toHook.readSide, STDIN_FILENO) == -1) + throw SysError("dupping to-hook read side"); - /* Dup the communication pipes. */ - if (dup2(toHook.readSide, STDIN_FILENO) == -1) - throw SysError("dupping to-hook read side"); + /* Use fd 4 for the builder's stdout/stderr. */ + if (dup2(builderOut.writeSide, 4) == -1) + throw SysError("dupping builder's stdout/stderr"); - /* Use fd 4 for the builder's stdout/stderr. */ - if (dup2(builderOut.writeSide, 4) == -1) - throw SysError("dupping builder's stdout/stderr"); + execl(buildHook.c_str(), buildHook.c_str(), settings.thisSystem.c_str(), + (format("%1%") % settings.maxSilentTime).str().c_str(), + (format("%1%") % settings.printBuildTrace).str().c_str(), + (format("%1%") % settings.buildTimeout).str().c_str(), + NULL); - execl(buildHook.c_str(), buildHook.c_str(), settings.thisSystem.c_str(), - (format("%1%") % settings.maxSilentTime).str().c_str(), - (format("%1%") % settings.printBuildTrace).str().c_str(), - (format("%1%") % settings.buildTimeout).str().c_str(), - NULL); + throw SysError(format("executing `%1%'") % buildHook); + }); - throw SysError(format("executing `%1%'") % buildHook); - - } catch (std::exception & e) { - writeToStderr("build hook error: " + string(e.what()) + "\n"); - } - _exit(1); - } - - /* parent */ pid.setSeparatePG(true); - pid.setKillSignal(SIGTERM); fromHook.writeSide.close(); toHook.readSide.close(); } @@ -648,7 +650,8 @@ HookInstance::HookInstance() HookInstance::~HookInstance() { try { - pid.kill(); + toHook.writeSide.close(); + pid.kill(true); } catch (...) { ignoreException(); } @@ -784,17 +787,21 @@ private: outputs to allow hard links between outputs. */ InodesSeen inodesSeen; - /* Magic exit code denoting that setting up the child environment - failed. (It's possible that the child actually returns the - exit code, but ah well.) */ - const static int childSetupFailed = 189; - public: DerivationGoal(const Path & drvPath, const StringSet & wantedOutputs, Worker & worker, BuildMode buildMode = bmNormal); ~DerivationGoal(); void cancel(bool timeout); + string key() + { + /* Ensure that derivations get built in order of their name, + i.e. a derivation named "aardvark" always comes before + "baboon". And substitution goals always happen before + derivation goals (due to "b$"). */ + return "b$" + storePathToName(drvPath) + "$" + drvPath; + } + void work(); Path getDrvPath() @@ -879,13 +886,9 @@ DerivationGoal::~DerivationGoal() { /* Careful: we should never ever throw an exception from a destructor. */ - try { - killChild(); - deleteTmpDir(false); - closeLogFile(); - } catch (...) { - ignoreException(); - } + try { killChild(); } catch (...) { ignoreException(); } + try { deleteTmpDir(false); } catch (...) { ignoreException(); } + try { closeLogFile(); } catch (...) { ignoreException(); } } @@ -956,6 +959,11 @@ void DerivationGoal::init() /* The first thing to do is to make sure that the derivation exists. If it doesn't, it may be created through a substitute. */ + if (buildMode == bmNormal && worker.store.isValidPath(drvPath)) { + haveDerivation(); + return; + } + addWaitee(worker.makeSubstitutionGoal(drvPath)); state = &DerivationGoal::haveDerivation; @@ -1209,7 +1217,7 @@ static string get(const StringPairs & map, const string & key) static bool canBuildLocally(const string & platform) { return platform == settings.thisSystem -#ifdef CAN_DO_LINUX32_BUILDS +#if __linux__ || (platform == "i686-linux" && settings.thisSystem == "x86_64-linux") #endif ; @@ -1433,9 +1441,6 @@ void DerivationGoal::buildDone() if (pathExists(chrootRootDir + *i)) rename((chrootRootDir + *i).c_str(), i->c_str()); - if (WIFEXITED(status) && WEXITSTATUS(status) == childSetupFailed) - throw Error(format("failed to set up the build environment for `%1%'") % drvPath); - if (diskFull) printMsg(lvlError, "note: build failure may have been caused by lack of free disk space"); @@ -1469,37 +1474,41 @@ void DerivationGoal::buildDone() outputLocks.unlock(); } catch (BuildError & e) { - printMsg(lvlError, e.msg()); + if (!hook) + printMsg(lvlError, e.msg()); outputLocks.unlock(); buildUser.release(); - /* When using a build hook, the hook will return a remote - build failure using exit code 100. Anything else is a hook - problem. */ - bool hookError = hook && - (!WIFEXITED(status) || WEXITSTATUS(status) != 100); + if (hook && WIFEXITED(status) && WEXITSTATUS(status) == 101) { + if (settings.printBuildTrace) + printMsg(lvlError, format("@ build-failed %1% - timeout") % drvPath); + worker.timedOut = true; + } - if (settings.printBuildTrace) { - if (hook && hookError) + else if (hook && (!WIFEXITED(status) || WEXITSTATUS(status) != 100)) { + if (settings.printBuildTrace) printMsg(lvlError, format("@ hook-failed %1% - %2% %3%") % drvPath % status % e.msg()); - else + } + + else { + if (settings.printBuildTrace) printMsg(lvlError, format("@ build-failed %1% - %2% %3%") % drvPath % 1 % e.msg()); + worker.permanentFailure = !fixedOutput && !diskFull; + + /* Register the outputs of this build as "failed" so we + won't try to build them again (negative caching). + However, don't do this for fixed-output derivations, + since they're likely to fail for transient reasons + (e.g., fetchurl not being able to access the network). + Hook errors (like communication problems with the + remote machine) shouldn't be cached either. */ + if (settings.cacheFailure && !fixedOutput && !diskFull) + foreach (DerivationOutputs::iterator, i, drv.outputs) + worker.store.registerFailedPath(i->second.path); } - /* Register the outputs of this build as "failed" so we won't - try to build them again (negative caching). However, don't - do this for fixed-output derivations, since they're likely - to fail for transient reasons (e.g., fetchurl not being - able to access the network). Hook errors (like - communication problems with the remote machine) shouldn't - be cached either. */ - if (settings.cacheFailure && !hookError && !fixedOutput) - foreach (DerivationOutputs::iterator, i, drv.outputs) - worker.store.registerFailedPath(i->second.path); - - worker.permanentFailure = !hookError && !fixedOutput && !diskFull; amDone(ecFailed); return; } @@ -1825,12 +1834,15 @@ void DerivationGoal::startBuilder() /* Bind-mount a user-configurable set of directories from the host file system. */ - foreach (StringSet::iterator, i, settings.dirsInChroot) { - size_t p = i->find('='); + PathSet dirs = tokenizeString<StringSet>(settings.get("build-chroot-dirs", string(DEFAULT_CHROOT_DIRS))); + PathSet dirs2 = tokenizeString<StringSet>(settings.get("build-extra-chroot-dirs", string(""))); + dirs.insert(dirs2.begin(), dirs2.end()); + for (auto & i : dirs) { + size_t p = i.find('='); if (p == string::npos) - dirsInChroot[*i] = *i; + dirsInChroot[i] = i; else - dirsInChroot[string(*i, 0, p)] = string(*i, p + 1); + dirsInChroot[string(i, 0, p)] = string(i, p + 1); } dirsInChroot[tmpDir] = tmpDir; @@ -1969,10 +1981,15 @@ void DerivationGoal::startBuilder() worker.childStarted(shared_from_this(), pid, singleton<set<int> >(builderOut.readSide), true, true); + /* Check if setting up the build environment failed. */ + string msg = readLine(builderOut.readSide); + if (!msg.empty()) throw Error(msg); + if (settings.printBuildTrace) { printMsg(lvlError, format("@ build-started %1% - %2% %3%") % drvPath % drv.platform % logFile); } + } @@ -1981,10 +1998,14 @@ void DerivationGoal::initChild() /* Warning: in the child we should absolutely not make any SQLite calls! */ - bool inSetup = true; - try { /* child */ + _writeToStderr = 0; + + restoreAffinity(); + + commonChildInit(builderOut); + #if CHROOT_ENABLED if (useChroot) { /* Initialise the loopback interface. */ @@ -2088,9 +2109,9 @@ void DerivationGoal::initChild() throw SysError("mounting /dev/pts"); createSymlink("/dev/pts/ptmx", chrootRootDir + "/dev/ptmx"); - /* Make sure /dev/pts/ptmx is world-writable. With some - Linux versions, it is created with permissions 0. */ - chmod_(chrootRootDir + "/dev/pts/ptmx", 0666); + /* Make sure /dev/pts/ptmx is world-writable. With some + Linux versions, it is created with permissions 0. */ + chmod_(chrootRootDir + "/dev/pts/ptmx", 0666); } /* Do the chroot(). Below we do a chdir() to the @@ -2103,15 +2124,13 @@ void DerivationGoal::initChild() } #endif - commonChildInit(builderOut); - if (chdir(tmpDir.c_str()) == -1) throw SysError(format("changing into `%1%'") % tmpDir); /* Close all other file descriptors. */ closeMostFDs(set<int>()); -#ifdef CAN_DO_LINUX32_BUILDS +#if __linux__ /* Change the personality to 32-bit if we're doing an i686-linux build on an x86_64-linux machine. */ struct utsname utsbuf; @@ -2119,7 +2138,7 @@ void DerivationGoal::initChild() if (drv.platform == "i686-linux" && (settings.thisSystem == "x86_64-linux" || (!strcmp(utsbuf.sysname, "Linux") && !strcmp(utsbuf.machine, "x86_64")))) { - if (personality(0x0008 | 0x8000000 /* == PER_LINUX32_3GB */) == -1) + if (personality(PER_LINUX32) == -1) throw SysError("cannot set i686-linux personality"); } @@ -2129,6 +2148,11 @@ void DerivationGoal::initChild() int cur = personality(0xffffffff); if (cur != -1) personality(cur | 0x0020000 /* == UNAME26 */); } + + /* Disable address space randomization for improved + determinism. */ + int cur = personality(0xffffffff); + if (cur != -1) personality(cur | ADDR_NO_RANDOMIZE); #endif /* Fill in the environment. */ @@ -2167,21 +2191,28 @@ void DerivationGoal::initChild() /* Fill in the arguments. */ string builderBasename = baseNameOf(drv.builder); args.push_back(builderBasename.c_str()); - foreach (Strings::iterator, i, drv.args) - args.push_back(rewriteHashes(*i, rewritesToTmp).c_str()); + foreach (Strings::iterator, i, drv.args) { + auto re = rewriteHashes(*i, rewritesToTmp); + auto cstr = new char[re.length()+1]; + std::strcpy(cstr, re.c_str()); + + args.push_back(cstr); + } args.push_back(0); restoreSIGPIPE(); + /* Indicate that we managed to set up the build environment. */ + writeToStderr("\n"); + /* Execute the program. This should not return. */ - inSetup = false; execve(program.c_str(), (char * *) &args[0], (char * *) envArr); throw SysError(format("executing `%1%'") % drv.builder); } catch (std::exception & e) { - writeToStderr("build error: " + string(e.what()) + "\n"); - _exit(inSetup ? childSetupFailed : 1); + writeToStderr("while setting up the build environment: " + string(e.what()) + "\n"); + _exit(1); } abort(); /* never reached */ @@ -2333,7 +2364,7 @@ void DerivationGoal::registerOutputs() if (buildMode == bmCheck) { ValidPathInfo info = worker.store.queryPathInfo(path); if (hash.first != info.hash) - throw Error(format("derivation `%2%' may not be deterministic: hash mismatch in output `%1%'") % drvPath % path); + throw Error(format("derivation `%1%' may not be deterministic: hash mismatch in output `%2%'") % drvPath % path); continue; } @@ -2347,16 +2378,36 @@ void DerivationGoal::registerOutputs() debug(format("referenced input: `%1%'") % *i); } - /* If the derivation specifies an `allowedReferences' - attribute (containing a list of paths that the output may - refer to), check that all references are in that list. !!! - allowedReferences should really be per-output. */ - if (drv.env.find("allowedReferences") != drv.env.end()) { - PathSet allowed = parseReferenceSpecifiers(drv, get(drv.env, "allowedReferences")); - foreach (PathSet::iterator, i, references) - if (allowed.find(*i) == allowed.end()) - throw BuildError(format("output is not allowed to refer to path `%1%'") % *i); - } + /* Enforce `allowedReferences' and friends. */ + auto checkRefs = [&](const string & attrName, bool allowed, bool recursive) { + if (drv.env.find(attrName) == drv.env.end()) return; + + PathSet spec = parseReferenceSpecifiers(drv, get(drv.env, attrName)); + + PathSet used; + if (recursive) { + /* Our requisites are the union of the closures of our references. */ + for (auto & i : references) + /* Don't call computeFSClosure on ourselves. */ + if (actualPath != i) + computeFSClosure(worker.store, i, used); + } else + used = references; + + for (auto & i : used) + if (allowed) { + if (spec.find(i) == spec.end()) + throw BuildError(format("output (`%1%') is not allowed to refer to path `%2%'") % actualPath % i); + } else { + if (spec.find(i) != spec.end()) + throw BuildError(format("output (`%1%') is not allowed to refer to path `%2%'") % actualPath % i); + } + }; + + checkRefs("allowedReferences", true, false); + checkRefs("allowedRequisites", true, true); + checkRefs("disallowedReferences", false, false); + checkRefs("disallowedRequisites", false, true); worker.store.optimisePath(path); // FIXME: combine with scanForReferences() @@ -2586,6 +2637,13 @@ public: void cancel(bool timeout); + string key() + { + /* "a$" ensures substitution goals happen before derivation + goals. */ + return "a$" + storePathToName(storePath) + "$" + storePath; + } + void work(); /* The states. */ @@ -2781,32 +2839,18 @@ void SubstitutionGoal::tryToRun() const char * * argArr = strings2CharPtrs(args); /* Fork the substitute program. */ - pid = maybeVfork(); - - switch (pid) { + pid = startProcess([&]() { - case -1: - throw SysError("unable to fork"); + commonChildInit(logPipe); - case 0: - try { /* child */ + if (dup2(outPipe.writeSide, STDOUT_FILENO) == -1) + throw SysError("cannot dup output pipe into stdout"); - commonChildInit(logPipe); + execv(sub.c_str(), (char * *) argArr); - if (dup2(outPipe.writeSide, STDOUT_FILENO) == -1) - throw SysError("cannot dup output pipe into stdout"); + throw SysError(format("executing `%1%'") % sub); + }); - execv(sub.c_str(), (char * *) argArr); - - throw SysError(format("executing `%1%'") % sub); - - } catch (std::exception & e) { - writeToStderr("substitute error: " + string(e.what()) + "\n"); - } - _exit(1); - } - - /* parent */ pid.setSeparatePG(true); pid.setKillSignal(SIGTERM); outPipe.writeSide.close(); @@ -2944,6 +2988,7 @@ Worker::Worker(LocalStore & store) nrLocalBuilds = 0; lastWokenUp = 0; permanentFailure = false; + timedOut = false; } @@ -3109,15 +3154,19 @@ void Worker::run(const Goals & _topGoals) checkInterrupt(); - /* Call every wake goal. */ + /* Call every wake goal (in the ordering established by + CompareGoalPtrs). */ while (!awake.empty() && !topGoals.empty()) { - WeakGoals awake2(awake); + Goals awake2; + for (auto & i : awake) { + GoalPtr goal = i.lock(); + if (goal) awake2.insert(goal); + } awake.clear(); - foreach (WeakGoals::iterator, i, awake2) { + for (auto & goal : awake2) { checkInterrupt(); - GoalPtr goal = i->lock(); - if (goal) goal->work(); - if (topGoals.empty()) break; + goal->work(); + if (topGoals.empty()) break; // stuff may have been cancelled } } @@ -3255,6 +3304,7 @@ void Worker::waitForInput() format("%1% timed out after %2% seconds of silence") % goal->getName() % settings.maxSilentTime); goal->cancel(true); + timedOut = true; } else if (goal->getExitCode() == Goal::ecBusy && @@ -3266,6 +3316,7 @@ void Worker::waitForInput() format("%1% timed out after %2% seconds") % goal->getName() % settings.buildTimeout); goal->cancel(true); + timedOut = true; } } @@ -3282,7 +3333,7 @@ void Worker::waitForInput() unsigned int Worker::exitStatus() { - return permanentFailure ? 100 : 1; + return timedOut ? 101 : (permanentFailure ? 100 : 1); } diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index f90edac1cd..f98e02c1e2 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -115,7 +115,10 @@ Path addPermRoot(StoreAPI & store, const Path & _storePath, % gcRoot % rootsDir); } - makeSymlink(gcRoot, storePath); + if (baseNameOf(gcRoot) == baseNameOf(storePath)) + writeFile(gcRoot, ""); + else + makeSymlink(gcRoot, storePath); } /* Check that the root can be found by the garbage collector. @@ -142,11 +145,6 @@ Path addPermRoot(StoreAPI & store, const Path & _storePath, } -/* The file to which we write our temporary roots. */ -static Path fnTempRoots; -static AutoCloseFD fdTempRoots; - - void LocalStore::addTempRoot(const Path & path) { /* Create the temporary roots file for this process. */ @@ -201,27 +199,6 @@ void LocalStore::addTempRoot(const Path & path) } -void removeTempRoots() -{ - if (fdTempRoots != -1) { - fdTempRoots.close(); - unlink(fnTempRoots.c_str()); - } -} - - -/* Automatically clean up the temporary roots file when we exit. */ -struct RemoveTempRoots -{ - ~RemoveTempRoots() - { - removeTempRoots(); - } -}; - -static RemoveTempRoots autoRemoveTempRoots __attribute__((unused)); - - typedef std::shared_ptr<AutoCloseFD> FDPtr; typedef list<FDPtr> FDs; @@ -230,11 +207,11 @@ static void readTempRoots(PathSet & tempRoots, FDs & fds) { /* Read the `temproots' directory for per-process temporary root files. */ - Strings tempRootFiles = readDirectory( + DirEntries tempRootFiles = readDirectory( (format("%1%/%2%") % settings.nixStateDir % tempRootsDir).str()); - foreach (Strings::iterator, i, tempRootFiles) { - Path path = (format("%1%/%2%/%3%") % settings.nixStateDir % tempRootsDir % *i).str(); + for (auto & i : tempRootFiles) { + Path path = (format("%1%/%2%/%3%") % settings.nixStateDir % tempRootsDir % i.name).str(); debug(format("reading temporary root file `%1%'") % path); FDPtr fd(new AutoCloseFD(open(path.c_str(), O_RDWR, 0666))); @@ -294,19 +271,19 @@ static void foundRoot(StoreAPI & store, } -static void findRoots(StoreAPI & store, const Path & path, Roots & roots) +static void findRoots(StoreAPI & store, const Path & path, unsigned char type, Roots & roots) { try { - struct stat st = lstat(path); + if (type == DT_UNKNOWN) + type = getFileType(path); - if (S_ISDIR(st.st_mode)) { - Strings names = readDirectory(path); - foreach (Strings::iterator, i, names) - findRoots(store, path + "/" + *i, roots); + if (type == DT_DIR) { + for (auto & i : readDirectory(path)) + findRoots(store, path + "/" + i.name, i.type, roots); } - else if (S_ISLNK(st.st_mode)) { + else if (type == DT_LNK) { Path target = readLink(path); if (isInStore(target)) foundRoot(store, path, target, roots); @@ -328,6 +305,12 @@ static void findRoots(StoreAPI & store, const Path & path, Roots & roots) } } + else if (type == DT_REG) { + Path storePath = settings.nixStore + "/" + baseNameOf(path); + if (store.isValidPath(storePath)) + roots[path] = storePath; + } + } catch (SysError & e) { @@ -345,9 +328,10 @@ Roots LocalStore::findRoots() Roots roots; /* Process direct roots in {gcroots,manifests,profiles}. */ - nix::findRoots(*this, settings.nixStateDir + "/" + gcRootsDir, roots); - nix::findRoots(*this, settings.nixStateDir + "/manifests", roots); - nix::findRoots(*this, settings.nixStateDir + "/profiles", roots); + nix::findRoots(*this, settings.nixStateDir + "/" + gcRootsDir, DT_UNKNOWN, roots); + if (pathExists(settings.nixStateDir + "/manifests")) + nix::findRoots(*this, settings.nixStateDir + "/manifests", DT_UNKNOWN, roots); + nix::findRoots(*this, settings.nixStateDir + "/profiles", DT_UNKNOWN, roots); return roots; } @@ -449,7 +433,6 @@ void LocalStore::deletePathRecursive(GCState & state, const Path & path) // if the path was not valid, need to determine the actual // size. state.bytesInvalidated += size; - // Mac OS X cannot rename directories if they are read-only. if (chmod(path.c_str(), st.st_mode | S_IWUSR) == -1) throw SysError(format("making `%1%' writable") % path); Path tmp = state.trashDir + "/" + baseNameOf(path); @@ -649,7 +632,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) /* After this point the set of roots or temporary roots cannot increase, since we hold locks on everything. So everything - that is not reachable from `roots'. */ + that is not reachable from `roots' is garbage. */ if (state.shouldDelete) { if (pathExists(state.trashDir)) deleteGarbage(state, state.trashDir); @@ -741,7 +724,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) } /* While we're at it, vacuum the database. */ - if (options.action == GCOptions::gcDeleteDead) vacuumDB(); + //if (options.action == GCOptions::gcDeleteDead) vacuumDB(); } diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 86fa56739c..bb08a7d0b0 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -2,6 +2,7 @@ #include "globals.hh" #include "util.hh" +#include "archive.hh" #include <map> #include <algorithm> @@ -55,6 +56,7 @@ Settings::Settings() envKeepDerivations = false; lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1"; showTrace = false; + enableImportNative = false; } @@ -112,35 +114,61 @@ void Settings::set(const string & name, const string & value) } +string Settings::get(const string & name, const string & def) +{ + auto i = settings.find(name); + if (i == settings.end()) return def; + return i->second; +} + + +Strings Settings::get(const string & name, const Strings & def) +{ + auto i = settings.find(name); + if (i == settings.end()) return def; + return tokenizeString<Strings>(i->second); +} + + +bool Settings::get(const string & name, bool def) +{ + bool res = def; + _get(res, name); + return res; +} + + void Settings::update() { - get(tryFallback, "build-fallback"); - get(maxBuildJobs, "build-max-jobs"); - get(buildCores, "build-cores"); - get(thisSystem, "system"); - get(maxSilentTime, "build-max-silent-time"); - get(buildTimeout, "build-timeout"); - get(reservedSize, "gc-reserved-space"); - get(fsyncMetadata, "fsync-metadata"); - get(useSQLiteWAL, "use-sqlite-wal"); - get(syncBeforeRegistering, "sync-before-registering"); - get(useSubstitutes, "build-use-substitutes"); - get(buildUsersGroup, "build-users-group"); - get(useChroot, "build-use-chroot"); - get(dirsInChroot, "build-chroot-dirs"); - get(impersonateLinux26, "build-impersonate-linux-26"); - get(keepLog, "build-keep-log"); - get(compressLog, "build-compress-log"); - get(maxLogSize, "build-max-log-size"); - get(cacheFailure, "build-cache-failure"); - get(pollInterval, "build-poll-interval"); - get(checkRootReachability, "gc-check-reachability"); - get(gcKeepOutputs, "gc-keep-outputs"); - get(gcKeepDerivations, "gc-keep-derivations"); - get(autoOptimiseStore, "auto-optimise-store"); - get(envKeepDerivations, "env-keep-derivations"); - get(sshSubstituterHosts, "ssh-substituter-hosts"); - get(useSshSubstituter, "use-ssh-substituter"); + _get(tryFallback, "build-fallback"); + _get(maxBuildJobs, "build-max-jobs"); + _get(buildCores, "build-cores"); + _get(thisSystem, "system"); + _get(maxSilentTime, "build-max-silent-time"); + _get(buildTimeout, "build-timeout"); + _get(reservedSize, "gc-reserved-space"); + _get(fsyncMetadata, "fsync-metadata"); + _get(useSQLiteWAL, "use-sqlite-wal"); + _get(syncBeforeRegistering, "sync-before-registering"); + _get(useSubstitutes, "build-use-substitutes"); + _get(buildUsersGroup, "build-users-group"); + _get(useChroot, "build-use-chroot"); + _get(impersonateLinux26, "build-impersonate-linux-26"); + _get(keepLog, "build-keep-log"); + _get(compressLog, "build-compress-log"); + _get(maxLogSize, "build-max-log-size"); + _get(cacheFailure, "build-cache-failure"); + _get(pollInterval, "build-poll-interval"); + _get(checkRootReachability, "gc-check-reachability"); + _get(gcKeepOutputs, "gc-keep-outputs"); + _get(gcKeepDerivations, "gc-keep-derivations"); + _get(autoOptimiseStore, "auto-optimise-store"); + _get(envKeepDerivations, "env-keep-derivations"); + _get(sshSubstituterHosts, "ssh-substituter-hosts"); + _get(useSshSubstituter, "use-ssh-substituter"); + _get(logServers, "log-servers"); + _get(enableImportNative, "allow-unsafe-native-code-during-evaluation"); + _get(useCaseHack, "use-case-hack"); string subs = getEnv("NIX_SUBSTITUTERS", "default"); if (subs == "default") { @@ -158,7 +186,7 @@ void Settings::update() } -void Settings::get(string & res, const string & name) +void Settings::_get(string & res, const string & name) { SettingsMap::iterator i = settings.find(name); if (i == settings.end()) return; @@ -166,7 +194,7 @@ void Settings::get(string & res, const string & name) } -void Settings::get(bool & res, const string & name) +void Settings::_get(bool & res, const string & name) { SettingsMap::iterator i = settings.find(name); if (i == settings.end()) return; @@ -177,7 +205,7 @@ void Settings::get(bool & res, const string & name) } -void Settings::get(StringSet & res, const string & name) +void Settings::_get(StringSet & res, const string & name) { SettingsMap::iterator i = settings.find(name); if (i == settings.end()) return; @@ -186,7 +214,7 @@ void Settings::get(StringSet & res, const string & name) res.insert(ss.begin(), ss.end()); } -void Settings::get(Strings & res, const string & name) +void Settings::_get(Strings & res, const string & name) { SettingsMap::iterator i = settings.find(name); if (i == settings.end()) return; @@ -194,7 +222,7 @@ void Settings::get(Strings & res, const string & name) } -template<class N> void Settings::get(N & res, const string & name) +template<class N> void Settings::_get(N & res, const string & name) { SettingsMap::iterator i = settings.find(name); if (i == settings.end()) return; diff --git a/nix/libstore/globals.hh b/nix/libstore/globals.hh index 711c365294..c17e10d7c3 100644 --- a/nix/libstore/globals.hh +++ b/nix/libstore/globals.hh @@ -21,6 +21,12 @@ struct Settings { void set(const string & name, const string & value); + string get(const string & name, const string & def); + + Strings get(const string & name, const Strings & def); + + bool get(const string & name, bool def); + void update(); string pack(); @@ -142,10 +148,6 @@ struct Settings { /* Whether to build in chroot. */ bool useChroot; - /* The directories from the host filesystem to be included in the - chroot. */ - StringSet dirsInChroot; - /* Set of ssh connection strings for the ssh substituter */ Strings sshSubstituterHosts; @@ -197,14 +199,20 @@ struct Settings { /* Whether to show a stack trace if Nix evaluation fails. */ bool showTrace; + /* A list of URL prefixes that can return Nix build logs. */ + Strings logServers; + + /* Whether the importNative primop should be enabled */ + bool enableImportNative; + private: SettingsMap settings, overrides; - void get(string & res, const string & name); - void get(bool & res, const string & name); - void get(StringSet & res, const string & name); - void get(Strings & res, const string & name); - template<class N> void get(N & res, const string & name); + void _get(string & res, const string & name); + void _get(bool & res, const string & name); + void _get(StringSet & res, const string & name); + void _get(Strings & res, const string & name); + template<class N> void _get(N & res, const string & name); }; diff --git a/nix/libstore/local-store.cc b/nix/libstore/local-store.cc index 2c3d65215c..a890ab56b3 100644 --- a/nix/libstore/local-store.cc +++ b/nix/libstore/local-store.cc @@ -358,7 +358,17 @@ LocalStore::~LocalStore() i->second.to.close(); i->second.from.close(); i->second.error.close(); - i->second.pid.wait(true); + if (i->second.pid != -1) + i->second.pid.wait(true); + } + } catch (...) { + ignoreException(); + } + + try { + if (fdTempRoots != -1) { + fdTempRoots.close(); + unlink(fnTempRoots.c_str()); } } catch (...) { ignoreException(); @@ -551,9 +561,9 @@ static void canonicalisePathMetaData_(const Path & path, uid_t fromUid, InodesSe if (lstat(path.c_str(), &st)) throw SysError(format("getting attributes of path `%1%'") % path); - /* Really make sure that the path is of a supported type. This - has already been checked in dumpPath(). */ - assert(S_ISREG(st.st_mode) || S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode)); + /* Really make sure that the path is of a supported type. */ + if (!(S_ISREG(st.st_mode) || S_ISDIR(st.st_mode) || S_ISLNK(st.st_mode))) + throw Error(format("file ‘%1%’ has an unsupported type") % path); /* Fail if the file is not owned by the build user. This prevents us from messing up the ownership/permissions of files @@ -593,9 +603,9 @@ static void canonicalisePathMetaData_(const Path & path, uid_t fromUid, InodesSe } if (S_ISDIR(st.st_mode)) { - Strings names = readDirectory(path); - foreach (Strings::iterator, i, names) - canonicalisePathMetaData_(path + "/" + *i, fromUid, inodesSeen); + DirEntries entries = readDirectory(path); + for (auto & i : entries) + canonicalisePathMetaData_(path + "/" + i.name, fromUid, inodesSeen); } } @@ -1083,31 +1093,16 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter & setSubstituterEnv(); - run.pid = maybeVfork(); - - switch (run.pid) { - - case -1: - throw SysError("unable to fork"); - - case 0: /* child */ - try { - restoreAffinity(); - if (dup2(toPipe.readSide, STDIN_FILENO) == -1) - throw SysError("dupping stdin"); - if (dup2(fromPipe.writeSide, STDOUT_FILENO) == -1) - throw SysError("dupping stdout"); - if (dup2(errorPipe.writeSide, STDERR_FILENO) == -1) - throw SysError("dupping stderr"); - execl(substituter.c_str(), substituter.c_str(), "--query", NULL); - throw SysError(format("executing `%1%'") % substituter); - } catch (std::exception & e) { - std::cerr << "error: " << e.what() << std::endl; - } - _exit(1); - } - - /* Parent. */ + run.pid = startProcess([&]() { + if (dup2(toPipe.readSide, STDIN_FILENO) == -1) + throw SysError("dupping stdin"); + if (dup2(fromPipe.writeSide, STDOUT_FILENO) == -1) + throw SysError("dupping stdout"); + if (dup2(errorPipe.writeSide, STDERR_FILENO) == -1) + throw SysError("dupping stderr"); + execl(substituter.c_str(), substituter.c_str(), "--query", NULL); + throw SysError(format("executing `%1%'") % substituter); + }); run.program = baseNameOf(substituter); run.to = toPipe.writeSide.borrow(); @@ -1170,8 +1165,7 @@ string LocalStore::getLineFromSubstituter(RunningSubstituter & run) string::size_type p; while (((p = err.find('\n')) != string::npos) || ((p = err.find('\r')) != string::npos)) { - string thing(err, 0, p + 1); - writeToStderr(run.program + ": " + thing); + printMsg(lvlError, run.program + ": " + string(err, 0, p)); err = string(err, p + 1); } } @@ -1503,7 +1497,8 @@ void LocalStore::exportPath(const Path & path, bool sign, { assertStorePath(path); - addTempRoot(path); + printMsg(lvlInfo, format("exporting path `%1%'") % path); + if (!isValidPath(path)) throw Error(format("path `%1%' is not valid") % path); @@ -1613,8 +1608,6 @@ Path LocalStore::importPath(bool requireSignature, Source & source) Path dstPath = readStorePath(hashAndReadSource); - printMsg(lvlInfo, format("importing path `%1%'") % dstPath); - PathSet references = readStorePaths<PathSet>(hashAndReadSource); Path deriver = readString(hashAndReadSource); @@ -1747,8 +1740,8 @@ bool LocalStore::verifyStore(bool checkContents, bool repair) /* Acquire the global GC lock to prevent a garbage collection. */ AutoCloseFD fdGCLock = openGCLock(ltWrite); - Paths entries = readDirectory(settings.nixStore); - PathSet store(entries.begin(), entries.end()); + PathSet store; + for (auto & i : readDirectory(settings.nixStore)) store.insert(i.name); /* Check whether all valid paths actually exist. */ printMsg(lvlInfo, "checking path existence..."); @@ -1898,9 +1891,8 @@ void LocalStore::markContentsGood(const Path & path) PathSet LocalStore::queryValidPathsOld() { PathSet paths; - Strings entries = readDirectory(settings.nixDBPath + "/info"); - foreach (Strings::iterator, i, entries) - if (i->at(0) != '.') paths.insert(settings.nixStore + "/" + *i); + for (auto & i : readDirectory(settings.nixDBPath + "/info")) + if (i.name.at(0) != '.') paths.insert(settings.nixStore + "/" + i.name); return paths; } @@ -1987,9 +1979,8 @@ static void makeMutable(const Path & path) if (!S_ISDIR(st.st_mode) && !S_ISREG(st.st_mode)) return; if (S_ISDIR(st.st_mode)) { - Strings names = readDirectory(path); - foreach (Strings::iterator, i, names) - makeMutable(path + "/" + *i); + for (auto & i : readDirectory(path)) + makeMutable(path + "/" + i.name); } /* The O_NOFOLLOW is important to prevent us from changing the diff --git a/nix/libstore/local-store.hh b/nix/libstore/local-store.hh index 54331e448a..e0aabdba42 100644 --- a/nix/libstore/local-store.hh +++ b/nix/libstore/local-store.hh @@ -1,16 +1,12 @@ #pragma once #include <string> +#include <unordered_set> #include "store-api.hh" #include "util.hh" #include "pathlocks.hh" -#if HAVE_TR1_UNORDERED_SET -#include <tr1/unordered_set> -#endif - - class sqlite3; class sqlite3_stmt; @@ -171,6 +167,9 @@ public: files with the same contents. */ void optimiseStore(OptimiseStats & stats); + /* Generic variant of the above method. */ + void optimiseStore(); + /* Optimise a single store path. */ void optimisePath(const Path & path); @@ -245,6 +244,10 @@ private: bool didSetSubstituterEnv; + /* The file to which we write our temporary roots. */ + Path fnTempRoots; + AutoCloseFD fdTempRoots; + int getSchema(); void openDB(bool create); @@ -306,11 +309,7 @@ private: void checkDerivationOutputs(const Path & drvPath, const Derivation & drv); -#if HAVE_TR1_UNORDERED_SET - typedef std::tr1::unordered_set<ino_t> InodeHash; -#else - typedef std::set<ino_t> InodeHash; -#endif + typedef std::unordered_set<ino_t> InodeHash; InodeHash loadInodeHash(); Strings readDirectoryIgnoringInodes(const Path & path, const InodeHash & inodeHash); diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc index 67ee94a4bd..8ba9d1a263 100644 --- a/nix/libstore/optimise-store.cc +++ b/nix/libstore/optimise-store.cc @@ -225,6 +225,22 @@ void LocalStore::optimiseStore(OptimiseStats & stats) } } +static string showBytes(unsigned long long bytes) +{ + return (format("%.2f MiB") % (bytes / (1024.0 * 1024.0))).str(); +} + +void LocalStore::optimiseStore() +{ + OptimiseStats stats; + + optimiseStore(stats); + + printMsg(lvlError, + format("%1% freed by hard-linking %2% files") + % showBytes(stats.bytesFreed) + % stats.filesLinked); +} void LocalStore::optimisePath(const Path & path) { diff --git a/nix/libstore/remote-store.cc b/nix/libstore/remote-store.cc index 4619206932..448d9b6bc1 100644 --- a/nix/libstore/remote-store.cc +++ b/nix/libstore/remote-store.cc @@ -87,8 +87,7 @@ void RemoteStore::openConnection(bool reserveSpace) processStderr(); } catch (Error & e) { - throw Error(format("cannot start worker (%1%)") - % e.msg()); + throw Error(format("cannot start daemon worker: %1%") % e.msg()); } setOptions(); @@ -133,8 +132,6 @@ RemoteStore::~RemoteStore() try { to.flush(); fdSocket.close(); - if (child != -1) - child.wait(true); } catch (...) { ignoreException(); } @@ -402,8 +399,23 @@ Path RemoteStore::addToStore(const Path & _srcPath, writeInt((hashAlgo == htSHA256 && recursive) ? 0 : 1, to); writeInt(recursive ? 1 : 0, to); writeString(printHashType(hashAlgo), to); - dumpPath(srcPath, to, filter); - processStderr(); + + try { + to.written = 0; + to.warn = true; + dumpPath(srcPath, to, filter); + to.warn = false; + processStderr(); + } catch (SysError & e) { + /* Daemon closed while we were sending the path. Probably OOM + or I/O error. */ + if (e.errNo == EPIPE) + try { + processStderr(); + } catch (EndOfFile & e) { } + throw; + } + return readStorePath(from); } @@ -564,6 +576,13 @@ void RemoteStore::clearFailedPaths(const PathSet & paths) readInt(from); } +void RemoteStore::optimiseStore() +{ + openConnection(); + writeInt(wopOptimiseStore, to); + processStderr(); + readInt(from); +} void RemoteStore::processStderr(Sink * sink, Source * source) { diff --git a/nix/libstore/remote-store.hh b/nix/libstore/remote-store.hh index 04b60fce4b..98774c10b3 100644 --- a/nix/libstore/remote-store.hh +++ b/nix/libstore/remote-store.hh @@ -82,12 +82,13 @@ public: PathSet queryFailedPaths(); void clearFailedPaths(const PathSet & paths); - + + void optimiseStore(); + private: AutoCloseFD fdSocket; FdSink to; FdSource from; - Pid child; unsigned int daemonVersion; bool initialised; diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh index b635fee2cf..3109f100ef 100644 --- a/nix/libstore/store-api.hh +++ b/nix/libstore/store-api.hh @@ -250,6 +250,10 @@ public: `nix-store --register-validity'. */ string makeValidityRegistration(const PathSet & paths, bool showDerivers, bool showHash); + + /* Optimise the disk space usage of the Nix store by hard-linking files + with the same contents. */ + virtual void optimiseStore() = 0; }; diff --git a/nix/libstore/worker-protocol.hh b/nix/libstore/worker-protocol.hh index 9317f89c37..4b040b77ce 100644 --- a/nix/libstore/worker-protocol.hh +++ b/nix/libstore/worker-protocol.hh @@ -12,7 +12,6 @@ namespace nix { typedef enum { - wopQuit = 0, wopIsValidPath = 1, wopHasSubstitutes = 3, wopQueryPathHash = 4, @@ -43,6 +42,7 @@ typedef enum { wopQueryValidPaths = 31, wopQuerySubstitutablePaths = 32, wopQueryValidDerivers = 33, + wopOptimiseStore = 34 } WorkerOp; diff --git a/nix/libutil/archive.cc b/nix/libutil/archive.cc index 70a1c580dd..6856ea0f28 100644 --- a/nix/libutil/archive.cc +++ b/nix/libutil/archive.cc @@ -1,10 +1,14 @@ +#define _XOPEN_SOURCE 600 + #include "config.h" #include <cerrno> #include <algorithm> #include <vector> +#include <map> + +#include <strings.h> // for strcasecmp -#define _XOPEN_SOURCE 600 #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> @@ -18,39 +22,21 @@ namespace nix { +bool useCaseHack = +#if __APPLE__ + true; +#else + false; +#endif + static string archiveVersion1 = "nix-archive-1"; +static string caseHackSuffix = "~nix~case~hack~"; PathFilter defaultPathFilter; -static void dump(const string & path, Sink & sink, PathFilter & filter); - - -static void dumpEntries(const Path & path, Sink & sink, PathFilter & filter) -{ - Strings names = readDirectory(path); - vector<string> names2(names.begin(), names.end()); - sort(names2.begin(), names2.end()); - - for (vector<string>::iterator i = names2.begin(); - i != names2.end(); ++i) - { - Path entry = path + "/" + *i; - if (filter(entry)) { - writeString("entry", sink); - writeString("(", sink); - writeString("name", sink); - writeString(*i, sink); - writeString("node", sink); - dump(entry, sink, filter); - writeString(")", sink); - } - } -} - - -static void dumpContents(const Path & path, size_t size, +static void dumpContents(const Path & path, size_t size, Sink & sink) { writeString("contents", sink); @@ -58,7 +44,7 @@ static void dumpContents(const Path & path, size_t size, AutoCloseFD fd = open(path.c_str(), O_RDONLY); if (fd == -1) throw SysError(format("opening file `%1%'") % path); - + unsigned char buf[65536]; size_t left = size; @@ -89,12 +75,40 @@ static void dump(const Path & path, Sink & sink, PathFilter & filter) writeString("", sink); } dumpContents(path, (size_t) st.st_size, sink); - } + } else if (S_ISDIR(st.st_mode)) { writeString("type", sink); writeString("directory", sink); - dumpEntries(path, sink, filter); + + /* If we're on a case-insensitive system like Mac OS X, undo + the case hack applied by restorePath(). */ + std::map<string, string> unhacked; + for (auto & i : readDirectory(path)) + if (useCaseHack) { + string name(i.name); + size_t pos = i.name.find(caseHackSuffix); + if (pos != string::npos) { + printMsg(lvlDebug, format("removing case hack suffix from `%1%'") % (path + "/" + i.name)); + name.erase(pos); + } + if (unhacked.find(name) != unhacked.end()) + throw Error(format("file name collision in between `%1%' and `%2%'") + % (path + "/" + unhacked[name]) % (path + "/" + i.name)); + unhacked[name] = i.name; + } else + unhacked[i.name] = i.name; + + for (auto & i : unhacked) + if (filter(path + "/" + i.first)) { + writeString("entry", sink); + writeString("(", sink); + writeString("name", sink); + writeString(i.first, sink); + writeString("node", sink); + dump(path + "/" + i.second, sink, filter); + writeString(")", sink); + } } else if (S_ISLNK(st.st_mode)) { @@ -123,6 +137,7 @@ static SerialisationError badArchive(string s) } +#if 0 static void skipGeneric(Source & source) { if (readString(source) == "(") { @@ -130,43 +145,13 @@ static void skipGeneric(Source & source) skipGeneric(source); } } - - -static void parse(ParseSink & sink, Source & source, const Path & path); - - - -static void parseEntry(ParseSink & sink, Source & source, const Path & path) -{ - string s, name; - - s = readString(source); - if (s != "(") throw badArchive("expected open tag"); - - while (1) { - checkInterrupt(); - - s = readString(source); - - if (s == ")") { - break; - } else if (s == "name") { - name = readString(source); - } else if (s == "node") { - if (s == "") throw badArchive("entry name missing"); - parse(sink, source, path + "/" + name); - } else { - throw badArchive("unknown field " + s); - skipGeneric(source); - } - } -} +#endif static void parseContents(ParseSink & sink, Source & source, const Path & path) { unsigned long long size = readLongLong(source); - + sink.preallocateContents(size); unsigned long long left = size; @@ -185,6 +170,15 @@ static void parseContents(ParseSink & sink, Source & source, const Path & path) } +struct CaseInsensitiveCompare +{ + bool operator() (const string & a, const string & b) const + { + return strcasecmp(a.c_str(), b.c_str()) < 0; + } +}; + + static void parse(ParseSink & sink, Source & source, const Path & path) { string s; @@ -194,6 +188,8 @@ static void parse(ParseSink & sink, Source & source, const Path & path) enum { tpUnknown, tpRegular, tpDirectory, tpSymlink } type = tpUnknown; + std::map<Path, int, CaseInsensitiveCompare> names; + while (1) { checkInterrupt(); @@ -221,9 +217,9 @@ static void parse(ParseSink & sink, Source & source, const Path & path) else if (t == "symlink") { type = tpSymlink; } - + else throw badArchive("unknown file type " + t); - + } else if (s == "contents" && type == tpRegular) { @@ -236,7 +232,40 @@ static void parse(ParseSink & sink, Source & source, const Path & path) } else if (s == "entry" && type == tpDirectory) { - parseEntry(sink, source, path); + string name, prevName; + + s = readString(source); + if (s != "(") throw badArchive("expected open tag"); + + while (1) { + checkInterrupt(); + + s = readString(source); + + if (s == ")") { + break; + } else if (s == "name") { + name = readString(source); + if (name.empty() || name == "." || name == ".." || name.find('/') != string::npos || name.find((char) 0) != string::npos) + throw Error(format("NAR contains invalid file name `%1%'") % name); + if (name <= prevName) + throw Error("NAR directory is not sorted"); + prevName = name; + if (useCaseHack) { + auto i = names.find(name); + if (i != names.end()) { + printMsg(lvlDebug, format("case collision between `%1%' and `%2%'") % i->first % name); + name += caseHackSuffix; + name += int2String(++i->second); + } else + names[name] = 0; + } + } else if (s == "node") { + if (s.empty()) throw badArchive("entry name missing"); + parse(sink, source, path + "/" + name); + } else + throw badArchive("unknown field " + s); + } } else if (s == "target" && type == tpSymlink) { @@ -244,17 +273,15 @@ static void parse(ParseSink & sink, Source & source, const Path & path) sink.createSymlink(path, target); } - else { + else throw badArchive("unknown field " + s); - skipGeneric(source); - } } } void parseDump(ParseSink & sink, Source & source) { - string version; + string version; try { version = readString(source); } catch (SerialisationError & e) { @@ -323,7 +350,7 @@ struct RestoreSink : ParseSink } }; - + void restorePath(const Path & path, Source & source) { RestoreSink sink; @@ -331,5 +358,5 @@ void restorePath(const Path & path, Source & source) parseDump(sink, source); } - + } diff --git a/nix/libutil/archive.hh b/nix/libutil/archive.hh index ccac92074d..c216e9768f 100644 --- a/nix/libutil/archive.hh +++ b/nix/libutil/archive.hh @@ -28,7 +28,7 @@ namespace nix { where: - attrs(as) = concat(map(attr, as)) + encN(0) + attrs(as) = concat(map(attr, as)) + encN(0) attrs((a, b)) = encS(a) + encS(b) encS(s) = encN(len(s)) + s + (padding until next 64-bit boundary) @@ -58,7 +58,7 @@ void dumpPath(const Path & path, Sink & sink, struct ParseSink { virtual void createDirectory(const Path & path) { }; - + virtual void createRegularFile(const Path & path) { }; virtual void isExecutable() { }; virtual void preallocateContents(unsigned long long size) { }; @@ -66,10 +66,14 @@ struct ParseSink virtual void createSymlink(const Path & path, const string & target) { }; }; - + void parseDump(ParseSink & sink, Source & source); void restorePath(const Path & path, Source & source); - + +// FIXME: global variables are bad m'kay. +extern bool useCaseHack; + + } diff --git a/nix/libutil/serialise.cc b/nix/libutil/serialise.cc index 6b71f52c15..9241750750 100644 --- a/nix/libutil/serialise.cc +++ b/nix/libutil/serialise.cc @@ -54,8 +54,24 @@ FdSink::~FdSink() } +size_t threshold = 256 * 1024 * 1024; + +static void warnLargeDump() +{ + printMsg(lvlError, "warning: dumping very large path (> 256 MiB); this may run out of memory"); +} + + void FdSink::write(const unsigned char * data, size_t len) { + static bool warned = false; + if (warn && !warned) { + written += len; + if (written > threshold) { + warnLargeDump(); + warned = true; + } + } writeFull(fd, data, len); } @@ -256,4 +272,15 @@ template Paths readStrings(Source & source); template PathSet readStrings(Source & source); +void StringSink::operator () (const unsigned char * data, size_t len) +{ + static bool warned = false; + if (!warned && s.size() > threshold) { + warnLargeDump(); + warned = true; + } + s.append((const char *) data, len); +} + + } diff --git a/nix/libutil/serialise.hh b/nix/libutil/serialise.hh index e5a9df1d05..6a6f028aa6 100644 --- a/nix/libutil/serialise.hh +++ b/nix/libutil/serialise.hh @@ -72,9 +72,11 @@ struct BufferedSource : Source struct FdSink : BufferedSink { int fd; + bool warn; + size_t written; - FdSink() : fd(-1) { } - FdSink(int fd) : fd(fd) { } + FdSink() : fd(-1), warn(false), written(0) { } + FdSink(int fd) : fd(fd), warn(false), written(0) { } ~FdSink(); void write(const unsigned char * data, size_t len); @@ -95,10 +97,7 @@ struct FdSource : BufferedSource struct StringSink : Sink { string s; - void operator () (const unsigned char * data, size_t len) - { - s.append((const char *) data, len); - } + void operator () (const unsigned char * data, size_t len); }; diff --git a/nix/libutil/types.hh b/nix/libutil/types.hh index 4b5ce9a78c..160884ee1a 100644 --- a/nix/libutil/types.hh +++ b/nix/libutil/types.hh @@ -8,6 +8,15 @@ #include <boost/format.hpp> +/* Before 4.7, gcc's std::exception uses empty throw() specifiers for + * its (virtual) destructor and what() in c++11 mode, in violation of spec + */ +#ifdef __GNUC__ +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) +#define EXCEPTION_NEEDS_THROW_SPEC +#endif +#endif + namespace nix { @@ -39,10 +48,14 @@ protected: public: unsigned int status; // exit status BaseError(const FormatOrString & fs, unsigned int status = 1); +#ifdef EXCEPTION_NEEDS_THROW_SPEC ~BaseError() throw () { }; const char * what() const throw () { return err.c_str(); } - const string & msg() const throw () { return err; } - const string & prefix() const throw () { return prefix_; } +#else + const char * what() const noexcept { return err.c_str(); } +#endif + const string & msg() const { return err; } + const string & prefix() const { return prefix_; } BaseError & addPrefix(const FormatOrString & fs); }; diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 846674a29d..a4a1ddb12a 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -1,5 +1,8 @@ #include "config.h" +#include "util.hh" +#include "affinity.hh" + #include <iostream> #include <cerrno> #include <cstdio> @@ -16,8 +19,6 @@ #include <sys/syscall.h> #endif -#include "util.hh" - extern char * * environ; @@ -125,7 +126,6 @@ Path canonPath(const Path & path, bool resolveSymlinks) i = temp.begin(); /* restart */ end = temp.end(); s = ""; - /* !!! potential for infinite loop */ } } } @@ -202,9 +202,10 @@ bool isLink(const Path & path) } -Strings readDirectory(const Path & path) +DirEntries readDirectory(const Path & path) { - Strings names; + DirEntries entries; + entries.reserve(64); AutoCloseDir dir = opendir(path.c_str()); if (!dir) throw SysError(format("opening directory `%1%'") % path); @@ -214,11 +215,21 @@ Strings readDirectory(const Path & path) checkInterrupt(); string name = dirent->d_name; if (name == "." || name == "..") continue; - names.push_back(name); + entries.emplace_back(name, dirent->d_ino, dirent->d_type); } if (errno) throw SysError(format("reading directory `%1%'") % path); - return names; + return entries; +} + + +unsigned char getFileType(const Path & path) +{ + struct stat st = lstat(path); + if (S_ISDIR(st.st_mode)) return DT_DIR; + if (S_ISLNK(st.st_mode)) return DT_LNK; + if (S_ISREG(st.st_mode)) return DT_REG; + return DT_UNKNOWN; } @@ -293,16 +304,14 @@ static void _deletePath(const Path & path, unsigned long long & bytesFreed) bytesFreed += st.st_blocks * 512; if (S_ISDIR(st.st_mode)) { - Strings names = readDirectory(path); - /* Make the directory writable. */ if (!(st.st_mode & S_IWUSR)) { if (chmod(path.c_str(), st.st_mode | S_IWUSR) == -1) throw SysError(format("making `%1%' writable") % path); } - for (Strings::iterator i = names.begin(); i != names.end(); ++i) - _deletePath(path + "/" + *i, bytesFreed); + for (auto & i : readDirectory(path)) + _deletePath(path + "/" + i.name, bytesFreed); } if (remove(path.c_str()) == -1) @@ -380,6 +389,9 @@ Paths createDirs(const Path & path) created.push_back(path); } + if (S_ISLNK(st.st_mode) && stat(path.c_str(), &st) == -1) + throw SysError(format("statting symlink `%1%'") % path); + if (!S_ISDIR(st.st_mode)) throw Error(format("`%1%' is not a directory") % path); return created; @@ -466,10 +478,18 @@ void warnOnce(bool & haveWarned, const FormatOrString & fs) } +static void defaultWriteToStderr(const unsigned char * buf, size_t count) +{ + writeFull(STDERR_FILENO, buf, count); +} + + void writeToStderr(const string & s) { try { - _writeToStderr((const unsigned char *) s.data(), s.size()); + auto p = _writeToStderr; + if (!p) p = defaultWriteToStderr; + p((const unsigned char *) s.data(), s.size()); } catch (SysError & e) { /* Ignore failing writes to stderr if we're in an exception handler, otherwise throw an exception. We need to ignore @@ -481,12 +501,6 @@ void writeToStderr(const string & s) } -static void defaultWriteToStderr(const unsigned char * buf, size_t count) -{ - writeFull(STDERR_FILENO, buf, count); -} - - void (*_writeToStderr) (const unsigned char * buf, size_t count) = defaultWriteToStderr; @@ -707,10 +721,14 @@ void AutoCloseDir::close() Pid::Pid() + : pid(-1), separatePG(false), killSignal(SIGKILL) +{ +} + + +Pid::Pid(pid_t pid) + : pid(pid), separatePG(false), killSignal(SIGKILL) { - pid = -1; - separatePG = false; - killSignal = SIGKILL; } @@ -734,11 +752,12 @@ Pid::operator pid_t() } -void Pid::kill() +void Pid::kill(bool quiet) { if (pid == -1 || pid == 0) return; - printMsg(lvlError, format("killing process %1%") % pid); + if (!quiet) + printMsg(lvlError, format("killing process %1%") % pid); /* Send the requested signal to the child. If it has its own process group, send the signal to every process in the child @@ -801,43 +820,30 @@ void killUser(uid_t uid) users to which the current process can send signals. So we fork a process, switch to uid, and send a mass kill. */ - Pid pid; - pid = fork(); - switch (pid) { + Pid pid = startProcess([&]() { - case -1: - throw SysError("unable to fork"); + if (setuid(uid) == -1) + throw SysError("setting uid"); - case 0: - try { /* child */ - - if (setuid(uid) == -1) - throw SysError("setting uid"); - - while (true) { + while (true) { #ifdef __APPLE__ - /* OSX's kill syscall takes a third parameter that, among other - things, determines if kill(-1, signo) affects the calling - process. In the OSX libc, it's set to true, which means - "follow POSIX", which we don't want here + /* OSX's kill syscall takes a third parameter that, among + other things, determines if kill(-1, signo) affects the + calling process. In the OSX libc, it's set to true, + which means "follow POSIX", which we don't want here */ - if (syscall(SYS_kill, -1, SIGKILL, false) == 0) break; + if (syscall(SYS_kill, -1, SIGKILL, false) == 0) break; #else - if (kill(-1, SIGKILL) == 0) break; + if (kill(-1, SIGKILL) == 0) break; #endif - if (errno == ESRCH) break; /* no more processes */ - if (errno != EINTR) - throw SysError(format("cannot kill processes for uid `%1%'") % uid); - } - - } catch (std::exception & e) { - writeToStderr((format("killing processes belonging to uid `%1%': %2%\n") % uid % e.what()).str()); - _exit(1); + if (errno == ESRCH) break; /* no more processes */ + if (errno != EINTR) + throw SysError(format("cannot kill processes for uid `%1%'") % uid); } + _exit(0); - } + }); - /* parent */ int status = pid.wait(true); if (status != 0) throw Error(format("cannot kill processes for uid `%1%': %2%") % uid % statusToString(status)); @@ -852,6 +858,32 @@ void killUser(uid_t uid) ////////////////////////////////////////////////////////////////////// +pid_t startProcess(std::function<void()> fun, + bool dieWithParent, const string & errorPrefix, bool runExitHandlers) +{ + pid_t pid = fork(); + if (pid == -1) throw SysError("unable to fork"); + + if (pid == 0) { + _writeToStderr = 0; + try { + restoreAffinity(); + fun(); + } catch (std::exception & e) { + try { + std::cerr << errorPrefix << e.what() << "\n"; + } catch (...) { } + } catch (...) { } + if (runExitHandlers) + exit(1); + else + _exit(1); + } + + return pid; +} + + string runProgram(Path program, bool searchPath, const Strings & args) { checkInterrupt(); @@ -867,32 +899,17 @@ string runProgram(Path program, bool searchPath, const Strings & args) pipe.create(); /* Fork. */ - Pid pid; - pid = maybeVfork(); - - switch (pid) { - - case -1: - throw SysError("unable to fork"); + Pid pid = startProcess([&]() { + if (dup2(pipe.writeSide, STDOUT_FILENO) == -1) + throw SysError("dupping stdout"); - case 0: /* child */ - try { - if (dup2(pipe.writeSide, STDOUT_FILENO) == -1) - throw SysError("dupping stdout"); - - if (searchPath) - execvp(program.c_str(), (char * *) &cargs[0]); - else - execv(program.c_str(), (char * *) &cargs[0]); - throw SysError(format("executing `%1%'") % program); - - } catch (std::exception & e) { - writeToStderr("error: " + string(e.what()) + "\n"); - } - _exit(1); - } + if (searchPath) + execvp(program.c_str(), (char * *) &cargs[0]); + else + execv(program.c_str(), (char * *) &cargs[0]); - /* Parent. */ + throw SysError(format("executing `%1%'") % program); + }); pipe.writeSide.close(); @@ -901,7 +918,7 @@ string runProgram(Path program, bool searchPath, const Strings & args) /* Wait for the child to finish. */ int status = pid.wait(true); if (!statusOk(status)) - throw Error(format("program `%1%' %2%") + throw ExecError(format("program `%1%' %2%") % program % statusToString(status)); return result; @@ -928,13 +945,6 @@ void closeOnExec(int fd) } -#if HAVE_VFORK -pid_t (*maybeVfork)() = vfork; -#else -pid_t (*maybeVfork)() = fork; -#endif - - ////////////////////////////////////////////////////////////////////// diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh index ce2d77c19a..0ad0026711 100644 --- a/nix/libutil/util.hh +++ b/nix/libutil/util.hh @@ -7,6 +7,7 @@ #include <dirent.h> #include <unistd.h> #include <signal.h> +#include <functional> #include <cstdio> @@ -63,7 +64,20 @@ bool isLink(const Path & path); /* Read the contents of a directory. The entries `.' and `..' are removed. */ -Strings readDirectory(const Path & path); +struct DirEntry +{ + string name; + ino_t ino; + unsigned char type; // one of DT_* + DirEntry(const string & name, ino_t ino, unsigned char type) + : name(name), ino(ino), type(type) { } +}; + +typedef vector<DirEntry> DirEntries; + +DirEntries readDirectory(const Path & path); + +unsigned char getFileType(const Path & path); /* Read the contents of a file into a string. */ string readFile(int fd); @@ -237,10 +251,11 @@ class Pid int killSignal; public: Pid(); + Pid(pid_t pid); ~Pid(); void operator =(pid_t pid); operator pid_t(); - void kill(); + void kill(bool quiet = false); int wait(bool block); void setSeparatePG(bool separatePG); void setKillSignal(int signal); @@ -252,11 +267,19 @@ public: void killUser(uid_t uid); +/* Fork a process that runs the given function, and return the child + pid to the caller. */ +pid_t startProcess(std::function<void()> fun, bool dieWithParent = true, + const string & errorPrefix = "error: ", bool runExitHandlers = false); + + /* Run a program and return its stdout in a string (i.e., like the shell backtick operator). */ string runProgram(Path program, bool searchPath = false, const Strings & args = Strings()); +MakeError(ExecError, Error) + /* Close all file descriptors except stdin, stdout, stderr, and those listed in the given set. Good practice in child processes. */ void closeMostFDs(const set<int> & exceptions); @@ -264,9 +287,6 @@ void closeMostFDs(const set<int> & exceptions); /* Set the close-on-exec flag for the given file descriptor. */ void closeOnExec(int fd); -/* Call vfork() if available, otherwise fork(). */ -extern pid_t (*maybeVfork)(); - /* User interruption. */ diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index f096ed5a97..315744394f 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -154,8 +154,18 @@ parse_opt (int key, char *arg, struct argp_state *state) settings.useChroot = false; break; case GUIX_OPT_CHROOT_DIR: - settings.dirsInChroot.insert (arg); - break; + { + std::string chroot_dirs; + + chroot_dirs = settings.get ("build-extra-chroot-dirs", + (std::string) ""); + if (chroot_dirs == "") + chroot_dirs = arg; + else + chroot_dirs = chroot_dirs + " " + arg; + settings.set("build-extra-chroot-dirs", chroot_dirs); + break; + } case GUIX_OPT_DISABLE_LOG_COMPRESSION: settings.compressLog = false; break; @@ -328,11 +338,12 @@ main (int argc, char *argv[]) if (settings.useChroot) { - foreach (PathSet::iterator, i, settings.dirsInChroot) - { - printMsg (lvlDebug, - format ("directory `%1%' added to the chroot") % *i); - } + std::string chroot_dirs; + + chroot_dirs = settings.get ("build-extra-chroot-dirs", + (std::string) ""); + printMsg (lvlDebug, + format ("extra chroot directories: '%1%'") % chroot_dirs); } printMsg (lvlDebug, diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc index 8814fe3155..e42d602a3a 100644 --- a/nix/nix-daemon/nix-daemon.cc +++ b/nix/nix-daemon/nix-daemon.cc @@ -7,6 +7,8 @@ #include "affinity.hh" #include "globals.hh" +#include <algorithm> + #include <cstring> #include <unistd.h> #include <signal.h> @@ -17,6 +19,8 @@ #include <sys/un.h> #include <fcntl.h> #include <errno.h> +#include <pwd.h> +#include <grp.h> using namespace nix; @@ -44,7 +48,6 @@ static FdSource from(STDIN_FILENO); static FdSink to(STDOUT_FILENO); bool canSendStderr; -pid_t myPid; @@ -54,11 +57,7 @@ pid_t myPid; socket. */ static void tunnelStderr(const unsigned char * buf, size_t count) { - /* Don't send the message to the client if we're a child of the - process handling the connection. Otherwise we could screw up - the protocol. It's up to the parent to redirect stderr and - send it to the client somehow (e.g., as in build.cc). */ - if (canSendStderr && myPid == getpid()) { + if (canSendStderr) { try { writeInt(STDERR_NEXT, to); writeString(buf, count, to); @@ -284,15 +283,6 @@ static void performOp(bool trusted, unsigned int clientVersion, { switch (op) { -#if 0 - case wopQuit: { - /* Close the database. */ - store.reset((StoreAPI *) 0); - writeInt(1, to); - break; - } -#endif - case wopIsValidPath: { /* 'readStorePath' could raise an error leading to the connection being closed. To be able to recover from an invalid path error, @@ -450,7 +440,7 @@ static void performOp(bool trusted, unsigned int clientVersion, case wopImportPaths: { startWork(); TunnelSource source(from); - Paths paths = store->importPaths(true, source); + Paths paths = store->importPaths(!trusted, source); stopWork(); writeStrings(paths, to); break; @@ -650,6 +640,13 @@ static void performOp(bool trusted, unsigned int clientVersion, break; } + case wopOptimiseStore: + startWork(); + store->optimiseStore(); + stopWork(); + writeInt(1, to); + break; + default: throw Error(format("invalid operation %1%") % op); } @@ -659,7 +656,6 @@ static void performOp(bool trusted, unsigned int clientVersion, static void processConnection(bool trusted) { canSendStderr = false; - myPid = getpid(); _writeToStderr = tunnelStderr; #ifdef HAVE_HUP_NOTIFICATION @@ -708,7 +704,7 @@ static void processConnection(bool trusted) to.flush(); } catch (Error & e) { - stopWork(false, e.msg()); + stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0); to.flush(); return; } @@ -735,12 +731,10 @@ static void processConnection(bool trusted) during addTextToStore() / importPath(). If that happens, just send the error message and exit. */ bool errorAllowed = canSendStderr; - if (!errorAllowed) printMsg(lvlError, format("error processing client input: %1%") % e.msg()); stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? e.status : 0); - if (!errorAllowed) break; + if (!errorAllowed) throw; } catch (std::bad_alloc & e) { - if (canSendStderr) - stopWork(false, "Nix daemon out of memory", GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0); + stopWork(false, "Nix daemon out of memory", GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0); throw; } @@ -749,7 +743,7 @@ static void processConnection(bool trusted) assert(!canSendStderr); }; - printMsg(lvlError, format("%1% operations") % opCount); + printMsg(lvlDebug, format("%1% operations") % opCount); } @@ -771,6 +765,27 @@ static void setSigChldAction(bool autoReap) } +bool matchUser(const string & user, const string & group, const Strings & users) +{ + if (find(users.begin(), users.end(), "*") != users.end()) + return true; + + if (find(users.begin(), users.end(), user) != users.end()) + return true; + + for (auto & i : users) + if (string(i, 0, 1) == "@") { + if (group == string(i, 1)) return true; + struct group * gr = getgrnam(i.c_str() + 1); + if (!gr) continue; + for (char * * mem = gr->gr_mem; *mem; mem++) + if (user == string(*mem)) return true; + } + + return false; +} + + #define SD_LISTEN_FDS_START 3 @@ -856,58 +871,61 @@ static void daemonLoop() closeOnExec(remote); - /* Get the identity of the caller, if possible. */ - uid_t clientUid = -1; - pid_t clientPid = -1; bool trusted = false; + pid_t clientPid = -1; #if defined(SO_PEERCRED) + /* Get the identity of the caller, if possible. */ ucred cred; socklen_t credLen = sizeof(cred); - if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) != -1) { - clientPid = cred.pid; - clientUid = cred.uid; - if (clientUid == 0) trusted = true; - } -#endif + if (getsockopt(remote, SOL_SOCKET, SO_PEERCRED, &cred, &credLen) == -1) + throw SysError("getting peer credentials"); - printMsg(lvlInfo, format("accepted connection from pid %1%, uid %2%") % clientPid % clientUid); + clientPid = cred.pid; - /* Fork a child to handle the connection. */ - pid_t child; - child = fork(); + struct passwd * pw = getpwuid(cred.uid); + string user = pw ? pw->pw_name : int2String(cred.uid); - switch (child) { + struct group * gr = getgrgid(cred.gid); + string group = gr ? gr->gr_name : int2String(cred.gid); - case -1: - throw SysError("unable to fork"); + Strings trustedUsers = settings.get("trusted-users", Strings({"root"})); + Strings allowedUsers = settings.get("allowed-users", Strings({"*"})); - case 0: - try { /* child */ + if (matchUser(user, group, trustedUsers)) + trusted = true; - /* Background the daemon. */ - if (setsid() == -1) - throw SysError(format("creating a new session")); + if (!trusted && !matchUser(user, group, allowedUsers)) + throw Error(format("user `%1%' is not allowed to connect to the Nix daemon") % user); - /* Restore normal handling of SIGCHLD. */ - setSigChldAction(false); + printMsg(lvlInfo, format((string) "accepted connection from pid %1%, user %2%" + + (trusted ? " (trusted)" : "")) % clientPid % user); +#endif + + /* Fork a child to handle the connection. */ + startProcess([&]() { + fdSocket.close(); - /* For debugging, stuff the pid into argv[1]. */ - if (clientPid != -1 && argvSaved[1]) { - string processName = int2String(clientPid); - strncpy(argvSaved[1], processName.c_str(), strlen(argvSaved[1])); - } + /* Background the daemon. */ + if (setsid() == -1) + throw SysError(format("creating a new session")); - /* Handle the connection. */ - from.fd = remote; - to.fd = remote; - processConnection(trusted); + /* Restore normal handling of SIGCHLD. */ + setSigChldAction(false); - } catch (std::exception & e) { - writeToStderr("unexpected Nix daemon error: " + string(e.what()) + "\n"); + /* For debugging, stuff the pid into argv[1]. */ + if (clientPid != -1 && argvSaved[1]) { + string processName = int2String(clientPid); + strncpy(argvSaved[1], processName.c_str(), strlen(argvSaved[1])); } + + /* Handle the connection. */ + from.fd = remote; + to.fd = remote; + processConnection(trusted); + exit(0); - } + }, false, "unexpected Nix daemon error: ", true); } catch (Interrupted & e) { throw; diff --git a/tests/guix-archive.sh b/tests/guix-archive.sh index d4259b8677..8eacf89338 100644 --- a/tests/guix-archive.sh +++ b/tests/guix-archive.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -41,7 +41,6 @@ cmp "$archive" "$archive_alt" # Check the exit value and stderr upon import. guix archive --import < "$archive" -guix archive --import < "$archive" 2>&1 | grep "import.*guile-bootstrap" if guix archive something-that-does-not-exist then false; else true; fi |