Skip to content
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

Split all-packages.nix #10307

Closed
wants to merge 2 commits into from
Closed

Split all-packages.nix #10307

wants to merge 2 commits into from

Conversation

nbp
Copy link
Member

@nbp nbp commented Oct 10, 2015

This patch is moves the header & footer of all-packages.nix into a separated file named all-packages-wrapper.nix. To do so, I added a new list of arguments to the all-packages.nix which is the explicit list of dependencies, and that we can reduce over time by making it part of the list of paclkages. (system, bootStdenv, noSysDir, …)

Later we should change the way we handle self-references (self & pkgs) such that we can follow the same scheme as done in haskellPackages (self & super).

These modifications are made to simplify the way we can add additional logic to our list of packages.

Note: This patch does not change the sha1 of derivations.
Note: This patch fix the indentation issue of all-packages.nix.
cc @peti @domenkozar @edolstra

@jagajaga
Copy link
Member

cc @edolstra

@peti
Copy link
Member

peti commented Nov 3, 2015

The error https://travis-ci.org/NixOS/nixpkgs/builds/84793391#L116 from travis looks genuine. It would be great to get that fixed. Otherwise, I'm in favor of merging this patch: 👍. Does anyone consider this re-factoring controversial?

@nbp
Copy link
Member Author

nbp commented Nov 4, 2015

I rebased this work on top of another pull request that is cleaning the logic of override packages and stdenv. I am currently working on a security update branch for the NixCon, which is based on a similar modification.

I will get back to this, hopefully before NixCon ;)

, platform ? null
, config ? {}
}:

rec {
allPackages = import ../../top-level/all-packages.nix;
allPackages = import ../../top-level/all-packages-wrapper.nix;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not refer to ../../.. (i.e. the top-level default.nix)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I will do that.

@nbp nbp mentioned this pull request Nov 6, 2015
6 tasks
@nbp
Copy link
Member Author

nbp commented Nov 20, 2015

This work is now addressed as part of #10851.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants