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

ninja: 1.8.2 -> 2018-04-10 #45276

Closed
wants to merge 1 commit into from
Closed

ninja: 1.8.2 -> 2018-04-10 #45276

wants to merge 1 commit into from

Conversation

Twey
Copy link
Contributor

@Twey Twey commented Aug 17, 2018

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@matthewbauer
Copy link
Member

Can you include some reasons for having two versions of ninja? Usually we just package released software.

@Twey
Copy link
Contributor Author

Twey commented Aug 23, 2018

@matthewbauer Ninja's release hasn't been bumped for a long time (September 2017), and the git version contains many fixes that aren't in any release, including mesonbuild/meson#3992 which was an issue at my workplace. The official stance (see comments on that issue) seems to be that distributions should just package the git.

I'm happy to just bump default.nix to the git version if you'd prefer, I just thought it would be safer to keep the release packaged in case the git one broke something. I see similar patterns for several other packages, e.g. arb/arb-git (though I note that arb-git is actually older than arb, so maybe not a great example…).

@matthewbauer
Copy link
Member

Yeah I think we would prefer to just bump ninja. Alternatively, you could just add the patch from https://github.com/ninja-build/ninja/pull/1219.patch with a note about it being in the next released version. This would avoid the potential of including other commits that break things.

@Twey
Copy link
Contributor Author

Twey commented Aug 28, 2018

Okay, changed it to bump. I think it's if anything safer to bump wholesale than to try to back-port patches.

@Twey Twey changed the title ninja-git: init at 2018-04-10 ninja: 1.8.2 -> 2018-04-10 Aug 28, 2018
@Mic92
Copy link
Member

Mic92 commented Aug 28, 2018

This pull request should go to staging branch first. I would like to also get an opinion from @jtojnar

@jtojnar
Copy link
Contributor

jtojnar commented Aug 28, 2018

I did not look into ninja very much (meson has mostly hide it from me) but, if possible, I would prefer fetchpatching the PR, there might be many changes for the last year and the risk of breakage would be probably greater. We should probably also let ofborg or hydra build at least some of the packages that depend on ninja to be more certain there were no regressions. Otherwise, I also prefer a single package.

@orivej
Copy link
Contributor

orivej commented Aug 28, 2018

@jtojnar seems right that it might be better to pick the relevant commit. I have looked at Ninja commit history and noticed that the master branch introduces this issue: ninja-build/ninja#1418

@Twey
Copy link
Contributor Author

Twey commented Aug 28, 2018

There may be other updates in there that are important to people. Maybe we should revert to the original approach of having two packages?

@jtojnar
Copy link
Contributor

jtojnar commented Aug 28, 2018

Then they can backport the other patches too. We already have too much of multiple package clutter IMO.

@orivej
Copy link
Contributor

orivej commented Aug 28, 2018

I'm OK with a new ninja-unstable if that helps you participate in its development (at least by testing it), but nevertheless we should include https://patch-diff.githubusercontent.com/raw/ninja-build/ninja/pull/1219.patch in the default ninja.

@vcunat
Copy link
Member

vcunat commented Feb 2, 2019

ninja-1.9.0 has been released: https://github.com/ninja-build/ninja/releases/tag/v1.9.0

@vcunat
Copy link
Member

vcunat commented Feb 2, 2019

Oh, merged 1.9.0 as #55008

@vcunat vcunat closed this Feb 2, 2019
@Twey
Copy link
Contributor Author

Twey commented Feb 4, 2019

Yep, I decided to leave this minefield alone and push ninja for a proper release instead. Thanks @vcunat :)

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

7 participants