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

Jump to bottom

cmake: 3.15.4 -> 3.16.2 #74293

Merged
merged 2 commits into from Dec 20, 2019
Merged

cmake: 3.15.4 -> 3.16.2 #74293

merged 2 commits into from Dec 20, 2019

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Nov 26, 2019 •
edited

Motivation for this change

The announcement: https://discourse.cmake.org/t/cmake-3-16-0-available-for-download/262
The release page: https://cmake.org/cmake/help/v3.16/release/3.16.html

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@ofborg ofborg bot requested review from ttuegel and LnL7 November 26, 2019 21:09
@FRidh FRidh added this to Needs review in Staging Nov 30, 2019
@FRidh
Copy link
Member

FRidh commented Dec 1, 2019

needs rebase

Staging automation moved this from Needs review to Ready Dec 2, 2019
@jtojnar jtojnar moved this from Ready to WIP in Staging Dec 3, 2019
jtojnar
jtojnar requested changes Dec 3, 2019
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

We have added a patch to CMake in #74282, this will need to be removed before merging.

@tobim
Copy link
Contributor Author

tobim commented Dec 4, 2019

We have added a patch to CMake in #74282, this will need to be removed before merging.

Thanks, done.

@ofborg ofborg bot requested a review from ttuegel December 4, 2019 05:41
@jtojnar jtojnar self-requested a review December 4, 2019 06:35
@tobim tobim closed this Dec 7, 2019
@tobim tobim deleted the pkgs/cmake branch December 7, 2019 21:29
Staging automation moved this from WIP to Done Dec 7, 2019
@tobim tobim reopened this Dec 7, 2019
Staging automation moved this from Done to WIP Dec 7, 2019
@tobim tobim restored the pkgs/cmake branch December 7, 2019 21:30
@tobim tobim changed the title cmake: 3.15.4 -> 3.16.0 cmake: 3.15.4 -> 3.16.2 Dec 20, 2019
@tobim
Copy link
Contributor Author

tobim commented Dec 20, 2019

@jtojnar would you mind having another look?

@jtojnar
Copy link
Contributor

jtojnar commented Dec 20, 2019 •
edited

Looking at the changelog:

The “CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY” variable has been
deprecated. Use the “CMAKE_FIND_USE_PACKAGE_REGISTRY” variable
instead.

$ rg CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY
pkgs/development/libraries/quickder/default.nix
43:    "-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON"

pkgs/development/tools/build-managers/cmake/setup-hook.sh
99:    cmakeFlags="-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON $cmakeFlags"

Otherwise the changelog looks fine.

@tobim
Copy link
Contributor Author

tobim commented Dec 20, 2019

Good catch! Your feedback is integrated.

@jtojnar jtojnar merged commit 8a8e662 into NixOS:staging Dec 20, 2019
Staging automation moved this from WIP to Done Dec 20, 2019
@jtojnar
Copy link
Contributor

jtojnar commented Dec 20, 2019

Thanks.

@tobim tobim deleted the pkgs/cmake branch December 20, 2019 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 Awaiting requested review from LnL7

@ttuegel ttuegel Awaiting requested review from ttuegel

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tobim @FRidh @jtojnar @ttuegel