Merge branch 'master' into core-updates

Conflicts:
	distro/packages/multiprecision.scm

.gitignore

@@ -63,3 +63,4 @@ stamp-h[0-9]
 /test-tmp
 /nix/scripts/list-runtime-roots
 /test-env
+/nix/nix-setuid-helper/nix-setuid-helper.cc

README

@@ -59,10 +59,29 @@ the promise of a build; it is stored as a text file under
 `derivation' primitive, as well as higher-level wrappers such as
 `build-expression->derivation'.
 
-Guix does remote procedure calls (RPCs) to the Nix daemon (the
+Guix does remote procedure calls (RPCs) to the Guix or Nix daemon (the
-=nix-worker --daemon= command), which in turn performs builds and
+=guix-daemon= or =nix-daemon= command), which in turn performs builds
-accesses to the Nix store on its behalf.  The RPCs are implemented in
+and accesses to the Nix store on its behalf.  The RPCs are implemented
-the (guix store) module.
+in the (guix store) module.
+
+* Installing Guix as non-root
+
+The Guix daemon allows software builds to be performed under alternate
+user accounts, which are normally created specifically for this
+purpose.  For instance, you may have a pool of accounts in the
+=guixbuild= group, and then you can instruct =guix-daemon= to use them
+like this:
+
+  $ guix-daemon --build-users-group=guixbuild
+
+However, unless it is run as root, =guix-daemon= cannot switch users.
+In that case, it falls back to using a setuid-root helper program call
+=nix-setuid-helper=.  That program is not setuid-root by default when
+you install it; instead you should run a command along these lines
+(assuming Guix is installed under /usr/local):
+
+  # chown root.root /usr/local/libexec/nix-setuid-helper
+  # chmod 4755 /usr/local/libexec/nix-setuid-helper
 
 * Contact
 

bootstrap

@@ -7,10 +7,9 @@ set -e -x
 top_srcdir="$PWD"
 export top_srcdir
 
-if [ ! -d nix-upstream ]
+git submodule init
-then
-    git submodule init
-fi
 git submodule update
 
+./nix/sync-with-upstream
+
 exec autoreconf -vfi

daemon.am

@@ -136,6 +136,16 @@ guix_daemon_LDADD =				\
 guix_daemon_headers =				\
   nix/nix-daemon/shared.hh
 
+libexec_PROGRAMS = nix-setuid-helper
+nix_setuid_helper_SOURCES =			\
+  nix/nix-setuid-helper/nix-setuid-helper.cc
+
+nix_setuid_helper_CPPFLAGS =			\
+  $(libutil_a_CPPFLAGS)
+
+nix_setuid_helper_LDADD =			\
+  libutil.a libformat.a
+
 noinst_HEADERS =						\
   $(libformat_headers) $(libutil_headers) $(libstore_headers)	\
   $(guix_daemon_headers)

distro/packages/acl.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages acl)
+  #:use-module (guix licenses)
   #:use-module (distro packages attr)
   #:use-module (distro packages perl)
   #:use-module ((distro packages gettext)
@@ -58,4 +59,4 @@
      "Library and tools for manipulating access control lists")
     (description
      "Library and tools for manipulating access control lists.")
-    (license '("GPLv2+" "LGPLv2.1+"))))
+    (license '(gpl2+ lgpl2.1+))))

distro/packages/attr.scm

@@ -18,6 +18,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages attr)
+  #:use-module (guix licenses)
   #:use-module (distro packages perl)
   #:use-module ((distro packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
@@ -65,4 +66,4 @@
      "Library and tools for manipulating extended attributes")
     (description
      "Portable library and tools for manipulating extended attributes.")
