Staging next #75452
Merged
Staging next #75452
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
The changes in #67548 broke cross-compilation not for valgrind, but for software relying on valgrind at build-time.
If an empty string is passed to `-idirafter`, it breaks gcc. This commit makes the stdenv less fragile by expanding out the shell glob and ensuring no empty arguments get passed.
* Removes an unused binding that prevents compilation with newer pango * Adds a patch to fix a memory leak
a patch to cmake to correctly locate harfbuzz: https://gitlab.kitware.com/cmake/cmake/issues/19531, needed for more recent pango.
kdeFrameworks: 5.62 -> 5.64; kdeApplications: 19.08.2 -> 19.08.3
meson: 0.51.2 → 0.52.1
stdenv: Fix gcc -idirafter shell glob in cc-wrapper
- add myself as maintainer - license is mit
pango, pygtk: fixing up newer pango and pygtk
libffi: 3.2.1 -> 3.3
ofborg
bot
added
6.topic: golang
6.topic: nixos
6.topic: python
6.topic: qt/kde
6.topic: ruby
6.topic: vim
8.has: changelog
8.has: documentation
10.rebuild-darwin-stdenv
10.rebuild-linux-stdenv
8.has: clean-up
10.rebuild-darwin: 501+
10.rebuild-darwin: 5001+
10.rebuild-linux: 501+
10.rebuild-linux: 5001+
labels
Using a function in an if condition when set -e is set doesn't seem to break out or return false which means the workaround from 41ca861 never gets triggered.
|
In case somebody else is looking into it: I've tracked the ecl build failure to #74855 (comment). |
jonringer
reviewed
Dec 14, 2019
| @@ -76,8 +76,8 @@ stdenv.mkDerivation { | |||
| # later. | |||
| buildPhase = stdenv.lib.optionalString true '' | |||
There was a problem hiding this comment.
why? the predicate is literally true, just have the string
There was a problem hiding this comment.
that was accidental, I initially wanted to make the workaround conditional for clang 7 but that's really hard to check while the stdenv is still bootstrapping.
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.
Motivation for this change
https://hydra.nixos.org/jobset/nixpkgs/staging-next
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @