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

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

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 @

@FRidh
Copy link
Member

@FRidh FRidh commented Dec 1, 2019

needs rebase

@tobim tobim force-pushed the tobim:pkgs/cmake branch from 63f855e to 34ceec7 Dec 1, 2019
@ttuegel
ttuegel approved these changes Dec 2, 2019
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
Copy link
Contributor

@jtojnar jtojnar left a comment

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

@tobim tobim force-pushed the tobim:pkgs/cmake branch from 34ceec7 to 2a027b1 Dec 4, 2019
@tobim
Copy link
Contributor Author

@tobim 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 Dec 4, 2019
@jtojnar jtojnar self-requested a review Dec 4, 2019
@tobim tobim closed this Dec 7, 2019
@tobim tobim deleted the tobim:pkgs/cmake branch Dec 7, 2019
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 tobim:pkgs/cmake branch Dec 7, 2019
@tobim tobim force-pushed the tobim:pkgs/cmake branch from 2a027b1 to 3ae588e Dec 10, 2019
@tobim tobim force-pushed the tobim:pkgs/cmake branch from 3ae588e to fded3ac Dec 20, 2019
@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 tobim commented Dec 20, 2019

@jtojnar would you mind having another look?

@jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Dec 20, 2019

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 force-pushed the tobim:pkgs/cmake branch from fded3ac to 5e56f4e Dec 20, 2019
@tobim
Copy link
Contributor Author

@tobim tobim commented Dec 20, 2019

Good catch! Your feedback is integrated.

@jtojnar jtojnar merged commit 8a8e662 into NixOS:staging Dec 20, 2019
15 checks passed
15 checks passed
cmake, quickder on aarch64-linux Failure
Details
Evaluation Performance Report Evaluator Performance Report
Details
cmake, quickder on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Staging automation moved this from WIP to Done Dec 20, 2019
@jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Dec 20, 2019

Thanks.

@tobim tobim deleted the tobim:pkgs/cmake branch Dec 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.