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.

Sign up for GitHub

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

Jump to bottom

[24.05] dropbox: add libGL to the FHS environment #348710

Closed
wants to merge 5,721 commits into from
Closed

[24.05] dropbox: add libGL to the FHS environment #348710

wants to merge 5,721 commits into from

Conversation

goffrie
Copy link
Contributor

@goffrie goffrie commented Oct 15, 2024 •
edited
Loading

(third accidental mass ping in a day. feels bad)

r-ryantm and others added 30 commits October 3, 2024 16:09
@r-ryantm @NickCao
logiops: 0.3.4 -> 0.3.5
15a8ae9 
(cherry picked from commit cdce415)
@JohnRTitor @github-actions
google-chrome: 129.0.6668.58 -> 129.0.6668.89
acb0e98 
(cherry picked from commit 1f52ea5)
@JohnRTitor @github-actions
google-chrome: replace bundled libvulkan.so.1 with vulkan-loader's
9c6ca21 
When Chrome run by `google-chrome-stable --use-vulkan --enable-features=Vulkan`
without this, it fails to create vk instance giving the below log:

[216457:216457:1003/211719.770352:ERROR:vulkan_instance.cc(112)] Failed to load 'libvulkan.so.1': libvulkan.so.1: cannot open shared object file: No such file or directory
[216457:216457:1003/211719.770434:ERROR:gpu_init.cc(1209)] Failed to create and initialize Vulkan implementation.

Closes NixOS#346197

Signed-off-by: John Titor <[email protected]>
(cherry picked from commit cd0a0da)
@JohnRTitor @github-actions
google-chrome: add rpath for libGLESv2.so as well
a136b63 
This is needed to make sure that ANGLE's libGLESv2.so can find libGL and libvulkan
Like https://github.com/NixOS/nixpkgs/blob/27e30d177e57d912d614c88c622dcfdb2e6e6515/pkgs/development/tools/electron/binary/generic.nix#L136-L139
and https://github.com/NixOS/nixpkgs/blob/27e30d177e57d912d614c88c622dcfdb2e6e6515/pkgs/applications/networking/browsers/chromium/common.nix#L562-564

Signed-off-by: John Titor <[email protected]>
(cherry picked from commit 2b58c0b)
@emilylange @github-actions
chromium,chromedriver: 129.0.6668.70 -> 129.0.6668.89
bc5dc93 
https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop.html

This update includes 4 security fixes.

CVEs:
CVE-2024-7025 CVE-2024-9369 CVE-2024-9370