-    (license '("GPLv2+" "LGPLv2.1+"))))
+    (license '(gpl2+ lgpl2.1+))))

distro/packages/autotools.scm

@@ -18,6 +18,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages autotools)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (distro packages perl)
   #:use-module (distro packages m4)
@@ -56,7 +57,7 @@ UNIX-like systems without manual user intervention.  Autoconf
 creates a configuration script for a package from a template
 file that lists the operating system features that the package
 can use, in the form of M4 macro calls.")
-    (license "GPLv3+"))) ; some files are under GPLv2+
+    (license gpl3+))) ; some files are under GPLv2+
 
 (define-public automake
   (package
@@ -82,7 +83,7 @@ can use, in the form of M4 macro calls.")
      "GNU Automake is a tool for automatically generating
 `Makefile.in' files compliant with the GNU Coding
 Standards.  Automake requires the use of Autoconf.")
-    (license "GPLv2+"))) ; some files are under GPLv3+
+    (license gpl2+))) ; some files are under GPLv3+
 
 (define-public libtool
   (package
@@ -111,5 +112,5 @@ complexity of using shared libraries behind a consistent, portable interface.
 To use libtool, add the new generic library building commands to your
 Makefile, Makefile.in, or Makefile.am.  See the documentation for
 details.")
-    (license "GPLv3+")
+    (license gpl3+)
     (home-page "http://www.gnu.org/software/libtool/")))

distro/packages/base.scm

@@ -18,6 +18,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages base)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (distro packages bash)
   #:use-module (distro packages bootstrap)
@@ -61,7 +62,7 @@
    (synopsis "GNU Hello")
    (description "Yeah...")
    (home-page "http://www.gnu.org/software/hello/")
-   (license "GPLv3+")))
+   (license gpl3+)))
 
 (define-public grep
   (package
@@ -80,7 +81,7 @@
     "The grep command searches one or more input files for lines containing a
 match to a specified pattern.  By default, grep prints the matching
 lines.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/grep/")))
 
 (define-public sed
@@ -102,7 +103,7 @@ Instead, it is used to filter text, i.e., it takes text input and performs
 some operation (or set of operations) on it and outputs the modified text.
 Sed is typically used for extracting part of a file using pattern matching or
 substituting multiple occurrences of a string within a file.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/sed/")))
 
 (define-public tar
@@ -132,7 +133,7 @@ tape.  The name \"Tar\" comes from this use; it stands for tape archiver.
 Despite the utility's name, Tar can direct its output to available devices,
 files, or other programs (using pipes), it can even access remote devices or
 files (as archives).")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/tar/")))
 
 (define-public patch
@@ -158,7 +159,7 @@ files (as archives).")
     "GNU Patch takes a patch file containing a difference listing produced by
 the diff program and applies those differences to one or more original files,
 producing patched versions.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://savannah.gnu.org/projects/patch/")))
 
 (define-public diffutils
@@ -203,7 +204,7 @@ produce a merged file that contains both persons' changes together with
 warnings about conflicts.
 
 You can use the sdiff command to merge two files interactively.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/diffutils/")))
 
 (define-public findutils
@@ -245,7 +246,7 @@ The tools supplied with this package are:
   * updatedb - update a file name database;
   * xargs - build and execute command lines from standard input.
 ")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/findutils/")))
 
 (define-public coreutils
@@ -271,7 +272,7 @@ operating system")
     "The GNU Core Utilities are the basic file, shell and text manipulation
 utilities of the GNU operating system.  These are the core utilities which
 are expected to exist on every operating system.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/coreutils/")))
 
 (define-public gnu-make
@@ -300,7 +301,7 @@ Make gets its knowledge of how to build your program from a file called the
 makefile, which lists each of the non-source files and how to compute it from
 other files. When you write a program, you should write a makefile for it, so
 that it is possible to use Make to build and install the program.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/make/")))
 
 (define-public binutils
@@ -334,7 +335,7 @@ assembler, etc.)")
     "The GNU Binutils are a collection of binary tools.  The main ones are
 `ld' (the GNU linker) and `as' (the GNU assembler).  They also include the
 BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/binutils/")))
 
 (define-public gcc-4.7
@@ -448,7 +449,7 @@ libraries for these languages (libstdc++, libgcj, libgomp,...).
 
 GCC development is a part of the GNU Project, aiming to improve the compiler
 used in the GNU system including the GNU/Linux variant.")
-     (license "GPLv3+")
+     (license gpl3+)
      (home-page "http://gcc.gnu.org/"))))
 
 (define-public glibc
@@ -520,7 +521,7 @@ printf, exit...
 
 The GNU C library is used as the C library in the GNU system and most systems
 with the Linux kernel.")
-   (license "LGPLv2+")
+   (license lgpl2.0+)
    (home-page "http://www.gnu.org/software/libc/")))
 
 
