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.12.1 -> 3.13.4 #56059

Merged
merged 1 commit into from Feb 22, 2019
Merged

cmake: 3.12.1 -> 3.13.4 #56059

merged 1 commit into from Feb 22, 2019
+4 −4

Conversation

stites
Copy link
Member

@stites stites commented Feb 19, 2019 •
edited

Motivation for this change

Bring cmake up-to-date (RE: #55060). This also fixes building magma with cudatoolkit-10 (see original #54836 PR).

Closes #55060.

Things done
  • 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 nox --run "nox-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.

Submitted to staging by request of @ttuegel (see #54836)

@stites stites mentioned this pull request Feb 19, 2019
Closed
10 tasks
@vcunat vcunat merged commit 9b38f6f into NixOS:staging Feb 22, 2019
vcunat added a commit that referenced this pull request Feb 22, 2019
@vcunat
Merge #56059: cmake: 3.12.1 -> 3.13.4 (into staging)
052e34a
@FlorianFranzen
Copy link
Contributor

This also fixes the "Syntax error in cmake code when parsing string \makeindex" when runinng Doxygen from CMake as currently present in unstable.

More info here:
https://gitlab.kitware.com/cmake/cmake/issues/18738

@stites stites deleted the cmake-3.13 branch February 22, 2019 16:04
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Feb 22, 2019
@vcunat @dtzWill
Merge NixOS#56059: cmake: 3.12.1 -> 3.13.4 (into staging)
04225bd 
(cherry picked from commit 052e34a)
@vcunat
Copy link
Member

vcunat commented Feb 23, 2019

Darwin stdenv won't build now :-/

[ 83%] Linking CXX executable ../bin/cmakexbuild
ld: framework not found CoreServices
clang-4.0: error: linker command failed with exit code 1 (use -v to see invocation)

@NixOS/darwin-maintainers: I hope it will be easy to fix, can you have a look?

@vcunat
Copy link
Member

vcunat commented Feb 23, 2019

OK, there's a separate issue for that now: #56244

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bachp bachp bachp approved these changes

@vcunat vcunat vcunat approved these changes

@dasJ dasJ dasJ approved these changes

@LnL7 LnL7

@ttuegel ttuegel

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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@stites @FlorianFranzen @vcunat @bachp @dasJ @GrahamcOfBorg