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

Remove pkgs aliases #14398

Merged
merged 140 commits into from
Apr 11, 2016
Merged

Remove pkgs aliases #14398

merged 140 commits into from
Apr 11, 2016

Conversation

nbp
Copy link
Member

@nbp nbp commented Apr 2, 2016

This branch aims at keeping the same hashes, but only removing aliases reported by the static analysis added in #10851 .

This branch aims at solving one of the problem which should be fixed to make the #10851 hypothesis hold, which is that all packages are defined in the first "generation" of Nixpkgs evaluation.

Thus transforming the following attribute accesses:

   +-----------+
   |           |
   |  nixpkgs  |
   |           |        +-----------+
   |   gen 3   |        |           |
   |           |        |  nixpkgs  |
   +----^------+        |           |        +-----------+
        |               |   gen 2   |        |           |   nix-build -A foo
        +---------------+           |        |  nixpkgs  |                 +
  foo_4 = callPackage…  +----^------+        |           |                 |
                             |               |   gen 1   <-----------------+
                             +---------------+           |
                         foo = foo_4;        +-----------+

Into something like:

                        +-----------+
                        |           |
                        |  nixpkgs  |
                        |           |
                        |   gen 2   |
                        |           |
                        +----^------+
                             |
                             +------------------+
                       foo_4 = callPackage…     |
                                             +-----------+
                                             |           |   nix-build -A foo
                                             |  nixpkgs  |                 +
                             +--------------->           |                 |
                             |               |   gen 1   <-----------------+
                             +---------------+           |
                         foo = self.foo_4;   +-----------+

These changes are likely to bit-rot over time, thus this pull request is a meta issue / staging area for patches which are pending for review.

cc @edolstra

update: rephrase, to make statements clearer

@nbp nbp self-assigned this Apr 2, 2016
@nbp nbp added 0.kind: enhancement Add something new 2.status: work-in-progress This PR isn't done 1.severity: security Issues which raise a security issue, or PRs that fix one labels Apr 2, 2016
@nbp nbp added this to the 16.09 milestone Apr 2, 2016
@vcunat
Copy link
Member

vcunat commented Apr 2, 2016

/participate

@domenkozar
Copy link
Member

Can we come up with a test that will check this is true for future commits?

@nbp
Copy link
Member Author

nbp commented Apr 2, 2016

@domenkozar Yes, my initial plan was to use the static analysis to ensure that the number issues does not grow. But we can only do that as soon as #10851 is landed, and as soon as the number of issues is low (no bad idioms remain).

@abbradar
Copy link
Member

abbradar commented Apr 8, 2016

Those changes seem both trivial (and shouldn't change hashes if I understand correctly) and affecting fast-moving target (all-packages.nix). I suppose we should merge this ASAP and push further changes like this directly to master to ease burden on @nbp and others who need to keep the branch mergeable -- what do you think?

Fix conflicts:
 - add liquibase near llvm attributes.
 - Merge flashplayer-standalone-debugger expression.
@domenkozar domenkozar merged commit 4897276 into NixOS:master Apr 11, 2016
@FRidh FRidh mentioned this pull request Apr 11, 2016
6 tasks
domenkozar pushed a commit that referenced this pull request Sep 12, 2016
bjornfor pushed a commit to bjornfor/nixpkgs that referenced this pull request Sep 23, 2016
…rriden packages.

(cherry picked from commit 5c6bcee)

There weres some conflicts, I fixed them.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: enhancement Add something new 1.severity: security Issues which raise a security issue, or PRs that fix one 2.status: work-in-progress This PR isn't done
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants