Skip to content

llvmPackages: Deduping#268812

Merged
Artturin merged 6 commits intoNixOS:masterfrom
Artturin:llvmdedup3
Nov 23, 2023
Merged

llvmPackages: Deduping#268812
Artturin merged 6 commits intoNixOS:masterfrom
Artturin:llvmdedup3

Conversation

@Artturin
Copy link
Member

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.05 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.

for hygiene

Run `deadnix . --edit`

`gccForLibs` is an argument used by multi.nix but it's an argument to
cc-wrapper, not to llvmPackages.

`@args` in `llvm/default.nix` was accidentally added in 4badff4

There are no uses of `@` therefore these changes are safe.
@Artturin Artturin changed the title llvmPackages: dedupe llvm_meta llvmPackages: Deduping Nov 21, 2023
@Artturin Artturin added 6.topic: hygiene Cleaning up and removing cruft 8.has: clean-up This PR removes packages or removes other cruft and removed 6.topic: hygiene Cleaning up and removing cruft labels Nov 21, 2023
@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. labels Nov 21, 2023
Removing this caused

`error: anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/ofborg-evaluator-2/pkgs/development/compilers/llvm/11/compiler-rt/default.nix:1:1 called with unexpected argument 'libcxxabi'`

https://github.com/search?q=repo%3ANixOS%2Fnixpkgs%20%2Fcompiler-rt.override%2F&type=code

The argument became unused in NixOS@56fcbcd#diff-b1bb77941db4393b7d2cf7a370cee294318418f2507b7a78e22353d1afbb6d21L18

but it was not removed from `buildInputs` in later `llvmPackages` because `llvmPackages_12` had
been created before this change was done.

Removing `libcxxabi` from `buildInputs` may have to be applied to the
other `llvmPackages` too.
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Cool! I like incremental deduplication

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Nov 22, 2023
@Artturin Artturin merged commit 1ea40b2 into NixOS:master Nov 23, 2023
@Artturin Artturin deleted the llvmdedup3 branch November 23, 2023 19:00
@wegank wegank mentioned this pull request Dec 6, 2023
12 tasks
@github-actions
Copy link
Contributor

github-actions bot commented Dec 8, 2023

Successfully created backport PR for release-23.11:

@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
@github-actions
Copy link
Contributor

Backport failed for release-23.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-23.11
git worktree add -d .worktree/backport-268812-to-release-23.11 origin/release-23.11
cd .worktree/backport-268812-to-release-23.11
git switch --create backport-268812-to-release-23.11
git cherry-pick -x 2902f99c5734c0eebf265b4009dfccb5703aa9e1 5ac86a99e7e1c3374c8a5bd28599026e5450ae06 e6751897e0209add93b7ee9725e7479dea25c873 c1e1a583a02f1a7ee34b822a09ee2a5bae184396 b59fd202d70faa17d0150bae3dd81d3461545a10 f6749cddad78531de21e0779c0251f66976e8098

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 8.has: clean-up This PR removes packages or removes other cruft 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants