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

llvmPackages_10: 10.0.0 -> 10.0.1 #88248

Merged
merged 1 commit into from
Jul 28, 2020
Merged

llvmPackages_10: 10.0.0 -> 10.0.1 #88248

merged 1 commit into from
Jul 28, 2020

Conversation

ggreif
Copy link
Contributor

@ggreif ggreif commented May 20, 2020

Motivation for this change

10.0.1 final is out:
http://lists.llvm.org/pipermail/release-testers/2020-July/001297.html

RCs are out:

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

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

@DieGoldeneEnte the downloading part seems to work, cmake still has trouble. See last commit message. Feel free to iterate on this or suggest a better way :-)

@DieGoldeneEnte
Copy link
Contributor

I would suggest waiting a little, maybe the tarballs will be added later (I think the source-code archives are auto-generated). Someone already asked for the usual tarballs (http://lists.llvm.org/pipermail/llvm-dev/2020-May/141684.html).
Also I think it is better to not split the source-archive. If you split it up you will get 2 copies in your nix-store and since there are a lot of dependencies between the different tools you still get a good amount of rebuilds (I think everything depends on llvm and it gets updated multiple times a day).
I would need to take a closer look to get an overview of the differences when building with the mono-repo.

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

Well, having such a monorepo-style thing would help tracking master, but that probably has a very limited audience.

@DieGoldeneEnte
Copy link
Contributor

@ggreif I agree, the mono-repo is the right way (also to track other llvm-repositories like the one from amd).
I think the best way wouldbe to just use the same source (the complete one) for all the tools. It might be useful to separate smaller components not depending on llvm, like libunwind, but for the large components like clang this is not as useful (for development use one could still give a separate source for the component in question).

@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

Okay, the split tarballs arrived. Updating...

@ggreif ggreif force-pushed the master branch 2 times, most recently from de415c4 to 530e10f Compare May 20, 2020 17:01
@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

@GrahamcOfBorg build llvm_10 clang_10 lldb_10 lld_10 llvmPackages_10

@ggreif ggreif marked this pull request as ready for review May 20, 2020 17:11
@ggreif ggreif requested a review from matthewbauer as a code owner May 20, 2020 17:11
@ggreif
Copy link
Contributor Author

ggreif commented May 20, 2020

The only problem I see is #87528. So this is ready for review.

@DieGoldeneEnte
Copy link
Contributor

DieGoldeneEnte commented May 20, 2020

LGTM. It builds and I didn't have any problems with small test compilations.
I checked the llvm-patch. The canges are still only in master and not included in this version.

Edit: It should be squashed before merging :)

@ggreif ggreif force-pushed the master branch 2 times, most recently from c17e2fb to 659aa0c Compare May 20, 2020 19:01
@ggreif ggreif changed the title llvmPackages_10: 10.0.0 -> 10.0.1 llvmPackages_10: 10.0.0 -> 10.0.1rc1 May 20, 2020
@Mic92
Copy link
Member

Mic92 commented May 22, 2020

Result of nixpkgs-review pr 88248 1

14 packages failed to build:
- ameba
- crystal (crystal_0_34)
- crystal2nix
- crystal_0_31
- crystal_0_32
- crystal_0_33
- gitAndTools.thicket
- google-cloud-cpp
- icr
- lucky-cli
- mint
- oq
- scry
- shards
15 packages built:
- bat-extras.prettybat
- chromium
- clang-tools
- clang_10
- embree2
- ispc
- lld_10
- lldb_10
- llvm_10
- luxcorerender
- python37Packages.tiledb
- python38Packages.tiledb
- tiledb
- tinygo
- zig

@ggreif
Copy link
Contributor Author

ggreif commented May 22, 2020

