Skip to content

cmake: 3.15.4 -> 3.16.2 - #74293

Merged
jtojnar merged 2 commits into
NixOS:stagingfrom
tobim:pkgs/cmake
Dec 20, 2019
Merged

jtojnar merged 2 commits into
NixOS:stagingfrom
tobim:pkgs/cmake

Conversation

@tobim

@tobim tobim commented Nov 26, 2019 •

Copy link
Copy Markdown
Contributor
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 added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Nov 26, 2019
@ofborg
ofborg Bot requested review from LnL7 and ttuegel November 26, 2019 21:09
@ofborg ofborg Bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 26, 2019
@FRidh

FRidh commented Dec 1, 2019

Copy link
Copy Markdown
Member

needs rebase

@jtojnar jtojnar left a comment

Copy link
Copy Markdown
Member

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

tobim commented Dec 4, 2019

Copy link
Copy Markdown
Contributor Author

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
@tobim tobim reopened this 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

tobim commented Dec 20, 2019

Copy link
Copy Markdown
Contributor Author

@jtojnar would you mind having another look?

@jtojnar

jtojnar commented Dec 20, 2019 •

Copy link
Copy Markdown
Member

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

tobim commented Dec 20, 2019

Copy link
Copy Markdown
Contributor Author

Good catch! Your feedback is integrated.

@jtojnar
jtojnar merged commit 8a8e662 into NixOS:staging Dec 20, 2019
@jtojnar

jtojnar commented Dec 20, 2019

Copy link
Copy Markdown
Member

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

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

No open projects
Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants