diff --git a/corepkgs/buildenv.pl b/corepkgs/buildenv.pl index 1ab19d26f..f98cca7c8 100644 --- a/corepkgs/buildenv.pl +++ b/corepkgs/buildenv.pl @@ -53,7 +53,7 @@ sub createLinks { elsif (-l _) { my $target = readlink $dstFile or die; if (!-d $target) { - die "collission between directory `$srcFile' and non-directory `$target'"; + die "collision between directory `$srcFile' and non-directory `$target'"; } unlink $dstFile or die "error unlinking `$dstFile': $!"; mkdir $dstFile, 0755 || @@ -75,7 +75,7 @@ sub createLinks { if (-l $dstFile) { my $target = readlink $dstFile; my $prevPriority = $priorities{$dstFile}; - die ( "collission between `$srcFile' and `$target'; " + die ( "collision between `$srcFile' and `$target'; " . "use `nix-env --set-flag " . "priority NUMBER PKGNAME' to change the priority of " . "one of the conflicting packages\n" ) diff --git a/doc/manual/builtins.xml b/doc/manual/builtins.xml index b75f58e21..465c062b6 100644 --- a/doc/manual/builtins.xml +++ b/doc/manual/builtins.xml @@ -434,7 +434,7 @@ x: x + 456 e Return true if - e evaluates to a int, and + e evaluates to an int, and false otherwise. diff --git a/doc/manual/conf-file.xml b/doc/manual/conf-file.xml index 754c4d029..c37a2da47 100644 --- a/doc/manual/conf-file.xml +++ b/doc/manual/conf-file.xml @@ -101,8 +101,8 @@ flag, e.g. --option gc-keep-outputs false. This option defines the maximum number of jobs that Nix will try to build in parallel. The default is 1. You should generally set it to the number - of CPUs in your system (e.g., 2 on a Athlon 64 - X2). It can be overriden using the () command line switch. @@ -119,7 +119,7 @@ flag, e.g. --option gc-keep-outputs false. enableParallelBuilding is set to true, the builder passes the flag to GNU Make. - It can be overriden using the command line switch and defaults to 1. The value 0 means that the builder should use all available CPU cores in the @@ -134,10 +134,10 @@ flag, e.g. --option gc-keep-outputs false. This option defines the maximum number of seconds that a builder can go without producing any data on standard output or - standard error. This is useful (for instance in a automated + standard error. This is useful (for instance in an automated build system) to catch builds that are stuck in an infinite loop, or to catch remote builds that are hanging due to network - problems. It can be overriden using the command line switch. @@ -153,10 +153,10 @@ flag, e.g. --option gc-keep-outputs false. This option defines the maximum number of seconds that a - builder can run. This is useful (for instance in a automated + builder can run. This is useful (for instance in an automated build system) to catch builds that are stuck in an infinite loop but keep writing to their standard output or standard error. It - can be overriden using the command line switch. diff --git a/doc/manual/env-common.xml b/doc/manual/env-common.xml index bc10bc069..e6a358931 100644 --- a/doc/manual/env-common.xml +++ b/doc/manual/env-common.xml @@ -293,7 +293,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix NIX_OTHER_STORES This variable contains the paths of remote Nix - installations from whichs paths can be copied, separated by colons. + installations from which packages can be copied, separated by colons. See for details. Each path should be the /nix directory of a remote Nix installation diff --git a/doc/manual/nix-env.xml b/doc/manual/nix-env.xml index ff9f9c16a..84c875dad 100644 --- a/doc/manual/nix-env.xml +++ b/doc/manual/nix-env.xml @@ -272,7 +272,7 @@ number of possible ways: linkend="ss-functions">functions that are called with the active Nix expression as their single argument. The derivations returned by those function calls are installed. This allows - derivations to be specified in a unambiguous way, which is necessary + derivations to be specified in an unambiguous way, which is necessary if there are multiple derivations with the same name. @@ -692,7 +692,7 @@ firefox-2.0.0.9 (the current one) $ nix-env --preserve-installed -i firefox-2.0.0.11 installing `firefox-2.0.0.11' building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment' -Collission between `/nix/store/...-firefox-2.0.0.11/bin/firefox' +collision between `/nix/store/...-firefox-2.0.0.11/bin/firefox' and `/nix/store/...-firefox-2.0.0.9/bin/firefox'. (i.e., can’t have two active at the same time) @@ -1244,7 +1244,7 @@ wrapper around and $ nix-env --rollback switching from generation 92 to 91 -$ nix-env --rolback +$ nix-env --rollback error: no generation older than the current (91) exists diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index c8146c907..63ddef28e 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -164,7 +164,7 @@ the specified store paths. Realisation is a somewhat overloaded term: exist in the file system). If the path is already valid, we are done immediately. Otherwise, the path and any missing paths in its closure may be produced through substitutes. If there are no - (succesful) subsitutes, realisation fails. + (successful) subsitutes, realisation fails. diff --git a/doc/manual/opt-common.xml b/doc/manual/opt-common.xml index f900d0a78..a877b536a 100644 --- a/doc/manual/opt-common.xml +++ b/doc/manual/opt-common.xml @@ -236,7 +236,7 @@ interpreted by the nix-log2xml tool in the Nix source distribution. The resulting XML file can be fed into the log2html.xsl stylesheet to create an HTML - file that can be browsed interactively, using Javascript to + file that can be browsed interactively, using JavaScript to expand and collapse parts of the output. diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml index a0ada63e5..202d6554f 100644 --- a/doc/manual/package-management.xml +++ b/doc/manual/package-management.xml @@ -129,7 +129,7 @@ downloading binaries from nixos.org, instead of building them from source. This might still take a while since all dependencies must be downloaded, but on a reasonably fast connection -such as an DSL line it’s on the order of a few minutes. +such as a DSL line it’s on the order of a few minutes. Naturally, packages can also be uninstalled: diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml index a1132b978..e44cea2f1 100644 --- a/doc/manual/release-notes.xml +++ b/doc/manual/release-notes.xml @@ -1358,7 +1358,7 @@ irreversible. - You can now unambigously specify which derivation to + You can now unambiguously specify which derivation to build or install in nix-env, nix-instantiate and nix-build using the / flags, which @@ -1498,7 +1498,7 @@ irreversible. Make sure that the garbage collector can run - succesfully when the disk is full + successfully when the disk is full (NIX-18). nix-env now locks the profile @@ -1853,7 +1853,7 @@ $ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper' A hash of the contents of a store path is now stored - in the database after a succesful build. This allows you to check + in the database after a successful build. This allows you to check whether store paths have been tampered with: nix-store --verify --check-contents. @@ -2017,7 +2017,7 @@ $ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper' Derivations for other platforms are filtered out - (which can be overriden using + (which can be overridden using ). by default now diff --git a/doc/manual/troubleshooting.xml b/doc/manual/troubleshooting.xml index 7403200e0..ec8c4c924 100644 --- a/doc/manual/troubleshooting.xml +++ b/doc/manual/troubleshooting.xml @@ -17,7 +17,7 @@ bug tracker for a list of currently known issues. $ nix-env -i docbook-xml ... adding /nix/store/s5hyxgm62gk2...-docbook-xml-4.2 -collission between `/nix/store/s5hyxgm62gk2...-docbook-xml-4.2/xml/dtd/docbook/calstblx.dtd' +collision between `/nix/store/s5hyxgm62gk2...-docbook-xml-4.2/xml/dtd/docbook/calstblx.dtd' and `/nix/store/06h377hr4b33...-docbook-xml-4.3/xml/dtd/docbook/calstblx.dtd' at /nix/store/...-builder.pl line 62. @@ -68,7 +68,7 @@ in /nix/store, as can be seen using ls $ ls -l /nix/store drwxrwxrwt 32000 nix nix 4620288 Sep 8 15:08 store -The ext2 file system is limited to a inode link +The ext2 file system is limited to an inode link count of 32,000 (each subdirectory increasing the count by one). Furthermore, the st_nlink field of the stat system call is a 16-bit value. diff --git a/doc/manual/writing-nix-expressions.xml b/doc/manual/writing-nix-expressions.xml index 80e7fd037..76007fe28 100644 --- a/doc/manual/writing-nix-expressions.xml +++ b/doc/manual/writing-nix-expressions.xml @@ -617,7 +617,7 @@ Laziness means that arguments to functions are evaluated only when they are needed. Functional means that functions are normal values that can be passed around and manipulated in interesting ways. The language is not a full-featured, general -purpose language. It's main job is to describe packages, +purpose language. Its main job is to describe packages, compositions of packages, and the variability within packages. @@ -723,7 +723,7 @@ configureFlags = " '', i.e., ''${. '' can be escaped by prefixing it with ', i.e., '''. Finally, - linefeed, carriage-return and tab characters can be writted as + linefeed, carriage-return and tab characters can be written as ''\n, ''\r, ''\t. @@ -775,7 +775,7 @@ stdenv.mkDerivation { absolute at parse time relative to the directory of the Nix expression that contained it. For instance, if a Nix expression in /foo/bar/bla.nix refers to - ../xyzzy/fnord.nix, the absolutised path is + ../xyzzy/fnord.nix, the absolute path is /foo/xyzzy/fnord.nix. Booleans with values diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index efcb43876..4fecd2a70 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -158,7 +158,7 @@ EvalState::EvalState() physical RAM, up to a maximum of 384 MiB) so that in most cases we don't need to garbage collect at all. (Collection has a fairly significant overhead.) The heap size can be - overriden through libgc's GC_INITIAL_HEAP_SIZE environment + overridden through libgc's GC_INITIAL_HEAP_SIZE environment variable. We should probably also provide a nix.conf setting for this. Note that GC_expand_hp() causes a lot of virtual, but not physical (resident) memory to be diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 34b4a5158..7f375097a 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -991,7 +991,7 @@ void LocalStore::setSubstituterEnv() { if (didSetSubstituterEnv) return; - /* Pass configuration options (including those overriden with + /* Pass configuration options (including those overridden with --option) to substituters. */ setenv("_NIX_OPTIONS", settings.pack().c_str(), 1); diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index d3b210e3f..162bfc681 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -177,7 +177,7 @@ public: /* Register the validity of a path, i.e., that `path' exists, that the paths referenced by it exists, and in the case of an output - path of a derivation, that it has been produced by a succesful + path of a derivation, that it has been produced by a successful execution of the derivation (or something equivalent). Also register the hash of the file system contents of the path. The hash must be a SHA-256 hash. */ diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh index e1c4514db..e5a9df1d0 100644 --- a/src/libutil/serialise.hh +++ b/src/libutil/serialise.hh @@ -61,7 +61,7 @@ struct BufferedSource : Source size_t read(unsigned char * data, size_t len); - /* Underlying read call, to be overriden. */ + /* Underlying read call, to be overridden. */ virtual size_t readUnbuffered(unsigned char * data, size_t len) = 0; bool hasData(); diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 5a88a158c..8fd61826f 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -629,8 +629,8 @@ AutoCloseFD::AutoCloseFD(int fd) AutoCloseFD::AutoCloseFD(const AutoCloseFD & fd) { - /* Copying a AutoCloseFD isn't allowed (who should get to close - it?). But as a edge case, allow copying of closed + /* Copying an AutoCloseFD isn't allowed (who should get to close + it?). But as an edge case, allow copying of closed AutoCloseFDs. This is necessary due to tiresome reasons involving copy constructor use on default object values in STL containers (like when you do `map[value]' where value isn't in diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc index 68a3e89d8..9ed3eccf3 100644 --- a/src/nix-env/nix-env.cc +++ b/src/nix-env/nix-env.cc @@ -804,7 +804,7 @@ void printTable(Table & table) } -/* This function compares the version of a element against the +/* This function compares the version of an element against the versions in the given set of elements. `cvLess' means that only lower versions are in the set, `cvEqual' means that at most an equal version is in the set, and `cvGreater' means that there is at diff --git a/tests/lang/eval-okay-autoargs.nix b/tests/lang/eval-okay-autoargs.nix index 1356bb5aa..815f51b1d 100644 --- a/tests/lang/eval-okay-autoargs.nix +++ b/tests/lang/eval-okay-autoargs.nix @@ -5,7 +5,7 @@ let in { xyzzy2 ? xyzzy # mutually recursive args -, xyzzy ? "blaat" # will be overriden by --argstr +, xyzzy ? "blaat" # will be overridden by --argstr , fb ? foobar , lib # will be set by --arg }: