ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

Fix comments typos.

Browse Source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 20:03:18 +00:00
parent aa7f0fc214
commit 87ad35e336
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/aliases.nix
View File

@ -3,7 +3,7 @@ self:
with self; with self;
let let
# Removind recurseForDerivation prevents derivations of aliased attribute # Removing recurseForDerivation prevents derivations of aliased attribute
# set to appear while listing all the packages available. # set to appear while listing all the packages available.
removeRecurseForDerivations = _n: alias: with lib; removeRecurseForDerivations = _n: alias: with lib;
if alias.recurseForDerivations or false then if alias.recurseForDerivations or false then

10
pkgs/top-level/default.nix
View File

@ -88,11 +88,11 @@ let
crossSystem platform lib; 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' # 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* # 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 = # attributes to refer to the original attributes (e.g. "foo =
# ... pkgs.foo ..."). # ... pkgs.foo ...").
pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {})); pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {}));
@ -122,11 +122,11 @@ let
aliases = self: super: import ./aliases.nix super; aliases = self: super: import ./aliases.nix super;
# stdenvOverrides is used to avoid circular dependencies for building # 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. # mechanism to implement some staged compilation of the stdenv.
# #
# We don't want stdenv overrides in the case of cross-building, or # 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. # crossStdenv adapter.
stdenvOverrides = self: super: stdenvOverrides = self: super:
lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides) lib.optionalAttrs (crossSystem == null && super.stdenv ? overrides)