summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2012-12-15 15:28:50 +0100
committerLudovic Courtès <ludo@gnu.org>2012-12-15 15:28:50 +0100
commita784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch)
tree9a09f9a1b2f032b09f2314cf12f7965877290eaf /guix
parent7f131cf3681afe62c84db66e48430de9e54e7d7d (diff)
parent07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff)
Merge branch 'master' into core-updates
Conflicts: distro/packages/multiprecision.scm
Diffstat (limited to 'guix')
-rw-r--r--guix/build/download.scm5
-rw-r--r--guix/config.scm.in3
2 files changed, 7 insertions, 1 deletions
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 <http://bugs.gnu.org/13095>, 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."
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@")