Merge branch 'master' into nix-integration

Conflicts:
	guix/store.scm

diff --cc Makefile.am
Simple merge

diff --cc guix/store.scm
index 3bfb03e,204364f..a8dd566
--- 1/guix/store.scm
--- 2/guix/store.scm
+++ b/guix/store.scm
@@@ -112,9 -117,18 +118,16 @@@
    (sha1 2)
    (sha256 3))
  
 -(define %nix-state-dir
 -  (or (getenv "NIX_STATE_DIR") "/nix/var/nix"))
 -
+ (define-enumerate-type gc-action
+   ;; store-api.hh
+   (return-live 0)
+   (return-dead 1)
+   (delete-dead 2)
+   (delete-specific 3))
+ 
  (define %default-socket-path
 -  (string-append %nix-state-dir "/daemon-socket/socket"))
 +  (string-append (or (getenv "NIX_STATE_DIR") %state-directory)
 +                 "/daemon-socket/socket"))
  
  \f
  ;; serialize.cc