diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 20:03:18 +0000 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-24 19:40:12 +0000 |
| commit | 87ad35e336bcaefc0254c01d76c5e2356c315e43 (patch) | |
| tree | 50ef66a0a0b1cc3222bd15ef481048fc190dd518 /pkgs | |
| parent | aa7f0fc21435c253a7fb0c9e3ab1840c2f60c5be (diff) | |
| download | nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.tar nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.tar.gz nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.tar.bz2 nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.tar.lz nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.tar.xz nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.tar.zst nixpkgs-87ad35e336bcaefc0254c01d76c5e2356c315e43.zip | |
Fix comments typos.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c0b93335c80..b9f072e6ca6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -3,7 +3,7 @@ self: with self; let - # Removind recurseForDerivation prevents derivations of aliased attribute + # Removing recurseForDerivation prevents derivations of aliased attribute # set to appear while listing all the packages available. removeRecurseForDerivations = _n: alias: with lib; if alias.recurseForDerivations or false then diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 61fd39f8ca5..4de75c2ed57 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -88,11 +88,11 @@ let crossSystem platform lib; }; - # Allow packages to be overriden globally via the `packageOverrides' + # Allow packages to be overridden globally via the `packageOverrides' # configuration option, which must be a function that takes `pkgs' - # as an argument and returns a set of new or overriden packages. + # as an argument and returns a set of new or overridden packages. # The `packageOverrides' function is called with the *original* - # (un-overriden) set of packages, allowing packageOverrides + # (un-overridden) set of packages, allowing packageOverrides # attributes to refer to the original attributes (e.g. "foo = # ... pkgs.foo ..."). pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {})); @@ -122,11 +122,11 @@ let aliases = self: super: import ./aliases.nix super; # stdenvOverrides is used to avoid circular dependencies for building - # the standard build environment. This mechanism use the override + # the standard build environment. This mechanism uses the override # mechanism to implement some staged compilation of the stdenv. # # We don't want stdenv overrides in the case of cross-building, or - # otherwise the basic overrided packages will not be built with the + # otherwise the basic overridden packages will not be built with the # crossStdenv adapter. stdenvOverrides = self: super: lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) |