public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-07-17 00:03:22 +00:00 committed by GitHub
commit 364d1f2758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@ -1,8 +1,8 @@
{ {
"stable": { "stable": {
"version": "91.0.4472.114", "version": "91.0.4472.164",
"sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
"sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
"deps": { "deps": {
"gn": { "gn": {
"version": "2021-04-06", "version": "2021-04-06",

1
pkgs/development/libraries/mesa/default.nix
View File

@ -214,6 +214,7 @@ self = stdenv.mkDerivation {
passthru = { passthru = {
inherit libdrm; inherit libdrm;
inherit (libglvnd) driverLink; inherit (libglvnd) driverLink;
inherit llvmPackages;
tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { tests.devDoesNotDependOnLLVM = stdenv.mkDerivation {
name = "mesa-dev-does-not-depend-on-llvm"; name = "mesa-dev-does-not-depend-on-llvm";

2
pkgs/games/steam/fhsenv.nix
View File

@ -150,6 +150,7 @@ in buildFHSUserEnv rec {
# dependencies for mesa drivers, needed inside pressure-vessel # dependencies for mesa drivers, needed inside pressure-vessel
mesa.drivers mesa.drivers
mesa.llvmPackages.llvm.lib
vulkan-loader vulkan-loader
expat expat
wayland wayland
@ -157,7 +158,6 @@ in buildFHSUserEnv rec {
xorg.libXdamage xorg.libXdamage
xorg.libxshmfence xorg.libxshmfence
xorg.libXxf86vm xorg.libXxf86vm
llvm_11.lib
libelf libelf
] ++ (if (!nativeOnly) then [ ] ++ (if (!nativeOnly) then [
(steamPackages.steam-runtime-wrapped.override { (steamPackages.steam-runtime-wrapped.override {