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: llvm9->llvm10 #84096

Merged
merged 2 commits into from Apr 13, 2020
Merged

Conversation

DieGoldeneEnte
Copy link
Contributor

Motivation for this change

Since llvm10 is now the newest release.
This also sets llvm-polly and clang-polly to normal llvm/clang, since polly is now enabled by default.

Maybe we want to remove the -polly variants at some point in the future?

The only affected packages are:

  • google-cloud-cpp
  • tiledb
  • python37Packages.tiledb/python38Packages.tiledb (doesn't build, see below)
Things done

The tiledb python module has tests failing, but this is unrelated to llvm (see #84091 for more information).

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

llvm-polly = llvmPackages_latest.llvm-polly;
clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };

# llvm and clang are build with polly by default
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# llvm and clang are build with polly by default
# llvm and clang are built with polly by default

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After looking how this is usually done, I changed the lines to use throw. This prevents llvm-polly/clang-polly, but also provides an error message to the user. I think this is the best solution.

Thanks for finding the typo :)

@ggreif
Copy link
Contributor

ggreif commented Apr 5, 2020

I guess this should be git rebase --onto staging, since it probably causes a lot of rebuilds?

@DieGoldeneEnte
Copy link
Contributor Author

This causes almost no rebuilds, because llvmPackages_latest is almost never used in packages.

since llvm10 is now the newest release
now throws an error if llvm-polly or clang-polly is build, since polly
is enabled by default.
@DieGoldeneEnte
Copy link
Contributor Author

@lovek323 @7c6f434c @dtzWill could you take a look?

clang-polly = llvmPackages_latest.clang.override { cc = llvmPackages_latest.clang-polly-unwrapped; };

llvm-polly = throw "clang is now built with polly-plugin by default";
clang-polly = throw "clang is now built with polly-plugin by default";
Copy link
Member

Choose a reason for hiding this comment

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

Put this in pkgs/top-level/aliases.nix with a timestamp.

@DieGoldeneEnte DieGoldeneEnte mentioned this pull request Apr 13, 2020
10 tasks
@Mic92 Mic92 merged commit a566113 into NixOS:master Apr 13, 2020
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.

llvmPackages and llvmPackages_latest are outdated
3 participants