summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-06-14 17:05:32 +0200
committerLudovic Courtès <ludo@gnu.org>2013-06-14 17:05:32 +0200
commit16357e8c71513dc5094c724806dba7a124c33a74 (patch)
tree0528e3295a9b95905d2f545ef4ad81539b9449be
parent0bd31a2188b6ee29b6280f58a577799d73a07ecf (diff)
downloadguix-16357e8c71513dc5094c724806dba7a124c33a74.tar.gz
Update upstream Nix sub-module.
* nix-upstream: Update.
* NEWS: Mention multiple-derivation output bug.
-rw-r--r--NEWS7
m---------nix-upstream10
2 files changed, 12 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 6c33b9ab58..8ef620e24f 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,13 @@ See commits 0332386 and 101d9f3 for details.
 
 *** Binary substituter gracefully handles lack of network connectivity
 
+*** Daemon properly handles rebuilds of multiple-output derivations
+
+Previously it would fail when rebuilding a multiple-output derivation when
+some (but not all) of its outputs were already present.  See
+http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00038.html and
+https://github.com/NixOS/nix/issues/122 .
+
 * Changes in 0.2 (since 0.1)
 
 ** Package management
diff --git a/nix-upstream b/nix-upstream
-Subproject 3a0cc43ac89ae8f778764c9f5e27b361e498691
+Subproject 1b6ee8f4c7e74f75e1f49b43cf22be7730b3064