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

Conversation

@stites
Copy link
Contributor

stites commented Feb 19, 2019

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)

@bachp
bachp approved these changes Feb 19, 2019
@dasJ
dasJ approved these changes Feb 20, 2019
@vcunat
vcunat approved these changes Feb 22, 2019
@vcunat vcunat merged commit 9b38f6f into NixOS:staging Feb 22, 2019
10 checks passed
10 checks passed
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-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
vcunat added a commit that referenced this pull request Feb 22, 2019
@FlorianFranzen

This comment has been minimized.

Copy link
Contributor

FlorianFranzen commented Feb 22, 2019

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 stites:cmake-3.13 branch Feb 22, 2019
dtzWill added a commit to dtzWill/nixpkgs that referenced this pull request Feb 22, 2019
@vcunat

This comment has been minimized.

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

This comment has been minimized.

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
You can’t perform that action at this time.