From 16357e8c71513dc5094c724806dba7a124c33a74 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Jun 2013 17:05:32 +0200 Subject: Update upstream Nix sub-module. * nix-upstream: Update. * NEWS: Mention multiple-derivation output bug. --- NEWS | 7 +++++++ nix-upstream | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 index 3a0cc43ac8..1b6ee8f4c7 160000 --- a/nix-upstream +++ b/nix-upstream @@ -1 +1 @@ -Subproject commit 3a0cc43ac89ae8f778764c9f5e27b361e4986913 +Subproject commit 1b6ee8f4c7e74f75e1f49b43cf22be7730b30649 -- cgit v1.2.3