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_latest: 11 -> 12 #116646

Merged
merged 1 commit into from Jun 2, 2021
Merged

llvmPackages_latest: 11 -> 12 #116646

merged 1 commit into from Jun 2, 2021

Conversation

ggreif
Copy link
Contributor

@ggreif ggreif commented Mar 17, 2021

https://lists.llvm.org/pipermail/release-testers/2021-March/001496.html

Fixes #116629.

Motivation for this change
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 Mar 17, 2021

@GrahamcOfBorg build llvmPackages_12

@ggreif
Copy link
Contributor Author

ggreif commented Mar 17, 2021

When this is merged, reverting 759b50f on staging might be a good idea (sometime in the future).

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

some idea to modernize the expression a bit

pkgs/development/compilers/llvm/12/llvm.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/12/llvm.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/12/lldb.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/12/lldb.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/12/lldb.nix Outdated Show resolved Hide resolved
pkgs/development/compilers/llvm/12/llvm.nix Outdated Show resolved Hide resolved
inherit clang-tools-extra_src;
};

# disabled until recommonmark supports sphinx 3
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We should revisit this.

@primeos primeos mentioned this pull request Mar 19, 2021
@primeos
Copy link
Member

primeos commented Mar 31, 2021

@GrahamcOfBorg build llvmPackages_12.stdenv

@primeos primeos changed the title llvmPackages_12: start with rc3 (mostly copy 11.1.0) llvmPackages_12: 12.0.0 Apr 1, 2021
@ggreif ggreif marked this pull request as ready for review April 18, 2021 00:33
@Ericson2314
Copy link
Member

Wow, it's a bit scary this is a mass rebuild.

@primeos
Copy link
Member

primeos commented Apr 28, 2021

@Ericson2314 yeah. I haven't checked yet but hopefully it's just due to mesa. I've noticed that a8aeef7 is in master now so after this rebase it should hopefully look much better.

@Ericson2314
Copy link
Member

@primeos Oh nice, I feel much better now :).

@primeos
Copy link
Member

primeos commented Jun 2, 2021

I've tried to test this a few days ago using nixpkgs-review but it was even worse than I thought and I ran out of disk space too quickly. At least 21 builds still succeed and all of the failures where unrelated:

1093 packages updated:
[...]
21 packages built:
Sylk _1password-gui appgate-sdp asymptote atom avocode azuredatastudio bat-extras.prettybat bitwarden blur-effect brave cardboard ccls clangAnalyzer clang-tools google-cloud-cpp libGL_driver lldb lldb_11 mesa mycrypto

Let's test this on staging due to the lack of a dedicated Hydra jobset and to avoid that llvmPackages_latest remains outdated. I guess it should be (mostly) fine but please ping me / this thread if you notice any issues.

@primeos primeos merged commit 3045b00 into NixOS:staging Jun 2, 2021
@Ericson2314
Copy link
Member

Thanks!

@Ericson2314
Copy link
Member

Ericson2314 commented Jun 3, 2021

else 11; # latest

Unfortunately we need to get that too. I wish there was a way to de-dup.

primeos added a commit to primeos/nixpkgs that referenced this pull request Jun 3, 2021
That way we only have to bump the latest LLVM version in one place and
avoid forgetting about the second occurrence like I did in NixOS#116646.
@primeos
Copy link
Member

primeos commented Jun 3, 2021

@Ericson2314 good catch, I wasn't even aware of that 2nd occurrence, thanks!
+1 for the deduplication, I've drafted an implementation in #125478 (it should be fine for Nixpkgs but could potentially cause issues with some overlays/patches - I guess it should be fine though and hopefully we'll soon have a llvmPackages_git for that (#120780)).

fabaff pushed a commit to fabaff/nixpkgs that referenced this pull request Jun 11, 2021
That way we only have to bump the latest LLVM version in one place and
avoid forgetting about the second occurrence like I did in NixOS#116646.
@knedlsepp
Copy link
Member

knedlsepp commented Jun 23, 2021

I just noticed that llvmPackages_latest doesn't point to llvmPackages_12 on the 21.05 release. Should this be backported?

@primeos
Copy link
Member

primeos commented Jun 23, 2021

IMO it's too late for that now (it can be a breaking change if you depend on llvmPackages_latest) but I suppose if someone would offer / be able to properly test it for Nixpkgs we could consider backporting it (someone would have to ACK it though and we lack LLVM maintainers).

rvem pushed a commit to serokell/nixpkgs that referenced this pull request Nov 8, 2022
Note: Tested in NixOS#116646.
(cherry picked from commit 2b95bf4)
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.

LLVM 12
5 participants