@Mic92 Thanks for doing this! Do you get different results with 10.0.0? (It is okay to say "don't know" then I'll try it locally.)
Hey, I just tried, with shards giving me this tail:

CMake Generate step failed.  Build files cannot be regenerated correctly.
builder for '/nix/store/vm1zqvr0rcjy83a2qg2xnhxix76122mn-compiler-rt-10.0.1rc1.drv' failed with exit code 1
cannot build derivation '/nix/store/8pwnwbb3w53jxdlw0swy1wcp7ynr2444-clang-wrapper-10.0.1rc1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/xnadl4s96ffznb4gcxj84p5gnywxap3a-crystal-0.34.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/x8vprmg4w9xaxpdjj68dl6wvg2680sxy-shards-0.10.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/x8vprmg4w9xaxpdjj68dl6wvg2680sxy-shards-0.10.0.drv' failed

I bet this is #87528. When will that be out of staging?

@DieGoldeneEnte
Copy link
Contributor

This is the result I get with nixpkgs-review pr 88248 I only have 3 fails:

4 packages failed to build:
google-cloud-cpp python37Packages.tiledb python38Packages.tiledb scry

25 packages built:
ameba bat-extras.prettybat chromium clang-tools clang_10 crystal crystal2nix crystal_0_31 crystal_0_32 crystal_0_33 embree2 gitAndTools.thicket icr ispc lld_10 lldb_10 llvm_10 lucky-cli luxcorerender mint oq shards tiledb tinygo zig

on a x86_64 system.
The tiledb-fails are because of tests, previously these had nothing to do wit the compiler.
google-cloud-cpp fails on master also (with clang 10.0.0). and seems to be unrelated to llvm.

@Mic92
Copy link
Member

Mic92 commented May 23, 2020

This is the result I get with nixpkgs-review pr 88248 I only have 3 fails:

4 packages failed to build:
google-cloud-cpp python37Packages.tiledb python38Packages.tiledb scry

25 packages built:
ameba bat-extras.prettybat chromium clang-tools clang_10 crystal crystal2nix crystal_0_31 crystal_0_32 crystal_0_33 embree2 gitAndTools.thicket icr ispc lld_10 lldb_10 llvm_10 lucky-cli luxcorerender mint oq shards tiledb tinygo zig

on a x86_64 system.
The tiledb-fails are because of tests, previously these had nothing to do wit the compiler.
google-cloud-cpp fails on master also (with clang 10.0.0). and seems to be unrelated to llvm.

In doubt I would trust this result more. I don't have a nix-daemon running on this machine, so there might be subtle bugs.

@ggreif ggreif changed the title llvmPackages_10: 10.0.0 -> 10.0.1rc1 llvmPackages_10: 10.0.0 -> 10.0.1rc2 Jul 2, 2020
@ggreif
Copy link
Contributor Author

ggreif commented Jul 2, 2020

TODO:

patching sources
applying patch /nix/store/kavpkf622k44kw6j7hs40b4zchx116g4-llvm-extension-handling.patch
patching file CMakeLists.txt
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
2 out of 2 hunks ignored -- saving rejects to file CMakeLists.txt.rej
patching file cmake/modules/AddLLVM.cmake
Hunk #1 FAILED at 884.
1 out of 1 hunk FAILED -- saving rejects to file cmake/modules/AddLLVM.cmake.rej
patching file cmake/modules/CMakeLists.txt
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file cmake/modules/CMakeLists.txt.rej

@ggreif
Copy link
Contributor Author

ggreif commented Jul 2, 2020

error: build of '/nix/store/919m86sc9rf5m5mspnvcsdk48il3ccjv-llvm-manpages-10.0.1rc2.drv', '/nix/store/qmw96fj70maf93k0hpqa2f1a40zzdz02-lldb-manpages-10.0.1rc2.drv' failed

@ggreif ggreif mentioned this pull request Jul 22, 2020
10 tasks
@ggreif ggreif changed the title llvmPackages_10: 10.0.0 -> 10.0.1rc2 llvmPackages_10: 10.0.0 -> 10.0.1rc4 Jul 25, 2020
@ggreif
Copy link
Contributor Author

ggreif commented Jul 25, 2020

@DieGoldeneEnte we still have the manpages problem. Any ideas what they could be?

@DieGoldeneEnte
Copy link
Contributor

DieGoldeneEnte commented Jul 26, 2020

Sorry, somehow forgot to mention it here.
The problem is with recommonmark and sphinx3 not working nicely together (see #93117).

To test building you can revert ./pkgs/development/python-modules/sphinx to commit 84cf00f.

@ggreif ggreif changed the title llvmPackages_10: 10.0.0 -> 10.0.1rc4 llvmPackages_10: 10.0.0 -> 10.0.1 Jul 26, 2020
@ggreif
Copy link
Contributor Author

ggreif commented Jul 26, 2020

See 2a5899b (and parent) for how to revert to candidates.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 26, 2020
@ofborg ofborg bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 26, 2020
@DieGoldeneEnte
Copy link
Contributor

FYI recommonmark is marked as broken for now (on master). As a result llvmPackages 8-10 can't be build completely (manpages for llvm fail). Older versions are not affected, because they don't use recommonmark.

I think we can remove (comment out) the llvm manpages for 8 until 10 (and the lldb for 10) since it can't be viewed with man anyways.

What do you think @ggreif @matthewbauer ?

@ggreif
Copy link
Contributor Author

ggreif commented Jul 26, 2020

@DieGoldeneEnte I am okay with that, since you can read the manpages on the internet anyway. Do you want to add a commit?

@DieGoldeneEnte
Copy link
Contributor

DieGoldeneEnte commented Jul 28, 2020

I'll open an other PR so I can disable them all in one commit.
They still merge automatically :)

Edit: #94061

@matthewbauer matthewbauer merged commit ea842a7 into NixOS:master Jul 28, 2020
@wjlroe wjlroe mentioned this pull request Aug 2, 2020
10 tasks
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants