Merged
Conversation
Doing the same thing as was done in the initial adding of `monorepoSrc` to `llvmPackages_15` d231d18
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.
13 tasks
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.
Ericson2314
approved these changes
Nov 22, 2023
Member
Ericson2314
left a comment
There was a problem hiding this comment.
Cool! I like incremental deduplication
1 task
Contributor
|
Successfully created backport PR for |
Contributor
|
Backport failed for 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)