Skip to content

Comments

llvmPackages_{12,13,14,15,16,17,18,git}: use common llvm#303521

Merged
wegank merged 1 commit intoNixOS:stagingfrom
ExpidusOS:feat/llvm-git-commonify-llvm
Apr 14, 2024
Merged

llvmPackages_{12,13,14,15,16,17,18,git}: use common llvm#303521
wegank merged 1 commit intoNixOS:stagingfrom
ExpidusOS:feat/llvm-git-commonify-llvm

Conversation

@RossComputerGuy
Copy link
Member

@RossComputerGuy RossComputerGuy commented Apr 12, 2024

Description of changes

Partial split from #299807

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

numinit
numinit reviewed Apr 12, 2024
View reviewed changes
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch 2 times, most recently from c19c7e8 to 5bd861e Compare April 12, 2024 23:37
@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 13, 2024

Just need to fix the Darwin issue, idk why it happens.

@RossComputerGuy RossComputerGuy changed the base branch from master to staging April 13, 2024 03:38
@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: erlang General-purpose, concurrent, functional high-level programming language 6.topic: php PHP is a general-purpose scripting language geared towards web development. labels Apr 13, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch from 5bd861e to 74a69f5 Compare April 13, 2024 03:38
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: GNOME GNOME desktop environment and its underlying platform 8.has: documentation This PR adds or changes documentation 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` labels Apr 13, 2024
@ofborg ofborg bot added the 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. label Apr 13, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch from 74a69f5 to 5bbb437 Compare April 13, 2024 04:37
@ofborg ofborg bot removed the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Apr 13, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch from 5bbb437 to d1990ae Compare April 13, 2024 05:11
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Apr 13, 2024
@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch 2 times, most recently from afe396c to 81889eb Compare April 13, 2024 06:11
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 13, 2024
wegank
wegank reviewed Apr 13, 2024
View reviewed changes
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 13, 2024
@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 14, 2024 •
edited
Loading

No more merge conflict

Edit: I was in the wrong branch

@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch from 81889eb to 05a0116 Compare April 14, 2024 02:00
@wegank
Copy link
Member

wegank commented Apr 14, 2024

Oh, this PR also targets staging, but I think master should be OK?

@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 14, 2024

@wegank No, I tried master but I was getting those spooky binutils.override missing errors in pkgs/stdenv/adapters.nix. I was suggested to switch to staging and it fixed my issues.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 14, 2024
@wegank
Copy link
Member

wegank commented Apr 14, 2024

And another merge conflict here.

@RossComputerGuy RossComputerGuy force-pushed the feat/llvm-git-commonify-llvm branch from 05a0116 to 2941e51 Compare April 14, 2024 02:57
@RossComputerGuy
Copy link
Member Author

RossComputerGuy commented Apr 14, 2024

Fixed the merge conflict

@wegank wegank merged commit ef8ac4b into NixOS:staging Apr 14, 2024
@RossComputerGuy RossComputerGuy deleted the feat/llvm-git-commonify-llvm branch April 15, 2024 01:19
@misuzu misuzu mentioned this pull request May 7, 2024
Closed
@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

Reviewers

@numinit numinit numinit left review comments

@wegank wegank wegank left review comments

@piegamesde piegamesde Awaiting requested review from piegamesde

@jtojnar jtojnar Awaiting requested review from jtojnar

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

@aanderse aanderse Awaiting requested review from aanderse

@drupol drupol Awaiting requested review from drupol

@globin globin Awaiting requested review from globin

@Ma27 Ma27 Awaiting requested review from Ma27

@talyz talyz Awaiting requested review from talyz

@jbedo jbedo Awaiting requested review from jbedo

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@alyssais alyssais Awaiting requested review from alyssais

@lovek323 lovek323 Awaiting requested review from lovek323

@dtzWill dtzWill Awaiting requested review from dtzWill

@rrbutani rrbutani Awaiting requested review from rrbutani

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@RossComputerGuy @wegank @numinit @rrbutani