@@ -896,7 +897,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
 missing `-rpath' flags, and to detect any misuse of libraries outside of the
 store.")
     (home-page #f)
-    (license "GPLv3+")))
+    (license gpl3+)))
 
 (define %boot3-inputs
   ;; 4th stage inputs.

distro/packages/bash.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages bash)
+  #:use-module (guix licenses)
   #:use-module (distro packages ncurses)
   #:use-module (distro packages readline)
   #:use-module (guix packages)
@@ -84,5 +85,5 @@ to conform to the IEEE POSIX P1003.2/ISO 9945.2 Shell and Tools standard.  It
 offers functional improvements over sh for both programming and interactive
 use.  In addition, most sh scripts can be run by Bash without
 modification.")
-     (license "GPLv3+")
+     (license gpl3+)
      (home-page "http://www.gnu.org/software/bash/"))))

distro/packages/bdw-gc.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages bdw-gc)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -56,4 +57,4 @@ C or C++ programs, though that is not its primary goal.")
 
    ;; permissive X11-style license:
    ;; http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt
-   (license "X11")))
+   (license x11)))

distro/packages/bison.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages bison)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -53,4 +54,4 @@ grammars ought to work with Bison with no change.  Anyone
 familiar with Yacc should be able to use Bison with little
 trouble.  You need to be fluent in C or C++ programming in order
 to use Bison.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/bootstrap.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages bootstrap)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -191,7 +192,7 @@ $out/bin/guile --version~%"
      (synopsis "Bootstrap Guile")
      (description "Pre-built Guile for bootstrapping purposes.")
      (home-page #f)
-     (license "LGPLv3+"))))
+     (license lgpl3+))))
 
 (define %bootstrap-base-url
   ;; This is where the initial binaries come from.

distro/packages/compression.scm

@@ -17,6 +17,8 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages compression)
+  #:use-module ((guix licenses)
+                #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -57,9 +59,7 @@ currently used in zlib essentially never expands the data. (LZW can double or
 triple the file size in extreme cases.)  zlib's memory footprint is also
 independent of the input data and can be reduced, if necessary, at some cost
 in compression.")
-
+    (license license:zlib)))
-    ;; See <http://zlib.net/zlib_license.html>.
-    (license "permissive")))
 
 (define-public gzip
   (package
@@ -85,7 +85,7 @@ We developed this program as a replacement for compress because of the Unisys
 and IBM patents covering the LZW algorithm used by compress.  These patents
 made it impossible for us to use compress, and we needed a replacement.  The
 superior compression ratio of gzip is just a bonus.")
-   (license "GPLv3+")
+   (license license:gpl3+)
    (home-page "http://www.gnu.org/software/gzip/")))
 
 (define-public bzip2
@@ -142,7 +142,8 @@ compressor.  It typically compresses files to within 10% to 15% of the best
 available techniques (the PPM family of statistical compressors), whilst
 being around twice as fast at compression and six times faster at
 decompression.")
-      (license "BSD-style")
+      (license (license:bsd-style "file://LICENSE"
+                                  "See LICENSE in the distribution."))
       (home-page "http://www.bzip.org/"))))
 
 (define-public xz
@@ -169,7 +170,7 @@ been modified quite a lot to be suitable for XZ Utils.  The primary
 compression algorithm is currently LZMA2, which is used inside the .xz
 container format.  With typical files, XZ Utils create 30 % smaller output
 than gzip and 15 % smaller output than bzip2.")
-   (license '("GPLv2+" "LGPLv2.1+"))              ; bits of both
+   (license '(license:gpl2+ license:lgpl2.1+))              ; bits of both
    (home-page "http://tukaani.org/xz/")))
 
 (define-public lzo
@@ -195,4 +196,4 @@ compression ratio.
 
 LZO is written in ANSI C.  Both the source code and the compressed data
 format are designed to be portable across platforms.")
-    (license "GPLv2+")))
+    (license license:gpl2+)))

distro/packages/cpio.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages cpio)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -54,4 +55,4 @@ default, cpio creates binary format archives, for compatibility with
 older cpio programs. When extracting from archives, cpio automatically
 recognizes which kind of archive it is reading and can read archives
 created on machines with a different byte-order.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/ddrescue.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages ddrescue)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -56,4 +57,4 @@ the same output file, you will probably obtain a complete and error-free
 file.  This is so because the probability of having damaged areas at the
 same places on different input files is very low.  Using the logfile,
 only the needed blocks are read from the second and successive copies.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/ed.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages ed)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -49,4 +50,4 @@ execute shell commands.  Ed is the \"standard\" text editor in the
 sense that it is the original editor for Unix, and thus widely
 available.  For most purposes, however, it is superseded by
 full-screen editors such as GNU Emacs or GNU Moe.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/flex.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages flex)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -55,4 +56,6 @@ can be compiled and linked to produce an executable. When the executable
 is run, it analyzes its input for occurrences of text matching the
 regular expressions for each rule. Whenever it finds a match, it
 executes the corresponding C code.")
-    (license "BSD")))
+    (license (bsd-style "file://COPYING"
+                        "See COPYING in the distribution."))))
+

distro/packages/gawk.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages gawk)
+  #:use-module (guix licenses)
   #:use-module (distro packages libsigsegv)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -56,4 +57,4 @@ easy with awk, especially the GNU implementation: Gawk.
 The awk utility interprets a special-purpose programming language that makes
 it possible to handle many data-reformatting jobs with just a few lines of
 code.")
-   (license "GPLv3+")))
+   (license gpl3+)))

distro/packages/gdbm.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages gdbm)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -52,4 +53,4 @@ database.
 
 For compatibility with programs using old UNIX dbm function, the package
 also provides traditional dbm and ndbm interfaces.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/gettext.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages gettext)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -61,4 +62,4 @@ offers to programmers, translators, and even users, a well integrated
 set of tools and documentation. Specifically, the GNU `gettext'
 utilities are a set of tools that provides a framework to help other
 GNU packages produce multi-lingual messages.")
-    (license "GPLv3"))) ; some files are under GPLv2+
+    (license gpl3))) ; some files are under GPLv2+

distro/packages/gnupg.scm

@@ -17,9 +17,11 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages gnupg)
+  #:use-module (guix licenses)
   #:use-module (distro packages pth)
   #:use-module (distro packages readline)
