From f15083c10afaebb8f2a0e7fbc95dd4cc5208c992 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 29 Jul 2012 14:37:40 -0400 Subject: [PATCH 1/4] Document the --option flag Pointed out by Daniel Santa Cruz on IRC. --- doc/manual/opt-common-syn.xml | 5 +++++ doc/manual/opt-common.xml | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/manual/opt-common-syn.xml b/doc/manual/opt-common-syn.xml index 6628fde93..d65f4009e 100644 --- a/doc/manual/opt-common-syn.xml +++ b/doc/manual/opt-common-syn.xml @@ -37,6 +37,11 @@ path + + + name + value + diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml index b9df23dcf..0b5751767 100644 --- a/doc/manual/opt-common.xml +++ b/doc/manual/opt-common.xml @@ -337,7 +337,7 @@ Causes Nix to print out a stack trace in case of Nix expression evaluation errors. - + @@ -351,6 +351,16 @@ + name value + + Set the Nix configuration option + name to value. + This overrides settings in the Nix configuration file (see + nix.conf5). + + + + From 157170059df39933d358d087d88f8b5bc4d5fde6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Jul 2012 22:29:42 -0400 Subject: [PATCH 2/4] Manual: Remove reference to non-existent -I option --- doc/manual/package-management.xml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index 8cc6aa857..314218daf 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -175,21 +175,6 @@ upgrading `coreutils-5.0' to `coreutils-5.2.1' -If you grow bored of specifying the Nix expressions using --f all the time, you can set a default -location: - - -$ nix-env -I nixpkgs-version - -After this you can just say, for instance, nix-env -u -'*'.Setting a default using --I currently clashes with using Nix channels, -since nix-channel --update calls nix-env --I to set the default to the Nix expressions it downloaded -from the channel, replacing whatever default you had -set. - From 7b10562370919947c9df748a165587ec5fc6c2ea Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Aug 2012 16:06:49 -0400 Subject: [PATCH 3/4] =?UTF-8?q?Make=20=E2=80=98nix-store=20--optimise?= =?UTF-8?q?=E2=80=99=20interruptible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libstore/optimise-store.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 486538bd2..2c3f59a72 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -51,6 +51,8 @@ struct MakeImmutable void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path) { + checkInterrupt(); + struct stat st; if (lstat(path.c_str(), &st)) throw SysError(format("getting attributes of path `%1%'") % path); From 234ce610e0671410cb8a9ce4d8725e55472e8d47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Aug 2012 16:09:47 -0400 Subject: [PATCH 4/4] Doh --- src/libstore/optimise-store.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc index 2c3f59a72..c05447f4a 100644 --- a/src/libstore/optimise-store.cc +++ b/src/libstore/optimise-store.cc @@ -1,3 +1,5 @@ +#include "config.h" + #include "util.hh" #include "local-store.hh" #include "immutable.hh" @@ -67,7 +69,6 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path) /* We can hard link regular files and maybe symlinks. */ if (!S_ISREG(st.st_mode) #if CAN_LINK_SYMLINK - x && !S_ISLNK(st.st_mode) #endif ) return;