nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-25 17:55:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-12-11 00:13:44 +00:00
committed by GitHub
parent c71c440387 c2786e7084
commit c087a51134
6 changed files with 91 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch Normal file
View File

@@ -0,0 +1,43 @@
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index de1cd6e..bb5700b 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -616,24 +616,6 @@ config("compiler") {
}
}
- # TODO(crbug.com/1488374): This causes binary size growth and potentially
- # other problems.
- # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
- if (default_toolchain != "//build/toolchain/cros:target" &&
- !llvm_android_mainline) {
- cflags += [
- "-mllvm",
- "-split-threshold-for-reg-with-hint=0",
- ]
- if (use_thin_lto && is_a_target_toolchain) {
- if (is_win) {
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
- } else {
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
- }
- }
- }
-
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
@@ -800,13 +782,6 @@ config("compiler") {
if (is_apple) {
ldflags += [ "-Wcrl,object_path_lto" ]
}
- if (!is_chromeos) {
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
- # toolchain has this flag.
- # We only use one version of LLVM within a build so there's no need to
- # upgrade debug info, which can be expensive since it runs the verifier.
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
- }
}
# TODO(https://crbug.com/1211155): investigate why this isn't effective on

9
pkgs/applications/networking/browsers/chromium/common.nix
View File

@@ -195,13 +195,8 @@ let
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
./patches/angle-wayland-include-protocol.patch
# We need to revert this patch to build M114+ with LLVM 16:
(githubPatch {
# Reland [clang] Disable autoupgrading debug info in ThinLTO builds
commit = "54969766fd2029c506befc46e9ce14d67c7ed02a";
sha256 = "sha256-Vryjg8kyn3cxWg3PmSwYRG6zrHOqYWBMSdEMGiaPg6M=";
revert = true;
})
# We need to revert this patch to build M120+ with LLVM 16:
./chromium-120-llvm-16.patch
];
postPatch = ''

36
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@@ -27,39 +27,39 @@
};
stable = {
chromedriver = {
sha256_darwin = "08jlxh2xngd8dn1r88d6ryl1mjmhba36ma7yla93yds02bsi845i";
sha256_darwin = "020qzjy8aq7y4gxpn2vjw71k7p3bvqhsvqkja99n2wndw8w0l6sf";
sha256_darwin_aarch64 =
"137nzad2h2hqpzwqk7jimb23sw2rwz9j2iz7c5cz7v2wzaqw3qsk";
sha256_linux = "1xkzqc7cja56b4rdbqv1b2996k9jqicvykzcsnic04m9il18p3ns";
version = "119.0.6045.105";
"1byi0k7kxg6x23j8161ndrm73j9v4wrpk3ydygnvk48biw54nl2i";
sha256_linux = "1dvakqyn5s75k5hcjrydqgp003m5l7abvyd9b2whjbasa1my5ijz";
version = "120.0.6099.71";
};
deps = {
gn = {
rev = "991530ce394efb58fcd848195469022fa17ae126";
sha256 = "1zpbaspb2mncbsabps8n1iwzc67nhr79ndc9dnqxx1w1qfvaldg2";
rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";
sha256 = "1fbkpdsxbma41yja4s27j4i3f1pa38784f8knhq9plzawwc6w2bp";
url = "https://gn.googlesource.com/gn";
version = "2023-09-12";
version = "2023-10-23";
};
};
sha256 = "0f11p5gf98islrp6w10ji8lw9jpnc8jzl54d9902zjai0r3hx81f";
sha256bin64 = "1if5zzjsnzjnl917hnkb569mi4cgdikxx6lpi6sy7g6pk7466xpn";
version = "119.0.6045.199";
sha256 = "0jpmrp6cgm8xbsdrl219h5hr7yi0dan2qrhbwrkx3xxn2wi1v1nq";
sha256bin64 = "15r1kx4jnbrcw7kfma528ks5ic17s4ydh1ncsb680himhln02z64";
version = "120.0.6099.71";
};
ungoogled-chromium = {
deps = {
gn = {
rev = "991530ce394efb58fcd848195469022fa17ae126";
sha256 = "1zpbaspb2mncbsabps8n1iwzc67nhr79ndc9dnqxx1w1qfvaldg2";
rev = "e4702d7409069c4f12d45ea7b7f0890717ca3f4b";
sha256 = "1fbkpdsxbma41yja4s27j4i3f1pa38784f8knhq9plzawwc6w2bp";
url = "https://gn.googlesource.com/gn";
version = "2023-09-12";
version = "2023-10-23";
};
ungoogled-patches = {
rev = "119.0.6045.199-1";
sha256 = "1j64sah88j7q86cjqf0cqa85mc8ka59nm37vz0bxwpnydap3khb5";
rev = "120.0.6099.71-1";
sha256 = "1wl8ykvpcww399xi8p3i8bp78fq44hpcnvijlg42ikxmrpsashjb";
};
};
sha256 = "0f11p5gf98islrp6w10ji8lw9jpnc8jzl54d9902zjai0r3hx81f";
sha256bin64 = "1if5zzjsnzjnl917hnkb569mi4cgdikxx6lpi6sy7g6pk7466xpn";
version = "119.0.6045.199";
sha256 = "0jpmrp6cgm8xbsdrl219h5hr7yi0dan2qrhbwrkx3xxn2wi1v1nq";
sha256bin64 = "15r1kx4jnbrcw7kfma528ks5ic17s4ydh1ncsb680himhln02z64";
version = "120.0.6099.71";
};
}

