Skip to content

staging-next 2024-03-24#298548

Merged
vcunat merged 313 commits intomasterfrom
staging-next
Apr 1, 2024
Merged

staging-next 2024-03-24#298548
vcunat merged 313 commits intomasterfrom
staging-next

Conversation

risicle and others added 30 commits March 15, 2024 00:30
{edencommon,fb303,fbthrift,fizz,folly,mvfst,wangle,watchman}: 2024.01.22.00 -> 2024.03.11.00
This is required for corrscope, also see #271863 (comment)
When native-compiling, gcc will install libraries into:

  /nix/store/...-$targetConfig-gcc-$version-lib/lib

When cross-compiling, gcc will install libraries into:

  /nix/store/...-$targetConfig-gcc-$version-lib/$targetConfig

When cross-compiling, we intended to create a link from $lib/lib to
$lib/$targetConfig, so that downstream users can always safely
assume that "${lib.getLib stdenv.cc.cc}/lib" is where the gcc
libraries are, regardless of whether `stdenv.cc.cc` is a cross
compiler or a native compiler.

Unfortunately, there were two problems with how we were trying to
create these links:

1. The link would be created only when `enableLibGccOutput==true`

2. The link was being created from the incorrect source
   `$lib/lib/lib` instead of `$lib/lib`.

Both of these mistakes are my fault.  This commit corrects them by
creating the link using `ln -Ts` (which is more predictable) and by
creating the link from `gcc/common/builder.nix` rather than from
`gcc/common/libgcc.nix`.
Pulseaudio 17 crashes in certain situations with alsa_ucm devices, see https://gitlab.archlinux.org/archlinux/packaging/packages/pulseaudio/-/issues/4.
This happens for example on the PinePhone, leaving it with no audio.
Applying the two patches as done on Arch Linux solves this for me.
In order to have the 'reset' LUA_PATH (aka `;;`) work, and for purity
reasons(removing /usr paths) we(I) decided to patch the lua interpreters default LUA_PATH.
Turns out the interpreters have different defaults and the patch was too
coarse.
There is smarter patching that can be done via LUA_ROOT.

Also luajit doesn't need patching at all since LUA_ROOT is set via the
build system.
now that the lua interpreters include working directories with `./?.lua`
in LUA_PATH, the current test includes every derivation which quickly
becomes unreadable and unpractical.
The test is adapted to add a folder only if it can find lua files in the
subfolder.
explain why they are patched in nixpkgs.
gcc: link $lib/lib -> $lib/$targetConfig correctly and consistently
ffmpeg: enable ffplay in small variant
pulseaudio: fix crash with alsa_ucm devices
luajit: adjust defaults LUA_(C)PATH
For the 11.0 SDK, base the stubs on the SDK for now.
They have been failing on aarch64-linux and it's hard to find out why,
but luckily they're only used for testing in home-assistant's dependency
closure.
@vcunat vcunat requested a review from mweinelt as a code owner April 1, 2024 11:15
github-actions bot and others added 6 commits April 1, 2024 12:01
even if luajitPackages.http is broken.
I'm confident that most people don't use it,
so at least those should get immediately unblocked.
(The main derivation only uses it for this test.)
This reverts commit f8b4e28.

We're instead disabling the failing test on the django derivation.
With the revert of xz 5.4.6 (down from 5.6.0) this test started failing
on aarch64-linux on Python 3.12.
With the revert of xz 5.4.6 (down from 5.6.0) this test started failing
on aarch64-linux on Python 3.12.
vcunat and others added 2 commits April 1, 2024 22:15
[staging-next] Fix python312Packages.django_{4,5} on aarch64-linux
@vcunat vcunat merged commit 5476cea into master Apr 1, 2024
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/copying-custom-edid/31593/26

@marsam marsam mentioned this pull request Apr 3, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: agda A dependently typed programming language / interactive theorem prover 6.topic: emacs Text editor 6.topic: fetch Fetchers (e.g. fetchgit, fetchsvn, ...) 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: policy discussion Discuss policies to work in and around Nixpkgs 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: stdenv Standard environment 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 6.topic: vim Advanced text editor 8.has: changelog This PR adds or changes release notes 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.