-  #:use-module (distro packages compression)
+  #:use-module ((distro packages compression)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -45,7 +47,7 @@
 for all GnuPG components.  Among these are GPG, GPGSM, GPGME,
 GPG-Agent, libgcrypt, Libksba, DirMngr, Pinentry, SmartCard
 Daemon and possibly more in the future.")
-    (license "LGPLv2+")))
+    (license lgpl2.0+)))
 
 (define-public libgcrypt
   (package
@@ -71,7 +73,7 @@ the code from GnuPG.  It provides functions for all
 cryptographic building blocks: symmetric ciphers, hash
 algorithms, MACs, public key algorithms, large integer
 functions, random numbers and a lot of supporting functions.")
-    (license "LGPLv2+")))
+    (license lgpl2.0+)))
 
 (define-public libassuan
   (package
@@ -96,7 +98,7 @@ functions, random numbers and a lot of supporting functions.")
 protocol.  This protocol is used for IPC between most newer
 GnuPG components.  Both, server and client side functions are
 provided.")
-    (license "LGPLv2+")))
+    (license lgpl2.0+)))
 
 (define-public libksba
   (package
@@ -121,7 +123,7 @@ provided.")
      "KSBA (pronounced Kasbah) is a library to make X.509 certificates
 as well as the CMS easily accessible by other applications.  Both
 specifications are building blocks of S/MIME and TLS.")
-    (license "GPLv3+")))
+    (license gpl3+)))
 
 (define-public gnupg
   (package
@@ -142,13 +144,13 @@ specifications are building blocks of S/MIME and TLS.")
        ;; ("libusb" ,libusb)
        ;; ("openldap" ,openldap)
 
-       ("bzip2" ,bzip2)
+       ("bzip2" ,guix:bzip2)
        ("libassuan" ,libassuan)
        ("libgcrypt" ,libgcrypt)
        ("libksba" ,libksba)
        ("pth" ,pth)
        ("libgpg-error" ,libgpg-error)
-       ("zlib" ,zlib)
+       ("zlib" ,guix:zlib)
        ("readline" ,readline)))
     (home-page "http://gnupg.org/")
     (synopsis
@@ -163,4 +165,4 @@ command line tool with features for easy integration with other
 applications.  A wealth of frontend applications and libraries
 are available.  Version 2 of GnuPG also provides support for
 S/MIME.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/gnutls.scm

@@ -17,11 +17,13 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages gnutls)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (distro packages base)
-  #:use-module (distro packages compression)
+  #:use-module ((distro packages compression)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages nettle)
   #:use-module (distro packages guile)
   #:use-module (distro packages perl))
@@ -45,7 +47,7 @@
      "Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some
 other packages.  The goal of this implementation is to be highly
 portable, and only require an ANSI C89 platform.")
-    (license "LGPLv2+")))
+    (license lgpl2.0+)))
 
 (define-public gnutls
   (package
@@ -71,7 +73,7 @@ portable, and only require an ANSI C89 platform.")
     (inputs
      `(("guile" ,guile-2.0)
        ;; ("lzo" ,lzo)
-       ("zlib" ,zlib)
+       ("zlib" ,guix:zlib)
        ("perl" ,perl)))
     (propagated-inputs
      `(("libtasn1" ,libtasn1)
@@ -91,4 +93,4 @@ Quoting from the TLS protocol specification:
 Internet. The protocol allows client/server applications to communicate
 in a way that is designed to prevent eavesdropping, tampering, or
 message forgery.\"")
-    (license "LGPLv2.1+")))
+    (license lgpl2.1+)))

distro/packages/gperf.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages gperf)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -51,4 +52,4 @@ GNU gperf is highly customizable.  There are options for
 generating C or C++ code, for emitting switch statements or
 nested ifs instead of a hash table, and for tuning the algorithm
 employed by gperf.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/guile.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages guile)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (distro packages bdw-gc)
   #:use-module (distro packages gawk)
@@ -86,7 +87,7 @@
 packaged as a library that can be embedded into programs to make them
 extensible.  It supports many SRFIs.")
    (home-page "http://www.gnu.org/software/guile/")
-   (license "LGPLv2+")))
+   (license lgpl2.0+)))
 
 (define-public guile-2.0
   (package
@@ -128,7 +129,7 @@ R6RS, Guile includes a module system, full access to POSIX system calls,
 networking support, multiple threads, dynamic linking, a foreign function
 call interface, and powerful string processing.")
    (home-page "http://www.gnu.org/software/guile/")
-   (license "LGPLv3+")))
+   (license lgpl3+)))
 
 (define-public guile-2.0/fixed
   ;; A package of Guile 2.0 that's rarely changed.  It is the one used
@@ -181,7 +182,7 @@ Guile-Reader’s approach is similar to Common Lisp’s “read table”, but
 hopefully more powerful and flexible (for instance, one may instantiate as
 many readers as needed).")
    (home-page "http://www.nongnu.org/guile-reader/")
-   (license "GPLv3+")))
+   (license gpl3+)))
 
 (define-public guile-reader/guile-1.8
   ;; Guile-Reader built against Guile 1.8.

distro/packages/help2man.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages help2man)
+  #:use-module (guix licenses)
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
@@ -48,4 +49,4 @@
     (description
      "help2man produces simple manual pages from the ‘--help’ and
 ‘--version’ output of other commands.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/less.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages less)
