[pull] master from NixOS:master #235
Merged
Conversation
This file contains 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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Moving just to $out can result in collisions. Best practise is to move the license files to the docs directory. See: https://discourse.nixos.org/t/collision-between-2-license-txt-from-2-different-packages/22071
For some reason, this build is incredibly flaky on `x86_64-darwin`, possibly because of the recent `staging-next` merge, failing with a test discovery timeout error both on Hydra and locally. The default discovery timeout is apparently 5 seconds, so let’s try giving it 5 times as long and see if that helps.
…rios As discussed in https://discourse.nixos.org/t/help-me-understand-two-load-bearing-assert-statements/51420 The assertion here tickles (via wine, which is always the biggest headache for our cross-compilation machinery) a `tryEval` that silently drops any outputs that `throw` while splicing. In this case, the `gcc.libgcc` output is `throw`ing due to checking if `libcCross==null`. The same effect is had by simply setting `libcCross` to `null` in that situation, and this way we don't have to lean on `tryEval`.
Signed-off-by: Paul Meyer <[email protected]>
Signed-off-by: Paul Meyer <[email protected]>
Language Server that works together with yamlls[1] to provide autocompletion for GitLab CI configurations. [1] https://github.com/redhat-developer/yaml-language-server
- add patch from merged upstream commit fixing pyixapi 0.2.3 compatibility: peering-manager/peering-manager@ee558ff
Backport AvaloniaUI/Avalonia#16835 to versions 11.1.0 through 11.2.0-beta1 Co-authored-by: Nick Cao <[email protected]>
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )