nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-30 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.11 into staging-next-23.11

Browse Source
This commit is contained in:
github-actions[bot]
2024-05-15 00:13:58 +00:00
committed by GitHub
parent 2087b00ba1 62fc408217
commit 6148cf1d06
8 changed files with 461 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
{
stable = {
chromedriver = {
hash_darwin = "sha256-jnWmH6MzqZzzIAblvJFv5jKFJ2LILyGy+eOqb6sWmWc=";
hash_darwin = "sha256-00582jnlAkVkqFsylZnTWfHh5TJkz+m9W8QCXYKerfo=";
hash_darwin_aarch64 =
"sha256-FO0kncAPj/cBwlGN2RdFGR7Bn5pKzTRlf2IQ422mm5c=";
hash_linux = "sha256-3khPV+WPcYHrlGNFXhmRrja2+wWsr77BVgHLbSe0IF8=";
version = "124.0.6367.201";
"sha256-EV45I6lav93uMzgZkjypq1RazqtP1W8w8/c4dVZ5hjI=";
hash_linux = "sha256-xCizRpHgcent3D/tMBK+CtXiwtTdH61fja1u8QyECCA=";
version = "124.0.6367.207";
};
deps = {
gn = {
@@ -15,8 +15,8 @@
version = "2024-03-14";
};
};
hash = "sha256-nSI+tkJxOedMtYgtiqW37v0ZjgxxU5o/0sH9bPAchBg=";
version = "124.0.6367.201";
hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8=";
version = "124.0.6367.207";
};
ungoogled-chromium = {
deps = {
@@ -27,11 +27,11 @@
version = "2024-03-14";
};
ungoogled-patches = {
hash = "sha256-fy4SydGRRyDhJZ7IADG54+rGWh2i+2SrSkuCglphhm8=";
rev = "124.0.6367.201-1";
hash = "sha256-7Z9j+meVRZYLmreCzHlJe71E9kj5YJ4rrfpQ/deNTpM=";
rev = "124.0.6367.207-1";
};
};
hash = "sha256-nSI+tkJxOedMtYgtiqW37v0ZjgxxU5o/0sH9bPAchBg=";
version = "124.0.6367.201";
hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8=";
version = "124.0.6367.207";
};
}

818
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -3,10 +3,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "125.0.3";
version = "126.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484";
sha512 = "56025b051d544ca294911a1d6a66f09945f71012131881b64313dafb579730810a4b091950c90a21d4fd3f393ba23670d8409086e1677d80d0bbbe347c303527";
};
extraPatches = [
@@ -94,11 +94,11 @@
firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.10.0esr";
version = "115.11.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "0626e2c68ce43f24dfc2b9216e2565537ad8781daf4195d53420e1b78d57d0f6360fbe56b0ddbedae3818546c72472c85c1ff2b208c123d32a0543e666f42b65";
sha512 = "0f3a87c99fb008088afd509d9259f893fdd44ea6bf6a5e69806fefb8d355415e81b9e8832a392acb9d0c1c50e4add7f1362a4aaadc35e1d9c2e55baf7136aed8";
};
meta = {

11
pkgs/data/icons/whitesur-cursors/default.nix
View File

@@ -1,17 +1,18 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "whitesur-cursors";
version = "unstable-2022-06-17";
version = "0-unstable-2022-06-17";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "WhiteSur-cursors";
rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8";
sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
hash = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
};
installPhase = ''

17
pkgs/development/tools/dump_syms/default.nix
View File

@@ -1,12 +1,13 @@
{ lib
, stdenv
, rustPlatform
, rustPackages_1_76
, fetchFromGitHub
, pkg-config
, openssl
# darwin
, Security
, SystemConfiguration
# tests
, firefox-esr-unwrapped
@@ -16,19 +17,24 @@
let
pname = "dump_syms";
version = "2.2.2";
version = "2.3.1";
in
rustPlatform.buildRustPackage {
rustPackages_1_76.rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "mozilla";
repo = pname;
rev = "v${version}";
hash = "sha256-8kyicTtY7h1CDM4UGOHsppRRTraU6JLe24MKtoduiz0=";
hash = "sha256-mSup3AMYsPu/Az6QXhdCFSxGcIpel4zNN0g/95gPDS0=";
};
cargoSha256 = "sha256-5WiGckh/jq7AHH3JWZL8tIsj1Gqr8iLX7IyppKsW96k=";
cargoSha256 = "sha256-INzCyF/tvCp4L6Btrw8AGTBAgdFiBlywzO3+SSE4beI=";
# Workaround for https://github.com/nixos/nixpkgs/issues/166205
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
nativeBuildInputs = [
pkg-config
@@ -38,6 +44,7 @@ rustPlatform.buildRustPackage {
openssl
] ++ lib.optionals (stdenv.isDarwin) [
Security
SystemConfiguration
];
checkFlags = [

15
pkgs/servers/mqtt/nanomq/0.18.2-CVE-2024-31040.patch Normal file
View File

@@ -0,0 +1,15 @@
Based on upstream
https://github.com/nanomq/NanoNNG/commit/543ce93017a488c5001ac450c2a2c1ff6dca19d1
with conflicting formatting changes removed
--- a/nng/src/sp/protocol/mqtt/mqtt_parser.c
+++ b/nng/src/sp/protocol/mqtt/mqtt_parser.c
@@ -583,7 +583,7 @@
if (cparam->pro_ver == MQTT_PROTOCOL_VERSION_v5) {
// check length
log_trace("Decoding MQTT V5 Properties");
- if (pos >= max)
+ if (pos + 4 >= max)
return PROTOCOL_ERROR;
cparam->prop_len = (uint32_t) get_var_integer(packet + pos,
&len_of_var);

4
pkgs/servers/mqtt/nanomq/default.nix
View File

@@ -52,6 +52,10 @@ in stdenv.mkDerivation (finalAttrs: {
fetchSubmodules = true;
};
patches = [
./0.18.2-CVE-2024-31040.patch
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "DESTINATION /etc" "DESTINATION $out/etc"

2
pkgs/top-level/all-packages.nix
View File

@@ -7670,7 +7670,7 @@ with pkgs;
};
dump_syms = callPackage ../development/tools/dump_syms {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
};
dumpasn1 = callPackage ../tools/security/dumpasn1 { };