diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-15 15:28:50 +0100 |
| commit | a784c3077e7cdae5d8492aa540b86b8d32c9a696 (patch) | |
| tree | 9a09f9a1b2f032b09f2314cf12f7965877290eaf /nix | |
| parent | 7f131cf3681afe62c84db66e48430de9e54e7d7d (diff) | |
| parent | 07ab4bf1fc590642307f18b4d1b8687dde3d664b (diff) | |
| download | guix-a784c3077e7cdae5d8492aa540b86b8d32c9a696.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: distro/packages/multiprecision.scm
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 11 | ||||
| -rwxr-xr-x | nix/sync-with-upstream | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index 6bbea52196..79c719399e 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/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; diff --git a/nix/sync-with-upstream b/nix/sync-with-upstream index 69bd1fbee7..1f11fd7d47 100755 --- a/nix/sync-with-upstream +++ b/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" \ |