[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/64: Merge commit '8d5f472f2c49c79a0d3ae2e506f4d4d76224b328' into nix
|
From: |
Ludovic Courtès |
|
Subject: |
64/64: Merge commit '8d5f472f2c49c79a0d3ae2e506f4d4d76224b328' into nix |
|
Date: |
Mon, 05 Jan 2015 16:39:14 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit a1dd396cc02922372314c35c8035a38bfeea08df
Merge: 0a75126 8d5f472
Author: Ludovic Courtès <address@hidden>
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
nix/libstore/build.cc | 1 +
nix/libstore/derivations.cc | 16 +++++++--
nix/libstore/derivations.hh | 4 +-
nix/libstore/local-store.cc | 33 ++++++++++++++++--
nix/libstore/local-store.hh | 19 ++++++++--
nix/libstore/misc.cc | 2 +-
nix/libstore/optimise-store.cc | 76 +++++++++++++++++++++++++++++++++++-----
nix/libutil/archive.cc | 2 +-
nix/libutil/util.cc | 2 +-
nix/libutil/util.hh | 2 +
10 files changed, 133 insertions(+), 24 deletions(-)
- 54/64: nix-instantiate --eval: Apply auto-arguments if the result is a function, (continued)
- 54/64: nix-instantiate --eval: Apply auto-arguments if the result is a function, Ludovic Courtès, 2015/01/05
- 47/64: Fix Debian tests, Ludovic Courtès, 2015/01/05
- 60/64: Merge branch 'master' of github.com:wmertens/nix, Ludovic Courtès, 2015/01/05
- 58/64: Use the inodes given by readdir directly, Ludovic Courtès, 2015/01/05
- 57/64: Remove redundant code, Ludovic Courtès, 2015/01/05
- 55/64: Prepare nix-mode to be uploaded to marmalade, Ludovic Courtès, 2015/01/05
- 56/64: Preload linked hashes to speed up lookups, Ludovic Courtès, 2015/01/05
- 63/64: lvlInfo -> lvlTalkative, Ludovic Courtès, 2015/01/05
- 42/64: When running as root, use build users by default, Ludovic Courtès, 2015/01/05
- 59/64: Shortcut store files before lstat, Ludovic Courtès, 2015/01/05
- 64/64: Merge commit '8d5f472f2c49c79a0d3ae2e506f4d4d76224b328' into nix,
Ludovic Courtès <=
- 61/64: Remove tab, Ludovic Courtès, 2015/01/05
- 62/64: nix-store --optimise: Remove bogus statistics, Ludovic Courtès, 2015/01/05