(cherry picked from commit 2d83694)
@mweinelt
[Backport release-24.05] Firefox: 130.0.1 -> 131.0; 128.2.0esr -> 128…
1e63766 
….3.0esr; 115.15.0esr -> 115.16.0esr (NixOS#346022)
@JohnRTitor
[Backport release-24.05] google-chrome: 129.0.6668.58 -> 129.0.6668.89 (
619160c 
NixOS#346244)
@JohnRTitor
[Backport release-24.05] firefly-iii: 6.1.20 -> 6.1.21 (NixOS#345244)
203f298
@JohnRTitor
[Backport release-24.05] git-workspace: 1.5.0 -> 1.6.0 (NixOS#345077)
b66a213
@emilylange
[Backport release-24.05] chromium,chromedriver: 129.0.6668.70 -> 129.…
6d324db 
…0.6668.89 (NixOS#346246)
@r-ryantm @github-actions
brave: 1.70.119 -> 1.70.123
d4eb792 
(cherry picked from commit 07196b8)
@natsukium
[Backport release-24.05] python313: 3.13.0rc2 -> 3.13.0rc3 (NixOS#346191
6ec4e82 
)
@r-ryantm @MarcelCoding
valkey: 7.2.5 -> 7.2.6
056fefa 
(cherry picked from commit f76f48b)
@MarcelCoding
valkey: 7.2.6 -> 7.2.7
b973ca7 
Fixes CVE-2024-31449
Fixes CVE-2024-31227
Fixes CVE-2024-31228

(cherry picked from commit 85ab36b)
@fabianhjr @K900
linux/hardened: fix update script
ea76ee2 
Due to releases now including a v (and before didn't) hardened hasn't
been updated since May 2024 (4 months ago)

(cherry picked from commit 60623de)
@fabianhjr @K900
linux/hardened/patches/5.10: 5.10.218-hardened1 -> v5.10.226-hardened1
0112f1e 
(cherry picked from commit ad3ec7b)
@fabianhjr @K900
linux/hardened/patches/5.15: 5.15.160-hardened1 -> v5.15.167-hardened1
ef410be 
(cherry picked from commit fec646a)
@fabianhjr @K900
linux/hardened/patches/5.4: 5.4.277-hardened1 -> v5.4.284-hardened1
db682fa 
(cherry picked from commit 6178bdf)
@fabianhjr @K900
linux/hardened/patches/6.1: 6.1.92-hardened1 -> v6.1.110-hardened1
3cec82b 
(cherry picked from commit 2794012)
@fabianhjr @K900
linux/hardened/patches/6.10: init at v6.10.10-hardened1
5295e71 
(cherry picked from commit 1f403d3)
@fabianhjr @K900
linux/hardened/patches/6.6: 6.6.32-hardened1 -> v6.6.51-hardened1
23f6e3b 
(cherry picked from commit e930509)
@fabianhjr @K900
linux/hardened/patches/6.8: remove
684a7e4 
(cherry picked from commit 57a558e)
@fabianhjr @K900
linux/hardened/patches/6.9: remove
3413479 
(cherry picked from commit 904a34e)
@Ma27 @K900
linux_5_4_hardened: mark as broken
ce1558d 
Smoketest fails with

    machine # [    3.785769] systemd[1]: dev-hugepages.mount: Failed to spawn executor: Argument list too long
    machine # [    3.788689] systemd[1]: dev-hugepages.mount: Failed to spawn 'mount' task: Argument list too long
    machine # [    3.790100] systemd[1]: dev-hugepages.mount: Failed with result 'resources'.
    machine # [    3.791572] systemd[1]: Failed to mount Huge Pages File System.

(cherry picked from commit 62c09a3)
@K900
linux_6_11: 6.11.1 -> 6.11.2
a672b03 
(cherry picked from commit d7fc6b3)
@K900
linux_6_10: 6.10.12 -> 6.10.13
38093b5 
(cherry picked from commit a3a3844)
@K900
linux_6_6: 6.6.53 -> 6.6.54
9ee53de 
(cherry picked from commit 3111488)
@K900
linux-rt_5_15: 5.15.163-rt78 -> 5.15.167-rt79
e4f0067 
(cherry picked from commit 0cae3b6)
@K900
linux/hardened/patches/6.1: v6.1.110-hardened1 -> v6.1.112-hardened1
b06773c 
(cherry picked from commit 748148a)
@K900
linux/hardened/patches/6.10: v6.10.10-hardened1 -> v6.10.12-hardened1
c458710 
(cherry picked from commit 9864180)
@github-actions github-actions bot added 6.topic: rust 6.topic: policy discussion 6.topic: golang 6.topic: ruby 6.topic: vim 6.topic: ocaml 6.topic: fetch 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: pantheon The Pantheon desktop environment 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: lua 6.topic: testing Tooling for automated testing of packages and modules 6.topic: systemd 6.topic: LXQt The Lightweight Qt Desktop Environment 6.topic: vscode 6.topic: flakes The experimental Nix feature 6.topic: lib The Nixpkgs function library 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: julia 6.topic: php 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET labels Oct 15, 2024
@nix-owners
Copy link

nix-owners bot commented Oct 15, 2024

The PR's base branch is set to master, but 5720 commits from the release-24.05 branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the release-24.05 branch, change the base branch to release-24.05
  • If the changes should go to the master branch, rebase your PR onto the merge base with the master branch: 
    # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/release-24.05 HEAD)
git rebase --onto 0b49ef697b3e5cff1e6f18033de2b422e2fe1f43 06b17a1de9451d5a2ad300d9efd807829fe2a27f
git push --force-with-lease

1 similar comment
@nix-owners
Copy link

nix-owners bot commented Oct 15, 2024

The PR's base branch is set to master, but 5720 commits from the release-24.05 branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the release-24.05 branch, change the base branch to release-24.05
  • If the changes should go to the master branch, rebase your PR onto the merge base with the master branch: 
    # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/release-24.05 HEAD)
git rebase --onto 0b49ef697b3e5cff1e6f18033de2b422e2fe1f43 06b17a1de9451d5a2ad300d9efd807829fe2a27f
git push --force-with-lease

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 15, 2024
@infinisil
Copy link
Member

Mass pings for the wrong base branch aren't a thing anymore, the bot's message can be followed :D

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: fetch 6.topic: flakes The experimental Nix feature 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang 6.topic: haskell 6.topic: julia 6.topic: jupyter Interactive computing tooling: kernels, notebook, jupyterlab 6.topic: k3s Kubernates distribution (https://k3s.io/) 6.topic: kernel The Linux kernel 6.topic: lib The Nixpkgs function library 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: lua 6.topic: LXQt The Lightweight Qt Desktop Environment 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 6.topic: ocaml 6.topic: pantheon The Pantheon desktop environment 6.topic: php 6.topic: policy discussion 6.topic: printing 6.topic: python 6.topic: qt/kde 6.topic: ruby 6.topic: rust 6.topic: stdenv Standard environment 6.topic: steam Steam game store/launcher (store.steampowered.com) 6.topic: systemd 6.topic: testing Tooling for automated testing of packages and modules 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 6.topic: vscode 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/`
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.