3p/nixpkgs: remove obsolete patches
This commit is contained in:
parent
23eda90726
commit
5a542241b9
3 changed files with 0 additions and 69 deletions
28
third_party/nixpkgs/patches/pr130664.patch
vendored
28
third_party/nixpkgs/patches/pr130664.patch
vendored
|
@ -1,28 +0,0 @@
|
||||||
From 03100da5a714a2b6c5210ceb6af092073ba4fce5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Herman Fries <baracoder@googlemail.com>
|
|
||||||
Date: Mon, 19 Jul 2021 23:03:36 +0200
|
|
||||||
Subject: [PATCH] nvidia_x11: 460.73.01 -> 470.57.02
|
|
||||||
|
|
||||||
---
|
|
||||||
pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++----
|
|
||||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
|
|
||||||
index 2cf9cddef4d6fd..d763c1576cd83f 100644
|
|
||||||
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
|
|
||||||
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
|
|
||||||
@@ -19,10 +19,10 @@ rec {
|
|
||||||
# Policy: use the highest stable version as the default (on our master).
|
|
||||||
stable = if stdenv.hostPlatform.system == "x86_64-linux"
|
|
||||||
then generic {
|
|
||||||
- version = "460.73.01";
|
|
||||||
- sha256_64bit = "120ymf59l6nipczszf82lrm2p4ihhqyv2pfwwfg9wy96vqcckc8i";
|
|
||||||
- settingsSha256 = "08jh7g34p9yxv5fh1cw0r2pjx65ryiv3w2lk1qg0gxn2r7xypkx0";
|
|
||||||
- persistencedSha256 = "040gx4wqp3hxcfb4aba4sl7b01ixr5slhzw0xldwcqlmhpwqphi5";
|
|
||||||
+ version = "470.57.02";
|
|
||||||
+ sha256_64bit = "sha256-VdeuEEgn+qeel1Mh/itg+d1C+/9lZCBTRDwOVv20xH0=";
|
|
||||||
+ settingsSha256 = "sha256-DJg5QbyuKJmPpLQVYgTLvucI1e9YgQOO16690VXIWvk=";
|
|
||||||
+ persistencedSha256 = "sha256-Cqv6oUFnsSi3S1sjplJKeq9bI2pqgBXPPb11HOJSlDo=";
|
|
||||||
}
|
|
||||||
else legacy_390;
|
|
||||||
|
|
39
third_party/nixpkgs/patches/pr131440.patch
vendored
39
third_party/nixpkgs/patches/pr131440.patch
vendored
|
@ -1,39 +0,0 @@
|
||||||
From 51d83077ffbca115265b04853e244179713c6518 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luke Granger-Brown <git@lukegb.com>
|
|
||||||
Date: Sun, 25 Jul 2021 08:53:56 +0100
|
|
||||||
Subject: [PATCH] google-chrome: avoid crash under some situations
|
|
||||||
|
|
||||||
If our Chrome derivation is Vulkan enabled, the Chrome GPU process
|
|
||||||
reliably crashes for me under M92 using the proprietary Nvidia drivers.
|
|
||||||
This is because the PCI-based GPU detection path fails, and we attempt
|
|
||||||
to use the Vulkan fallback instead, which then crashes(!!)
|
|
||||||
|
|
||||||
Including libpci allows us to use Angle's
|
|
||||||
src/gpu_info_util/SystemInfo_libpci.cpp path instead, which doesn't
|
|
||||||
crash, unlike src/gpu_info_util/SystemInfo_vulkan.cpp.
|
|
||||||
---
|
|
||||||
.../networking/browsers/google-chrome/default.nix | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
|
|
||||||
index ec03a77d2680df..61d304becfd8d7 100644
|
|
||||||
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
|
|
||||||
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
, systemd
|
|
||||||
|
|
||||||
# Loaded at runtime.
|
|
||||||
-, libexif
|
|
||||||
+, libexif, pciutils
|
|
||||||
|
|
||||||
# Additional dependencies according to other distros.
|
|
||||||
## Ubuntu
|
|
||||||
@@ -62,7 +62,7 @@ let
|
|
||||||
alsa-lib libXdamage libXtst libXrandr libxshmfence expat cups
|
|
||||||
dbus gdk-pixbuf gcc-unwrapped.lib
|
|
||||||
systemd
|
|
||||||
- libexif
|
|
||||||
+ libexif pciutils
|
|
||||||
liberation_ttf curl util-linux xdg-utils wget
|
|
||||||
flac harfbuzz icu libpng opusWithCustomModes snappy speechd
|
|
||||||
bzip2 libcap at-spi2-atk at-spi2-core
|
|
2
third_party/nixpkgs/patches/series
vendored
2
third_party/nixpkgs/patches/series
vendored
|
@ -1,4 +1,2 @@
|
||||||
patch-cherrypy.patch
|
patch-cherrypy.patch
|
||||||
pomerium-fix.patch
|
pomerium-fix.patch
|
||||||
pr131440.patch
|
|
||||||
pr130664.patch
|
|
||||||
|
|
Loading…
Reference in a new issue