mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 16:40:12 +00:00
Code Issues Wiki Activity

Rename applyGlobalOverrides to pkgsWithOverrides

Browse source
This commit is contained in:
Nicolas B. Pierron 2016-03-20 15:54:26 +00:00
parent 32e96bbb8b
commit 07e549ee5b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -95,7 +95,7 @@ let
# (un-overriden) set of packages, allowing packageOverrides # (un-overriden) 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 = applyGlobalOverrides (self: config.packageOverrides or (super: {})); pkgs = pkgsWithOverrides (self: config.packageOverrides or (super: {}));
# stdenvOverrides is used to avoid circular dependencies for building the # stdenvOverrides is used to avoid circular dependencies for building the
# standard build environment. This mechanism use the override mechanism to # standard build environment. This mechanism use the override mechanism to
@ -111,7 +111,7 @@ let
# Return the complete set of packages, after applying the overrides # Return the complete set of packages, after applying the overrides
# returned by the `overrider' function (see above). Warning: this # returned by the `overrider' function (see above). Warning: this
# function is very expensive! # function is very expensive!
applyGlobalOverrides = overrider: pkgsWithOverrides = overrider:
let let
overrides = super: overrider pkgs super // stdenvOverrides super; overrides = super: overrider pkgs super // stdenvOverrides super;
@ -167,7 +167,7 @@ let
# #
# The result is `pkgs' where all the derivations depending on `foo' # The result is `pkgs' where all the derivations depending on `foo'
# will use the new version. # will use the new version.
overridePackages = f: applyGlobalOverrides f; overridePackages = f: pkgsWithOverrides f;
# Override system. This is useful to build i686 packages on x86_64-linux. # Override system. This is useful to build i686 packages on x86_64-linux.
forceSystem = system: kernel: (import ./../..) { forceSystem = system: kernel: (import ./../..) {