9
pkgs/development/python-modules/wagtail/default.nix
View File

@@ -9,6 +9,7 @@
, django_treebeard
, djangorestframework
, draftjs-exporter
, fetchpatch
, fetchPypi
, html5lib
, l18n
@@ -30,6 +31,14 @@ buildPythonPackage rec {
sha256 = "sha256-s89gs3H//Dc3k6BLZUC4APyDgiWY9LetWAkI+kXQTf8=";
};
patches = [
(fetchpatch {
name = "CVE-2023-45809.patch";
url = "https://github.com/wagtail/wagtail/commit/0bacd29473107d9d7f5b723a15a683449679756d.patch";
sha256 = "sha256-f14ZvO3UYZDlUNYup9OeqSdArGBL7QZYNP0KB/sQgWc=";
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8"

36
pkgs/os-specific/linux/kernel/common-config.nix
View File

@@ -648,24 +648,24 @@ let
VBOXGUEST = option no;
DRM_VBOXVIDEO = option no;
XEN = option yes;
XEN_DOM0 = option yes;
PCI_XEN = option yes;
HVC_XEN = option yes;
HVC_XEN_FRONTEND = option yes;
XEN_SYS_HYPERVISOR = option yes;
SWIOTLB_XEN = option yes;
XEN_BACKEND = option yes;
XEN_BALLOON = option yes;
XEN_BALLOON_MEMORY_HOTPLUG = option yes;
XEN_EFI = option yes;
XEN_HAVE_PVMMU = option yes;
XEN_MCE_LOG = option yes;
XEN_PVH = option yes;
XEN_PVHVM = option yes;
XEN_SAVE_RESTORE = option yes;
XEN_SCRUB_PAGES = whenOlder "4.19" yes;
XEN_SELFBALLOONING = whenOlder "5.3" yes;
XEN = mkIf stdenv.is64bit (option yes);
XEN_DOM0 = mkIf stdenv.is64bit (option yes);
PCI_XEN = mkIf stdenv.is64bit (option yes);
HVC_XEN = mkIf stdenv.is64bit (option yes);
HVC_XEN_FRONTEND = mkIf stdenv.is64bit (option yes);
XEN_SYS_HYPERVISOR = mkIf stdenv.is64bit (option yes);
SWIOTLB_XEN = mkIf stdenv.is64bit (option yes);
XEN_BACKEND = mkIf stdenv.is64bit (option yes);
XEN_BALLOON = mkIf stdenv.is64bit (option yes);
XEN_BALLOON_MEMORY_HOTPLUG = mkIf stdenv.is64bit (option yes);
XEN_EFI = mkIf stdenv.is64bit (option yes);
XEN_HAVE_PVMMU = mkIf stdenv.is64bit (option yes);
XEN_MCE_LOG = mkIf stdenv.is64bit (option yes);
XEN_PVH = mkIf stdenv.is64bit (option yes);
XEN_PVHVM = mkIf stdenv.is64bit (option yes);
XEN_SAVE_RESTORE = mkIf stdenv.is64bit (option yes);
XEN_SCRUB_PAGES = mkIf stdenv.is64bit (whenOlder "4.19" yes);
XEN_SELFBALLOONING = mkIf stdenv.is64bit (whenOlder "5.3" yes);
# Enable device detection on virtio-mmio hypervisors
VIRTIO_MMIO_CMDLINE_DEVICES = yes;

1
pkgs/servers/http/router/default.nix
View File

@@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://www.apollographql.com/docs/router/";
license = licenses.elastic;
maintainers = [ maintainers.bbigras ];
knownVulnerabilities = [ "CVE-2023-45812" ];
};
}