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.13.4 -> 3.14.5 #63704

Merged
merged 2 commits into from Jul 3, 2019
Merged

cmake: 3.13.4 -> 3.14.5 #63704

merged 2 commits into from Jul 3, 2019

Conversation

tobim
Copy link
Contributor

@tobim tobim commented Jun 23, 2019

Motivation for this change

https://cmake.org/cmake/help/v3.14/release/3.14.html

Things done

Besides the updated version and Hash, I applied these changes to the expression:

  • Remove with stdenv.lib statement to make the origin of various functions clearer at their call sites.
  • Calculate Major.Minor from version, instead of the other way around. Hopefully making this package auto-updater friendly.
  • 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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

pkgs/development/tools/build-managers/cmake/default.nix Outdated Show resolved Hide resolved
version = "${majorVersion}.${minorVersion}";
lib = stdenv.lib;
os = lib.optionalString;
version = "3.14.5";
Copy link
Member

Choose a reason for hiding this comment

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

version and sha256 don't need to be up here anymore, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right. I went ahead and removed the os shortcut as well.

@tobim
Copy link
Contributor Author

tobim commented Jun 28, 2019

Rebased on latest staging to fix the conflict.

Should this be backported to 19.03?

@ofborg ofborg bot requested a review from ttuegel June 28, 2019 08:24
@FRidh FRidh merged commit d87c843 into NixOS:staging Jul 3, 2019
@tobim tobim deleted the pkgs/cmake-3.14 branch December 7, 2019 21:33
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

4 participants