[pull] master from NixOS:master #52
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}
When listening on unix sockets, it doesn't make sense to specify a port for nginx's listen directive. Since nginx defaults to port 80 when the port isn't specified (but the address is), we can change the default for the option to null as well without changing any behaviour.
Chromium has blocklists that workaround various GPU driver bugs, either
by forcing software rendering [1] or by disabling use of certain GPU
features [2].
These blocklists can only be applied successfully if the GPU vendor and
device is detected correctly. One of the methods used for GPU detection
is to load libpci.so via dlopen() at runtime to read the PCI vendor and
device ID.
The current derivation already contains a sed command to rewrite the
dlopen() to the absolute path of libpci.so in the Nix store, namely
sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
gpu/config/gpu_info_collector_linux.cc
However, in Chromium 59 (6 years ago), this code was moved into the
ANGLE library used by Chromium [3]. This sed command no longer works.
There is similar code in ANGLE now [4] that must be similarly patched to
ensure the GPU vendor and device is always detected correctly.
Without libpci some GPUs are not detected correctly. For example, in a
VMWare virtual machine opening chrome://gpu in the browser shows:
VENDOR= 0x0000 [Google Inc. (VMware, Inc.)], DEVICE=0x0000 [ANGLE
(VMware Inc., SVGA3D; build: RELEASE; LLVM;, OpenGL 4.1 (Core Profile)
Mesa 23.0.3)], DRIVER_VENDOR=Mesa, DRIVER_VERSION=23.0.3 *ACTIVE*
Note the VENDOR=0x0000 and DEVICE=0x0000. Adding libpci.so to the
library path fixes this:
VENDOR= 0x15ad [Google Inc. (VMware, Inc.)], DEVICE=0x0405 [ANGLE
(VMware Inc., SVGA3D; build: RELEASE; LLVM;, OpenGL 4.1 (Core Profile)
Mesa 23.0.3)], DRIVER_VENDOR=Mesa, DRIVER_VERSION=23.0.3 *ACTIVE*
Note the VENDOR=0x15ad and DEVICE=0x0405. Also now the blocklist entries
are applied correctly, fixing some graphical issues.
Fix this by adding pciutils to the rpath set with patchelf. This avoids
having to patch lines in the source code that might get moved around.
[1]: https://chromium.googlesource.com/chromium/src/+/e52f33f30b91b4ddfad649acddc39ab570473b86/gpu/config/software_rendering_list.json
[2]: https://chromium.googlesource.com/chromium/src/+/e52f33f30b91b4ddfad649acddc39ab570473b86/gpu/config/gpu_driver_bug_list.json
[3]: chromium/chromium@873b27d
[4]: https://github.com/google/angle/blob/05f45adc147393562b518ca1f82a3ccba7ee40f7/src/gpu_info_util/SystemInfo_libpci.cpp#L41
python311Packages.aioairzone-cloud: 0.2.4 -> 0.2.7
codebraid: 0.5.0 -> 0.11.0
cargo-codspeed: 2.2.0 -> 2.3.0
luaPackages/vimPlugins.ferris-nvim: init at 2.0.0
nixos/nginx: Allow empty port for listen directive (for unix socket)
trezor-suite: 23.4.2 -> 23.10.1
home-assistant: 2023.10.3 -> 2023.10.4
"or later" is mentioned in a few files, but not most of them, and there's no project-wide explanation of the license.
…s.trezor python311Packages.trezor: 0.13.7 -> 0.13.8
….0.2.2 kodi.packages.youtube: 7.0.1 -> 7.0.2.2
…dd-pks-maintainer kodi.packages.netflix: add pks as maintainer
…susr-dependency systemd 254: ZFS /usr fix with systemd-stage-1
toml-f: 0.3.1 -> 0.4.1
fypp: 3.1 -> 3.2
pyscf: 2.3.0 -> 2.4.0
python311.pkgs.pyliblo: fix build
jitterentropy-rngd: init at 1.2.8
For the image that's actually a store image only. Helps with visibility. The name "nixos-disk-image" has no special significance, by grepping nixpkgs.
golangci-lint: 1.54.2 -> 1.55.0
ratelimiter has been removed, since it is unmaintained and broken
Signed-off-by: Christina Sørensen <[email protected]>
This adds two symlinks to rclone: rclonefs and mount.rclone fixes #258478
…mage nixos/qemu-vm: Rename nixos-disk-image -> nix-store-image
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 : )