Skip to content

cmake: 3.17.3 -> 3.18.0#93886

Merged
FRidh merged 1 commit intoNixOS:stagingfrom
r-burns:cmake3.18
Jul 26, 2020
Merged

cmake: 3.17.3 -> 3.18.0#93886
FRidh merged 1 commit intoNixOS:stagingfrom
r-burns:cmake3.18

Conversation

@r-burns
Copy link
Copy Markdown
Contributor

@r-burns r-burns commented Jul 26, 2020 •
edited
Loading

Motivation for this change

New CMake version 3.18 available
https://cmake.org/cmake/help/v3.18/release/3.18.html

Things done

Patches had some conflicts, but they seemed to be trivial to resolve. Did that via git apply and merge on the cmake git itself - let me know if there's a more nixy way to do that.

  • 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 (Arch Linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Jul 26, 2020
@ofborg ofborg bot requested review from LnL7 and ttuegel July 26, 2020 04:26
@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 Jul 26, 2020
@jtojnar
Copy link
Copy Markdown
Member

jtojnar commented Jul 26, 2020

Yeah, git apply and git rebase on the project source tree is what I use myself. Not aware of any better way unfortunately.

jtojnar
jtojnar requested changes Jul 26, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@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.

  1. I did not see anything alarming in the changelog but someone more familiar with CMake should review it too.
  2. The patch needs to be reapplied correctly.
  3. The target branch needs to be changed to staging since this is a mass rebuild (see edit button at the top of this page).

@r-burns r-burns changed the base branch from master to staging July 26, 2020 15:16
@ofborg ofborg bot added 6.topic: emacs Text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Jul 26, 2020
@ofborg ofborg bot removed 6.topic: emacs Text editor 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 26, 2020
jtojnar
jtojnar approved these changes Jul 26, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@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.

LGTM.

@FRidh FRidh merged commit 3a57356 into NixOS:staging Jul 26, 2020
@r-burns r-burns deleted the cmake3.18 branch July 26, 2020 17:28
@orivej orivej mentioned this pull request Aug 8, 2020
Merged
10 tasks
@primeos primeos mentioned this pull request Aug 8, 2020
Closed
@Janik-Haag Janik-Haag added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtojnar jtojnar jtojnar approved these changes

@LnL7 LnL7 Awaiting requested review from LnL7

@ttuegel ttuegel Awaiting requested review from ttuegel

@adisbladis adisbladis Awaiting requested review from adisbladis

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@Lassulus Lassulus Awaiting requested review from Lassulus

@Mic92 Mic92 Awaiting requested review from Mic92

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 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. 12.first-time contribution This PR is the author's first one; please be gentle!

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@r-burns @jtojnar @FRidh @Janik-Haag