+  #:use-module (guix licenses)
   #:use-module (distro packages ncurses)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -47,4 +48,4 @@ have to read the entire input file before starting, so with large input
 files it starts up faster than text editors like vi. Less uses
 termcap (or terminfo on some systems), so it can run on a variety of
 terminals. There is even limited support for hardcopy terminals.")
-    (license "GPLv3+"))) ; some files are under GPLv2+
+    (license gpl3+))) ; some files are under GPLv2+

distro/packages/libffi.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages libffi)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -68,5 +69,5 @@ conversions for values passed between the two languages.")
     (home-page "http://sources.redhat.com/libffi/")
 
     ;; See <http://github.com/atgreen/libffi/blob/master/LICENSE>.
-    (license "free, non-copyleft"))))
+    (license expat))))
 

distro/packages/libsigsegv.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages libsigsegv)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -44,4 +45,4 @@ currently not available. Catching and handling a page fault is a useful
 technique for implementing pageable virtual memory, memory-mapped access to
 persistent databases, generational garbage collectors, stack overflow
 handlers, distributed shared memory, and more.")
-   (license "GPLv2+")))
+   (license gpl2+)))

distro/packages/libunistring.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages libunistring)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -54,4 +55,4 @@ the user and can be in any language.
 libunistring is also for you if your application uses Unicode strings as
 internal in-memory representation.")
    (home-page "http://www.gnu.org/software/libunistring/")
-   (license "LGPLv3+")))
+   (license lgpl3+)))

distro/packages/linux.scm

@@ -18,7 +18,9 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages linux)
-  #:use-module (distro packages compression)
+  #:use-module (guix licenses)
+  #:use-module ((distro packages compression)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages flex)
   #:use-module (distro packages ncurses)
   #:use-module (distro packages perl)
@@ -107,7 +109,7 @@
 Pluggable authentication modules are small shared object files that can
 be used through the PAM API to perform tasks, like authenticating a user
 at login.  Local and dynamic reconfiguration are its key features")
-    (license "BSD")))
+    (license bsd-3)))
 
 (define-public psmisc
   (package
@@ -130,7 +132,7 @@ at login.  Local and dynamic reconfiguration are its key features")
      "This PSmisc package is a set of some small useful utilities that
 use the proc filesystem. We're not about changing the world, but
 providing the system administrator with some help in common tasks.")
-    (license "GPLv2+")))
+    (license gpl2+)))
 
 (define-public util-linux
   (package
@@ -156,7 +158,7 @@ providing the system administrator with some help in common tasks.")
                        ;; Allow 'patch-shebang' to do its work.
                        (("@PERL@") "/bin/perl"))))
                  %standard-phases)))
-    (inputs `(("zlib" ,zlib)
+    (inputs `(("zlib" ,guix:zlib)
               ("ncurses" ,ncurses)
               ("perl" ,perl)))
     (home-page "https://www.kernel.org/pub/linux/utils/util-linux/")
@@ -167,5 +169,5 @@ providing the system administrator with some help in common tasks.")
     ;; Note that util-linux doesn't use the same license for all the
     ;; code. GPLv2+ is the default license for a code without an
     ;; explicitly defined license.
-    (license '("GPLv3+" "GPLv2+" "GPLv2" "LGPLv2+"
+    (license '(gpl3+ gpl2+ gpl2 lgpl2.0+
-               "BSD-original" "Public Domain"))))
+               bsd-4 public-domain))))

distro/packages/lout.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages lout)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -127,5 +128,5 @@ extended with definitions which are very much easier to write than troff of
 TeX macros because Lout is a high-level, purely functional language, the
 outcome of an eight-year research project that went back to the
 beginning.")
-    (license "GPLv3+")
+    (license gpl3+)
     (home-page "http://savannah.nongnu.org/projects/lout/"))))

distro/packages/lsh.scm

@@ -17,13 +17,15 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages lsh)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (distro)
   #:use-module (distro packages m4)
   #:use-module (distro packages linux)
-  #:use-module (distro packages compression)
+  #:use-module ((distro packages compression)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages multiprecision)
   #:use-module (distro packages readline)
   #:use-module (distro packages gperf)
@@ -45,7 +47,7 @@
     (home-page "http://liboop.ofb.net/")
     (synopsis "`liboop', an event loop library")
     (description "liboop is an event loop library.")
