-
-
Notifications
You must be signed in to change notification settings - Fork 13.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use fix and extend function for all-packages.nix #14000
Commits on Mar 20, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9444d6e - Browse repository at this point
Copy the full SHA 9444d6eView commit details -
Configuration menu - View commit details
-
Copy full SHA for a39c5ff - Browse repository at this point
Copy the full SHA a39c5ffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 11a566b - Browse repository at this point
Copy the full SHA 11a566bView commit details -
Move helperfunctions and stdenvAdapters under pkgsFun.
The `helperFunctions` and `stdenvAdapters` both use the `pkgs` attribute as input, either to inherit some properties, either to use it as argument. The `pkgs` binding used in both expressions of the `helperFunctions` and `stdenvAdapters` is no longer the result of the `applyGlobalOverrides` function, but the argument of the `pkgsFun` function. The `pkgsFun` functions is called twice under `applyGlobalOverrides`, and in both cases, the first argument of `pkgsFun` correspond to the result of `applyGlobalOverrides`. Thus, this modification will change the bindings, but the evaluation of `<nixpkgs>`. A third call the `pkgsFun` exists under `overridePackages` in the set of all packages. Previously, the `helperFunctions` and `stdenvAdapaters` would use the functions defined as part of the default `<nixpkgs>` set. With this modification, the `helperFunctions` and the `stdenvAdapters` are now using the fix-point of the newly evaluated package set. This implies that this modification allow the user to use `overridePackages`, which is already not recommended for performance reasons, to override the inputs of the `helperFucntions` and `stdenvAdapaters` too, where this was not possible before.
Configuration menu - View commit details
-
Copy full SHA for 5f4cb91 - Browse repository at this point
Copy the full SHA 5f4cb91View commit details -
Configuration menu - View commit details
-
Copy full SHA for f9a2988 - Browse repository at this point
Copy the full SHA f9a2988View commit details -
Configuration menu - View commit details
-
Copy full SHA for a6e260c - Browse repository at this point
Copy the full SHA a6e260cView commit details -
Configuration menu - View commit details
-
Copy full SHA for a5188bd - Browse repository at this point
Copy the full SHA a5188bdView commit details -
1
Configuration menu - View commit details
-
Copy full SHA for 00963c3 - Browse repository at this point
Copy the full SHA 00963c3View commit details -
Configuration menu - View commit details
-
Copy full SHA for acaa99c - Browse repository at this point
Copy the full SHA acaa99cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 71b2fd9 - Browse repository at this point
Copy the full SHA 71b2fd9View commit details -
Configuration menu - View commit details
-
Copy full SHA for a8374f2 - Browse repository at this point
Copy the full SHA a8374f2View commit details -
Remove with helperFunction above the list of all packages.
This modification change the names bound to the `helperFunctions` attribute set, to be bound to `self` which is constructed by merging the same `helperFunctions` set with the set of all packages. This patch works as expected because none of the helperFunction names is aliased by the name of a package.
Configuration menu - View commit details
-
Copy full SHA for a658645 - Browse repository at this point
Copy the full SHA a658645View commit details -
Configuration menu - View commit details
-
Copy full SHA for ffcb668 - Browse repository at this point
Copy the full SHA ffcb668View commit details -
Under pkgsFun, expand self attribute, and rename self_ to self.
Note, the aliases are now computed against the set of packages defined in the set of all packages, and no longer apply to any overriden package. I think this is better as this reduces the amount of surprizes.
Configuration menu - View commit details
-
Copy full SHA for 8d355b8 - Browse repository at this point
Copy the full SHA 8d355b8View commit details -
Swap conditions of stdenvOverrides to prevent infinite loops while ev…
…aluating stdenvCross. While evaluating the derivation of xbursttools: the condition `pkgs.stdenv ? overrides` causes the evaluation of `stdenvCross`. This evaluation comes too early during the execution, as it prevents the resolution of names such as `pkgs.lib`, and `stdenvAdapaters.makeStdenvCross`, which we want to take from `pkgs` instead of `self` in following patches. By swapping the conditions, we effectively make the resolution of `pkgs.lib` and `stdenvAdapaters.makeStdenvCross` possible through the pkgs attribute.
Configuration menu - View commit details
-
Copy full SHA for 7f3a4f4 - Browse repository at this point
Copy the full SHA 7f3a4f4View commit details -
Extract stdenvDefault from the set of all packages. As this set of attributes are inter-dependant, probably due to stdenvOverrides, we have to keep them in a close set of inter-dependent options. I guess I will have to investigate more ...
1Configuration menu - View commit details
-
Copy full SHA for 020bb40 - Browse repository at this point
Copy the full SHA 020bb40View commit details -
Configuration menu - View commit details
-
Copy full SHA for be3531a - Browse repository at this point
Copy the full SHA be3531aView commit details -
Move merge of stdenvDefault from the self attribute to the returned v…
…alue of pkgsFun.
Configuration menu - View commit details
-
Copy full SHA for f7c86ee - Browse repository at this point
Copy the full SHA f7c86eeView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b67f7c - Browse repository at this point
Copy the full SHA 0b67f7cView commit details -
4
Configuration menu - View commit details
-
Copy full SHA for a09683e - Browse repository at this point
Copy the full SHA a09683eView commit details -
Move the set of aliases after 'self', such that we can later use the …
…extend function.
Configuration menu - View commit details
-
Copy full SHA for f043ffc - Browse repository at this point
Copy the full SHA f043ffcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0543277 - Browse repository at this point
Copy the full SHA 0543277View commit details -
Configuration menu - View commit details
-
Copy full SHA for 007500f - Browse repository at this point
Copy the full SHA 007500fView commit details -
Remove applyGlobalOverrides's pkgsOrig argument.
This patch change the behaviour or overridePackages: - Before, overridePackages was based on top of the set of packages overriden by `~/.nixpkgs/config.nix` file. - After, overridePackages should when given a function f, behave almost¹ the same as-if the packageOverrides attribute of `~/.nixpkgs/config.nix` file attribute was set to f, assuming that we ignore the extra `self` argument. ¹ It is not yet exactly the same because we have many paths which are re-entering nixpkgs while taking the default attributes, such as the bootstrap phase of stdenv. Thus if the nixpkgs configuration overrides any of the dependencies need for the bootstrap, then we might get different sha.
Configuration menu - View commit details
-
Copy full SHA for 5e3ce63 - Browse repository at this point
Copy the full SHA 5e3ce63View commit details -
Configuration menu - View commit details
-
Copy full SHA for 32e96bb - Browse repository at this point
Copy the full SHA 32e96bbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 07e549e - Browse repository at this point
Copy the full SHA 07e549eView commit details -
Reformat pkgsWithOverrides to later facilitate the identitication wit…
…h the extend functions.
Configuration menu - View commit details
-
Copy full SHA for a543a57 - Browse repository at this point
Copy the full SHA a543a57View commit details -
Configuration menu - View commit details
-
Copy full SHA for ad31783 - Browse repository at this point
Copy the full SHA ad31783View commit details -
Configuration menu - View commit details
-
Copy full SHA for 335a969 - Browse repository at this point
Copy the full SHA 335a969View commit details -
Split consecutive merge operators to simplify the identification of e…
…xtend functions.
Configuration menu - View commit details
-
Copy full SHA for ae0471b - Browse repository at this point
Copy the full SHA ae0471bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5cdaa7b - Browse repository at this point
Copy the full SHA 5cdaa7bView commit details -
Configuration menu - View commit details
-
Copy full SHA for ff72cf1 - Browse repository at this point
Copy the full SHA ff72cf1View commit details -
Move stdenvAdapaters attribute from all-packages.nix into the stdenvA…
…dapters of the top-level.
Configuration menu - View commit details
-
Copy full SHA for 01693ac - Browse repository at this point
Copy the full SHA 01693acView commit details -
Build aliases based on the previous set including all-packages, inste…
…ad of only using all-packages.
Configuration menu - View commit details
-
Copy full SHA for f8dedbb - Browse repository at this point
Copy the full SHA f8dedbbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5783f66 - Browse repository at this point
Copy the full SHA 5783f66View commit details -
Configuration menu - View commit details
-
Copy full SHA for a190baa - Browse repository at this point
Copy the full SHA a190baaView commit details -
Configuration menu - View commit details
-
Copy full SHA for 598ed87 - Browse repository at this point
Copy the full SHA 598ed87View commit details -
Add bootStdenv condition around the overrider.
This condition used to be implicit in the sense that the stdenvOverrides uses pkgs_6, instead of pkgs_7 as its super set, and also that each stage of the compiler is build again the bootstrap packages of the previous stage, thus overriden by the stdenv.override function.
Configuration menu - View commit details
-
Copy full SHA for 9e8c520 - Browse repository at this point
Copy the full SHA 9e8c520View commit details -
Move the customOverrides after the stdenvOverrides.
This change is not backward compatible, in the sense that this allow you to override the packages which used to be overriden by the last stage of stdenv. Note, this does not mean that these packages would be used by stdenv.
Configuration menu - View commit details
-
Copy full SHA for 21b8007 - Browse repository at this point
Copy the full SHA 21b8007View commit details -
Change the customOverrides to use the stdenvOverrides instead of the …
…original package set.
Configuration menu - View commit details
-
Copy full SHA for 800766f - Browse repository at this point
Copy the full SHA 800766fView commit details -
Under pkgsWithOverrides, replace the last uses of pkgs by the corresp…
…onding argument.
Configuration menu - View commit details
-
Copy full SHA for 1bcefcd - Browse repository at this point
Copy the full SHA 1bcefcdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5ae7356 - Browse repository at this point
Copy the full SHA 5ae7356View commit details -
Configuration menu - View commit details
-
Copy full SHA for aa7f0fc - Browse repository at this point
Copy the full SHA aa7f0fcView commit details
Commits on Mar 24, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 87ad35e - Browse repository at this point
Copy the full SHA 87ad35eView commit details