Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

staging-next 2022-05-18 - last for 22.05 #173605

Closed
wants to merge 124 commits into from
Closed

staging-next 2022-05-18 - last for 22.05 #173605

wants to merge 124 commits into from

Conversation

vcunat
Copy link
Member

@vcunat vcunat commented May 19, 2022

This is meant to be the last one for 22.05. Merge was planned on May 22, but I'm quite confident that we won't catch that.

trofi and others added 30 commits April 29, 2022 08:33
Added trivial update script.
Dropped upstreamed rawmemchr patch.

changelog: https://valgrind.org/docs/manual/dist.news.html
Take a "nixSupport" argument that is an attrset of lists to append
to "$out/nix-support/${name}" where name is the name of the
attribute. This attrset is available from the passthru of the
wrapped compiler.

This is an alternative to imperatively issuing flags with
extraBuildCommands and makes it possible to append or filter
flags with an override.
postgresql: alias to postgresql_14
Added trivial updater script.
Refreshed nix-specific patch with path to debug symbols.
Dropped upstreamed patches for gcc-12 support and musl support.

Changes: https://www.sourceware.org/gdb/download/ANNOUNCEMENT
Take advantage of the bump and drop the if/null construct for optionalString.
Otherwise this error is shown when cross-compiling:

configure: WARNING:
  You will not be able to create source packages with 'make dist'
  because gtk-doc >= 1.0 is not found.
checking for gtkdoc-check... gtkdoc-check.test
checking for gtkdoc-check... /nix/store/c54j3jcj3cijg9kf54lcr94lsc09xd4r-gtk-doc-1.33.2/bin/gtkdoc-check
checking for gtkdoc-rebase... /nix/store/c54j3jcj3cijg9kf54lcr94lsc09xd4r-gtk-doc-1.33.2/bin/gtkdoc-rebase
checking for gtkdoc-mkpdf... /nix/store/c54j3jcj3cijg9kf54lcr94lsc09xd4r-gtk-doc-1.33.2/bin/gtkdoc-mkpdf
checking whether to build gtk-doc documentation... yes
configure: error:
  You must have gtk-doc >= 1.0 installed to build documentation for
  libqrtr-glib. Please install gtk-doc or disable building the
  documentation by adding '--disable-gtk-doc' to './configure'.

Also enable strictDeps to prevent future issues.
As far as I can tell, this has never actually done anything, as
LDEMULATION is not exported. I tried exporting it and builds broke,
and as it doesn't seem to have caused any problems as a noop all these
years it didn't seem worth investigating further.
This is expected e.g. by the GHC cross-compilation code
libtool upstream seems quite slow to merge...
By specifying pkgs.libffi here instead of letting callPackage handle
it, we confuse the splicing logic and put the host libffi into
NIX_LDFLAGS_FOR_TARGET. This previously hasn't been a problem, as we
also pass an explicit configure flag pointing to the target libffi,
and so the only side-effect is a senseless -rpath flag.

ld.lld (rightly) does not recognize the -rpath flag when targeting
Windows, however, so this causes build failures.
The derivation is complex enough to warrant moving out of
all-packages.nix
Because both versions might end up in a derivation's build inputs, it
might be useful to be able to explicitly select which function to use.
...and pass it makeBinaryWrapper in all-packages.nix
jtojnar and others added 2 commits May 21, 2022 17:52
Conflicts:
- pkgs/applications/networking/browsers/firefox/common.nix between 318fae8 and f6c5761.
trofi and others added 8 commits May 21, 2022 21:18
A few rare targets don't have clean format strings on 32-bit systems:
#171216 (comment)

    /build/gdb-12.1/_build/sim/../../sim/cris/sim-if.c:575:28:
      error: format '%lx' expects argument of type 'long unsigned int',
        but argument 4 has type 'bfd_size_type' {aka 'long long unsigned int'} [-Werror=format=]

We pull in patch pending upstream inclusion.
The issue with dlltool was fixed in 4b0f59a.
This reverts commit 92f4c6e.
On aarch64-darwin this completely broke lua instead of improving it;
let's revert at least until that's resolved.
#172749 (comment)
@vcunat
Copy link
Member Author

vcunat commented May 22, 2022

@dasJ: the regression amount is probably low enough now, but aarch64-linux is still missing very many builds (something like 35k now). Today's the originally planned moment to merge.

Reverts 8b79ef2 on aarch64-darwin, no-op on other platforms.
@Mindavi Mindavi mentioned this pull request May 22, 2022
13 tasks
@vcunat
Copy link
Member Author

vcunat commented May 23, 2022

Not a blocker IMO, but let me post it:

@vcunat
Copy link
Member Author

vcunat commented May 23, 2022

Merged really, just bad timing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.