-    (license "LGPLv2.1+")))
+    (license lgpl2.1+)))
 
 (define-public lsh
   (package
@@ -65,7 +67,7 @@
        ("m4" ,m4)
        ("readline" ,readline)
        ("liboop" ,liboop)
-       ("zlib" ,zlib)
+       ("zlib" ,guix:zlib)
        ("gmp" ,gmp)
        ("guile" ,guile-final)
        ("gperf" ,gperf)
@@ -122,4 +124,4 @@
      "lsh is a free implementation (in the GNU sense) of the ssh
 version 2 protocol, currently being standardised by the IETF
 SECSH working group.")
-    (license "GPLv2+")))
+    (license gpl2+)))

distro/packages/m4.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages m4)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -70,5 +71,5 @@ expansion, m4 has builtin functions for including named files, running UNIX
 commands, doing integer arithmetic, manipulating text in various ways,
 recursion etc...  m4 can be used either as a front-end to a compiler or as a
 macro processor in its own right.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/m4/")))

distro/packages/multiprecision.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages multiprecision)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (distro packages m4)
   #:use-module (guix packages)
@@ -63,7 +64,7 @@ emphasis on speed.
 GMP is faster than any other bignum library.  The advantage for GMP increases
 with the operand sizes for many operations, since GMP uses asymptotically
 faster algorithms.")
-   (license "LGPLv3+")
+   (license lgpl3+)
    (home-page "http://gmplib.org/")))
 
 (define-public mpfr
@@ -89,7 +90,7 @@ The main goal of MPFR is to provide a library for multiple-precision
 floating-point computation which is both efficient and has a well-defined
 semantics.  It copies the good ideas from the ANSI/IEEE-754 standard for
 double-precision floating-point arithmetic (53-bit mantissa).")
-   (license "LGPLv3+")
+   (license lgpl3+)
    (home-page "http://www.mpfr.org/")))
 
 (define-public mpc
@@ -115,5 +116,5 @@ point numbers to complex numbers, providing well-defined semantics for
 every operation. At the same time, speed of operation at high precision
 is a major design goal. The library is built upon and follows the same
 principles as GNU MPFR.")
-   (license "LGPLv3+")
+   (license lgpl3+)
    (home-page "http://mpc.multiprecision.org/")))

distro/packages/nano.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages nano)
+  #:use-module (guix licenses)
   #:use-module ((distro packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages ncurses)
@@ -48,4 +49,4 @@
 editor, part of the Pine email suite from The University of
 Washington. It aims to emulate Pico as closely as possible and perhaps
 include extra functionality.")
-    (license "GPLv3+"))) ; some files are under GPLv2+
+    (license gpl3+))) ; some files are under GPLv2+

distro/packages/ncurses.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages ncurses)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -102,5 +103,5 @@ The ncurses code was developed under GNU/Linux.  It has been in use for some
 time with OpenBSD as the system curses library, and on FreeBSD and NetBSD as
 an external package.  It should port easily to any ANSI/POSIX-conforming
 UNIX.  It has even been ported to OS/2 Warp!")
-     (license "X11")
+     (license x11)
      (home-page "http://www.gnu.org/software/ncurses/"))))

distro/packages/nettle.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages nettle)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -60,4 +61,4 @@ cryptographic libraries around.  \nNettle tries to avoid this problem by
 doing one thing, the low-level crypto stuff, and providing a simple but
 general interface to it.  In particular, Nettle doesn't do algorithm
 selection.  It doesn't do memory allocation. It doesn't do any I/O.")
-    (license "GPLv2+")))
+    (license gpl2+)))

distro/packages/perl.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages perl)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -71,4 +72,4 @@
      "Perl 5 is a highly capable, feature-rich programming language with over
 24 years of development.")
     (home-page "http://www.perl.org/")
-    (license "GPLv1+")))                          ; or "Artistic"
+    (license gpl1+)))                          ; or "Artistic"

distro/packages/pkg-config.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages pkg-config)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
@@ -37,7 +38,7 @@
    (build-system gnu-build-system)
    (arguments `(#:configure-flags '("--with-internal-glib")))
    (home-page "http://www.freedesktop.org/wiki/Software/pkg-config")
-   (license "GPLv2+")
+   (license gpl2+)
    (synopsis "a helper tool used when compiling applications and
 libraries")
    (description

distro/packages/pth.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages pth)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -57,4 +58,4 @@ thread and process termination, and even customized callback functions.
 Additionally Pth provides an optional emulation API for POSIX.1c
 threads (\"Pthreads\") which can be used for backward compatibility to
 existing multithreaded applications.")
-    (license #f)))
+    (license lgpl2.1+)))

distro/packages/readline.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages readline)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (distro packages ncurses)
   #:use-module (guix packages)
@@ -72,5 +73,5 @@ expansion on previous commands.
 The history facilites are also placed into a separate library, the History
 library, as part of the build process.  The History library may be used
 without Readline in applications which desire its capabilities.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://savannah.gnu.org/projects/readline/")))

distro/packages/recutils.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages recutils)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -49,5 +50,5 @@ text-based databases")
     "GNU recutils is a set of tools and libraries to access human-editable,
 text-based databases called recfiles.  The data is stored as a sequence of
 records, each record containing an arbitrary number of named fields.")
-   (license "GPLv3+")
+   (license gpl3+)
    (home-page "http://www.gnu.org/software/recutils/")))

distro/packages/shishi.scm

@@ -18,10 +18,12 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages shishi)
+  #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (distro packages gnutls)
   #:use-module (distro packages gnupg)
-  #:use-module (distro packages compression)
+  #:use-module ((distro packages compression)
+                #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -48,7 +50,7 @@
                                   "patch/gets"))))
     (inputs
      `(("gnutls" ,gnutls)
-       ("zlib" ,zlib)
+       ("zlib" ,guix:zlib)
        ("libgcrypt" ,libgcrypt)
        ("libtasn1" ,libtasn1)
        ("patch/gets" ,(search-patch "shishi-gets-undeclared.patch"))))
