[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
75/118: Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix
|
From: |
Ludovic Courtès |
|
Subject: |
75/118: Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix |
|
Date: |
Tue, 19 May 2015 14:45:47 +0000 |
civodul pushed a commit to branch nix
in repository guix.
commit 766481d606e4b1860307692d6a44723983662d45
Merge: c69944c fdee1ce
Author: Ludovic Courtès <address@hidden>
Date: Mon May 11 17:04:26 2015 +0200
Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix
nix/libstore/build.cc | 10 ++-
nix/libstore/globals.cc | 6 ++
nix/libstore/globals.hh | 9 ++
nix/libstore/local-store.cc | 4 +-
nix/libstore/remote-store.cc | 2 -
nix/libstore/remote-store.hh | 1 -
nix/libutil/archive.cc | 172 ++++++++++++++++++++++++------------------
nix/libutil/archive.hh | 12 ++-
nix/libutil/util.cc | 13 ++--
nix/nix-daemon/nix-daemon.cc | 58 ++++++++++++---
10 files changed, 184 insertions(+), 103 deletions(-)
- 55/118: build-remote.pl: Fix building multiple output derivations, (continued)
- 55/118: build-remote.pl: Fix building multiple output derivations, Ludovic Courtès, 2015/05/19
- 59/118: Install systemd and Upstart stuff only on Linux, Ludovic Courtès, 2015/05/19
- 68/118: Ugly hack to fix building on old Darwin, Ludovic Courtès, 2015/05/19
- 64/118: nix-daemon: Fix compat with older clients, Ludovic Courtès, 2015/05/19
- 61/118: Handle case collisions on case-insensitive systems, Ludovic Courtès, 2015/05/19
- 60/118: Make dev-shell script work on Darwin, Ludovic Courtès, 2015/05/19
- 71/118: Revert old useBuildHook behaviour, Ludovic Courtès, 2015/05/19
- 63/118: Get rid of a compiler warning, Ludovic Courtès, 2015/05/19
- 67/118: nix-daemon: Add trusted-users and allowed-users options, Ludovic Courtès, 2015/05/19
- 70/118: Better fix for strcasecmp on Darwin, Ludovic Courtès, 2015/05/19
- 75/118: Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix,
Ludovic Courtès <=
- 74/118: Merge commit '8e9140cfdef9dbd1eb61e4c75c91d452ab5e4a74' into nix, Ludovic Courtès, 2015/05/19
- 73/118: startProcess: Make writing error messages from the child more robust, Ludovic Courtès, 2015/05/19
- 69/118: Bump, Ludovic Courtès, 2015/05/19
- 86/118: Add option ‘build-extra-chroot-dirs’, Ludovic Courtès, 2015/05/19
- 76/118: nix-daemon: Simplify stderr handling, Ludovic Courtès, 2015/05/19
- 77/118: nix-daemon: Less verbosity, Ludovic Courtès, 2015/05/19
- 90/118: Remove unnecessary call to addTempRoot(), Ludovic Courtès, 2015/05/19
- 88/118: Move some options out of globals, Ludovic Courtès, 2015/05/19
- 83/118: Call commonChildInit() before doing chroot init, Ludovic Courtès, 2015/05/19
- 84/118: Remove ugly hack for detecting build environment setup errors, Ludovic Courtès, 2015/05/19