From 7f4f06513a7a75caff034ba446bd75188afcfd04 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 13 Dec 2012 23:53:37 +0100 Subject: build: Fix default value of `%state-directory'. * guix/config.scm.in (%state-directory): Append `/nix'. Reported by Andreas Enge . --- guix/config.scm.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'guix') diff --git a/guix/config.scm.in b/guix/config.scm.in index 4717b1c967..c5ebd39fae 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -46,7 +46,8 @@ "@storedir@") (define %state-directory - "@guix_localstatedir@") + ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'. + "@guix_localstatedir@/nix") (define %system "@guix_system@") -- cgit v1.2.3 From b3a53fb3610ff23b75f11d58325110d29451a726 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 14 Dec 2012 18:07:10 +0100 Subject: download: Work around (web client) bug . * guix/build/download.scm: Annihilate `shutdown' in (web client). --- guix/build/download.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'guix') diff --git a/guix/build/download.scm b/guix/build/download.scm index 9d90971f28..c09351cee4 100644 --- a/guix/build/download.scm +++ b/guix/build/download.scm @@ -92,6 +92,11 @@ which is not available during bootstrap." 'set-port-encoding! (lambda (p e) #f)) +;; XXX: Work around , present in Guile +;; up to 2.0.7. +(module-define! (resolve-module '(web client)) + 'shutdown (const #f)) + (define (http-fetch uri file) "Fetch data from URI and write it to FILE. Return FILE on success." -- cgit v1.2.3