@@ -66,4 +68,4 @@
   users to acquire and manage tickets (and more).  The server
   side, a Key Distribution Center, is implemented by `shishid'.
 ")
-    (license "GPLv3+"))) ; some files are under GPLv2+
+    (license gpl3+))) ; some files are under GPLv2+

distro/packages/system.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages system)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -57,7 +58,7 @@ controlling terminal, such as, e.g., minicom.  It can launch and control
 components of some complex system, such as Jabberd or MeTA1 (and it
 offers much more control over them than the native utilities).  Finally,
 it can replace the inetd utility!")
-    (license "GPLv3+")))
+    (license gpl3+)))
 
 (define-public inetutils
   (package
@@ -87,4 +88,4 @@ it can replace the inetd utility!")
 ftp(d), hostname, ifconfig, inetd, logger, ping, rcp, rexec(d),
 rlogin(d), rsh(d), syslogd, talk(d), telnet(d), tftp(d), traceroute,
 uucpd, and whois.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/texinfo.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages texinfo)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -57,4 +58,4 @@ for online information and another for a printed manual, you
 need write only one document.  And when the work is revised, you
 need revise only that one document.  The Texinfo system is
 well-integrated with GNU Emacs.")
-    (license "GPLv3+")))
+    (license gpl3+)))

distro/packages/time.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages time)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -50,4 +51,4 @@ of time, memory, and I/O and IPC calls.  Some systems do not provide
 much information about program resource use; 'time' reports unavailable
 information as zero values.
 ")
-    (license "GPLv2+")))
+    (license gpl2+)))

distro/packages/wget.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages wget)
+  #:use-module (guix licenses)
   #:use-module ((distro packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (distro packages gnutls)
@@ -57,4 +58,4 @@
 HTTPS and FTP, the most widely-used Internet protocols.  It is a
 non-interactive commandline tool, so it may easily be called from
 scripts, cron jobs, terminals without X-Windows support, etc.")
-    (license "GPLv3+"))) ; some files are under GPLv2+
+    (license gpl3+))) ; some files are under GPLv2+

distro/packages/which.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages which)
+  #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
@@ -44,4 +45,4 @@ been executed when this argument had been entered at the shell
 prompt. It does this by searching for an executable or script in the
 directories listed in the environment variable PATH using the same
 algorithm as bash(1).")
-    (license "GPLv3+"))) ; some files are under GPLv2+
+    (license gpl3+))) ; some files are under GPLv2+

distro/packages/zile.scm

@@ -17,6 +17,7 @@
 ;;; along with Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (distro packages zile)
+  #:use-module (guix licenses)
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
@@ -62,4 +63,4 @@ containing the word \"emacs\", which instead contain the word
 
 However, all of this is packed into a program which typically
 compiles to about 130Kb.")
-    (license "GPLv3+")))
+    (license gpl3+)))

doc/guix.texi

@@ -532,6 +532,12 @@ value @code{0} means to use as many CPU cores as available.
 @itemx -r @var{file}
 Make @var{file} a symlink to the result, and register it as a garbage
 collector root.
+
+@item --verbosity=@var{level}
+Use the given verbosity level.  @var{level} must be an integer between 0
+and 5; higher means more verbose output.  Setting a level of 4 or more
+may be helpful when debugging setup issues with the build daemon.
+
 @end table
 
 Behind the scenes, @command{guix-build} is essentially an interface to

guix-build.in

@@ -71,7 +71,8 @@ When SOURCE? is true, return the derivations of the package sources."
 (define %default-options
   ;; Alist of default option values.
   `((system . ,(%current-system))
-    (substitutes? . #t)))
+    (substitutes? . #t)
+    (verbosity . 0)))
 
 (define (show-help)
   (display (_ "Usage: guix-build [OPTION]... PACKAGE-OR-DERIVATION...
@@ -95,6 +96,8 @@ Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"))
   (display (_ "
   -r, --root=FILE        make FILE a symlink to the result, and register it
                          as a garbage collector root"))
+  (display (_ "
+      --verbosity=LEVEL  use the given verbosity LEVEL"))
   (newline)
   (display (_ "
   -h, --help             display this help and exit"))
@@ -147,7 +150,12 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
                               (alist-delete 'substitutes? result))))
         (option '(#\r "root") #t #f
                 (lambda (opt name arg result)
-                  (alist-cons 'gc-root arg result)))))
+                  (alist-cons 'gc-root arg result)))
+        (option '("verbosity") #t #f
+                (lambda (opt name arg result)
+                  (let ((level (string->number arg)))
+                    (alist-cons 'verbosity level
+                                (alist-delete 'verbosity result)))))))
 
 
 ;;;
@@ -244,7 +252,8 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
           (set-build-options (%store)
                              #:keep-failed? (assoc-ref opts 'keep-failed?)
                              #:build-cores (or (assoc-ref opts 'cores) 0)
-                             #:use-substitutes? (assoc-ref opts 'substitutes?))
+                             #:use-substitutes? (assoc-ref opts 'substitutes?)
+                             #:verbosity (assoc-ref opts 'verbosity))
 
           (if (assoc-ref opts 'derivations-only?)
               (format #t "~{~a~%~}" drv)

guix-package.in

@@ -68,7 +68,9 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0"    \
                      "default")))
 
 (define %current-profile
-  (string-append %profile-directory "/profile"))
+  ;; Call it `guix-profile', not `profile', to allow Guix profiles to
+  ;; coexist with Nix profiles.
+  (string-append %profile-directory "/guix-profile"))
 
 (define (profile-manifest profile)
   "Return the PROFILE's manifest."

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."
 

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@")

nix/nix-daemon/guix-daemon.cc

@@ -21,6 +21,7 @@
 #include <types.hh>
 #include "shared.hh"
 #include <globals.hh>
+#include <util.hh>
 
 #include <stdlib.h>
 #include <argp.h>
@@ -56,6 +57,7 @@ builds derivations on behalf of its clients.";
 #define GUIX_OPT_DISABLE_LOG_COMPRESSION 6
 #define GUIX_OPT_DISABLE_STORE_OPTIMIZATION 7
 #define GUIX_OPT_IMPERSONATE_LINUX_26 8
+#define GUIX_OPT_DEBUG 9
 
 static const struct argp_option options[] =
   {
@@ -88,6 +90,8 @@ static const struct argp_option options[] =
       " (this option has no effect in this configuration)"
 #endif
     },
+    { "debug", GUIX_OPT_DEBUG, 0, 0,
+      "Produce debugging output" },
     { 0, 0, 0, 0, 0 }
   };
 
@@ -118,6 +122,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
     case GUIX_OPT_LOSE_LOGS:
       settings.keepLog = false;
       break;
+    case GUIX_OPT_DEBUG:
+      verbosity = lvlDebug;
+      break;
     case 'C':
       settings.buildCores = atoi (arg);
       break;
@@ -152,6 +159,10 @@ main (int argc, char *argv[])
 
   settings.processEnvironment ();
 
+  /* FIXME: Disable substitutes until we have something that works.  */
+  settings.useSubstitutes = false;
+  settings.substituters.clear ();
+
   argp_parse (&argp, argc, argv, 0, 0, 0);
 
   argvSaved = argv;

nix/sync-with-upstream

@@ -61,7 +61,8 @@ do
     fi
 done
 
-cp -v "$top_srcdir/nix-upstream/"{COPYING,AUTHORS} "$top_srcdir/nix"
+cp -v "$top_srcdir/nix-upstream/COPYING" "$top_srcdir/nix"
+cp -v "$top_srcdir/nix-upstream/AUTHORS" "$top_srcdir/nix"
 
 # Substitutions.
 sed -i "$top_srcdir/nix/libstore/gc.cc"					\

release.nix

@@ -53,7 +53,7 @@ let
         preAutoconf = ''git config submodule.nix.url "${<nix>}"'';
         configureFlags =
           [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
-            "--localstatedir=/nix/var/nix"
+            "--localstatedir=/nix/var"
           ];
       };
 
@@ -68,7 +68,7 @@ let
         src = jobs.tarball;
         configureFlags =
           [ "--with-libgcrypt-prefix=${pkgs.libgcrypt}"
-            "--localstatedir=/nix/var/nix"
+            "--localstatedir=/nix/var"
           ];
 
         preBuild =

test-env.in

@@ -27,6 +27,7 @@
 if [ -x "@abs_top_builddir@/guix-daemon" ]
 then
     NIX_SUBSTITUTERS=""		# don't resort to substituters
+    NIX_SETUID_HELPER="@abs_top_builddir@/nix-setuid-helper" # normally unused
     NIX_IGNORE_SYMLINK_STORE=1	# in case the store is a symlink
     NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
     NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var"
@@ -42,7 +43,7 @@ then
 
     export NIX_SUBSTITUTERS NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR	\
 	NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR		\
-	NIX_ROOT_FINDER
+	NIX_ROOT_FINDER NIX_SETUID_HELPER
 
     # Do that because store.scm calls `canonicalize-path' on it.
     mkdir -p "$NIX_STORE_DIR"