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

treewide: get rid of invalid buildPhases argument #31390

Merged
merged 1 commit into from Nov 11, 2017

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Nov 8, 2017

Motivation for this change

I don't know where this comes from (I accidentally did that as well
once), but some derivations seem to use buildPhases rather than
phases in their derivations.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@Ma27
Copy link
Member Author

Ma27 commented Nov 8, 2017

currently running nox-review against this PR

@globin
Copy link
Member

globin commented Nov 8, 2017

I'd prefer removing them, as apparently running the other phases causes no harm and all of these are missing the fixupPhase which should always be included IMHO

@Ma27
Copy link
Member Author

Ma27 commented Nov 8, 2017 via email

@globin
Copy link
Member

globin commented Nov 8, 2017

It isn't as easy as just removing all phases arguments, some definitely will need dontBuild, some might be adding phases and I think some need changes to the unpacking.

@Ma27
Copy link
Member Author

Ma27 commented Nov 8, 2017

@globin I think I should've been more precisely.

You mentioned that the fixupPhase should always be included and I've seen several packages using the phases argument where this wasn't the case, so I wanted to point out that this could/should be changed (however you're obviously right, dropping it might not be the best idea).

Furthermore I think it might be better if we do this in another PR :-)

@Ma27 Ma27 force-pushed the fix-buildphase-expressions branch from 1199f6a to c26a27e Compare November 8, 2017 20:33
@Ma27
Copy link
Member Author

Ma27 commented Nov 8, 2017

currently running nox-review on my machine.
If everything works well I'll reword the commit history and then it should be ready to get merged...

I don't know where this comes from (I accidentally did that as well
once), but some derivations seem to use `buildPhases` rather than
`phases` in their derivations.

This kills all improper usages as the lack of a `phases` argument
didn't break the build, so this can be safely removed.
@Ma27 Ma27 force-pushed the fix-buildphase-expressions branch from c26a27e to 161e80e Compare November 8, 2017 20:39
@Ma27 Ma27 changed the title treewide: s/buildPhases/phases treewide: get rid of invalid buildPhases argument Nov 8, 2017
@Ma27
Copy link
Member Author

Ma27 commented Nov 8, 2017

nox-review works and building a VM with a solr service inside evalutes as well...

@orivej orivej merged commit 30cbba9 into NixOS:master Nov 11, 2017
@Ma27 Ma27 deleted the fix-buildphase-expressions branch November 11, 2017 06:44
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

5 participants