nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-26 10:30:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-22.11 into staging-22.11

Browse Source
This commit is contained in:
github-actions[bot]
2023-05-11 00:13:36 +00:00
committed by GitHub
parent e73166731f 0004911093
commit d8b63d55bc
5 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,28 +19,28 @@
}
},
"beta": {
"version": "110.0.5481.77",
"sha256": "1kl1k29sr5qw8pg7shvizw4b37fxjlgah56p57kq641iqhnsnj73",
"sha256bin64": "0wnzgvwbpmb5ja4ba5mjk4bk0aaxzbw4zi509vw96q6mbqmr4iwr",
"version": "113.0.5672.63",
"sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn",
"sha256bin64": "1n1bcim5wfafa3bl9grp3ckmnbi1mzhdxz8pim408wz892da34zl",
"deps": {
"gn": {
"version": "2022-12-12",
"version": "2023-03-18",
"url": "https://gn.googlesource.com/gn",
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
"rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4",
"sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq"
}
}
},
"dev": {
"version": "111.0.5563.8",
"sha256": "0gflrk5i6dr5vrywhxab73044gryxj49px59blgl6nyphw7swpwy",
"sha256bin64": "1dgfjz9pnziy1zymk7g15i5zdb002g77q8kqhkwgi4m0fndknpmj",
"version": "114.0.5735.6",
"sha256": "0wxlfqxrawk77yzm00hb1fbssrycl4mha53wm4y5mlb8warqs5jk",
"sha256bin64": "0vlb6zr50kn7i0rfvy3yvwzcffpg5ki7is8i3ck43b1gr1bsmgmb",
"deps": {
"gn": {
"version": "2022-12-12",
"version": "2023-04-19",
"url": "https://gn.googlesource.com/gn",
"rev": "5e19d2fb166fbd4f6f32147fbb2f497091a54ad8",
"sha256": "1b5fwldfmkkbpp5x63n1dxv0nc965hphc8rm8ah7zg44zscm9z30"
"rev": "5a004f9427a050c6c393c07ddb85cba8ff3849fa",
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
}
}
},

7
pkgs/applications/networking/cluster/spark/default.nix
View File

@@ -76,16 +76,21 @@ in
pname = "spark";
version = "3.2.2";
sha256 = "sha256-yKoTyD/IqvsJQs0jB67h1zqwYaLuikdoa5fYIXtvhz0=";
extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ];
};
spark_3_1 = spark rec {
pname = "spark";
version = "3.1.3";
sha256 = "sha256-RIQyN5YjxFLfNIrETR3Vv99zsHxt77rhOXHIThCI2Y8=";
extraMeta.knownVulnerabilities = [ "CVE-2023-22946" ];
};
spark_2_4 = spark rec {
pname = "spark";
version = "2.4.8";
sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv";
extraMeta.knownVulnerabilities = [ "CVE-2021-38296" ];
extraMeta.knownVulnerabilities = [
"CVE-2021-38296"
"CVE-2023-22946"
];
};
}

4
pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View File

@@ -1,8 +1,8 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.16.0";
hash = "sha256-q7z7TS16RORPbEMJBEmF3m2q4IdD3dM1xqv1DfgM9Zs=";
version = "6.17.0";
hash = "sha256-CSyFkO06yeExZAQBKQNGIwc3KEFcpibm5UM3ij2k+G8=";
};
signal-desktop-beta = {
dir = "Signal Beta";

9
pkgs/os-specific/linux/kernel/patches.nix
View File

@@ -62,4 +62,13 @@
name = "fix-em-ice-bonding";
patch = ./fix-em-ice-bonding.patch;
};
CVE-2023-32233 = rec {
name = "CVE-2023-32233";
patch = fetchpatch {
name = name + ".patch";
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=c1592a89942e9678f7d9c8030efa777c0d57edab";
hash = "sha256-DYPWgraXPNeFkjtuDYkFXHnCJ4yDewrukM2CCAqC2BE=";
};
};
}

9
pkgs/top-level/linux-kernels.nix
View File

@@ -111,6 +111,7 @@ in {
[ kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.CVE-2023-32233
];
};
@@ -119,6 +120,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.rtl8761b_support
kernelPatches.CVE-2023-32233
];
};
@@ -126,6 +128,7 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.CVE-2023-32233
];
};
@@ -133,6 +136,7 @@ in {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.CVE-2023-32233
];
};
@@ -141,6 +145,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.export-rt-sched-migrate
kernelPatches.CVE-2023-32233
];
};
@@ -149,6 +154,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.CVE-2023-32233
];
};
@@ -163,6 +169,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.CVE-2023-32233
];
};
@@ -171,6 +178,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.CVE-2023-32233
];
};
@@ -179,6 +187,7 @@ in {
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
kernelPatches.fix-em-ice-bonding
kernelPatches.CVE-2023-32233
];
};