From 04e5385d9a5430b62c5a09f09b10490789e16f9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 21 Jul 2024 06:09:31 +0000 Subject: [PATCH 01/10] lxd-unwrapped-lts: 5.21.1 -> 5.21.2 (cherry picked from commit 45632accdd6a06d9fb32310cf261e37bd29dfb3f) --- pkgs/by-name/lx/lxd-unwrapped-lts/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix index 0a95e10e9076..8aa91ca7d2dc 100644 --- a/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix +++ b/pkgs/by-name/lx/lxd-unwrapped-lts/package.nix @@ -19,16 +19,16 @@ buildGo122Module rec { pname = "lxd-unwrapped-lts"; # major/minor are used in updateScript to pin to LTS - version = "5.21.1"; + version = "5.21.2"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd"; rev = "refs/tags/lxd-${version}"; - hash = "sha256-6php6dThpyADOY+2PZ38WxK2jPKd61D0OCwTKjAhAUg="; + hash = "sha256-3C5pLvO7oABWFhFiWtBr5ohFFWm20Gg36WBfVVJgKdc="; }; - vendorHash = "sha256-iGW2FQjuqANadFuMHa+2VXiUgoU0VFBJYUyh0pMIdWY="; + vendorHash = "sha256-W7+Z2o5cw3u0DbTZA+a3pRXt9zRggUUjFTUTtQ7B22A="; postPatch = '' substituteInPlace shared/usbid/load.go \ From 426f7bd11c61dda9611920eac30e9c081c1a41fd Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Sun, 15 Sep 2024 16:31:39 -0700 Subject: [PATCH 02/10] lowdown: patch to fix macOS and UTF-8 bugs - Improve UTF-8 handling by not treating bytes >=0x80, which tend to be UTF-8 continuation bytes, as control characters. This leaves control characters U+0080 through U+009F in the output (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net win. See: https://github.com/kristapsdz/lowdown/pull/140 - Don't output a newline between a `.SH` and a heading. This fixes `makewhatis` output on macOS and (as a result) `man` completions for `fish` on macOS. See: https://github.com/kristapsdz/lowdown/pull/138 (cherry picked from commit 7784c973e614ef6c5e101486e703b6c396fa05ce) --- pkgs/tools/typesetting/lowdown/default.nix | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index 189ba55838b6..bf9e06deca34 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, fixDarwinDylibNames, which, dieHook +, fetchpatch , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic # for passthru.tests @@ -16,6 +17,40 @@ stdenv.mkDerivation rec { hash = "sha512-EpAWTz7Zy+2qqJGgzLrt0tK7WEZ+hHbdyqzAmMiaqc6uNXscR88git6/UbTjvB9Yanvetvw9huSuyhcORCEIug=="; }; + patches = [ + # Improve UTF-8 handling on macOS by not treating bytes >=0x80, which tend to be + # UTF-8 continuation bytes, as control characters. + # + # This leaves control characters U+0080 through U+009F in the output + # (incorrectly) but doesn't mangle other UTF-8 characters, so it's a net + # win. + # + # See: https://github.com/kristapsdz/lowdown/pull/140 + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/5a02866dd682363a8e4f6b344c223cfe8b597da9.diff"; + hash = "sha256-7tGhZJQQySeBv4h6A4r69BBbQkPRX/3JTw/80A8YXjQ="; + }) + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/c033a6886e4d6efb948782fbc389fe5f673acf36.diff"; + hash = "sha256-7DvKFerAMoPifuTn7rOX4ru888HfBkpspH1opIbzj08="; + }) + + # Don't output a newline after .SH + # + # This fixes `makewhatis` output on macOS and (as a result) `man` + # completions for `fish` on macOS. + # + # See: https://github.com/kristapsdz/lowdown/pull/138 + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/e05929a09a697de3d2eb14d0f0a087a6fae22e11.diff"; + hash = "sha256-P03W+hFeBKwfJB+DhGCPq0DtiOiLLc+0ZvWrWqXFvVU="; + }) + (fetchpatch { + url = "https://github.com/kristapsdz/lowdown/commit/9906f8ceac586c54eb39ae78105fd84653a89c33.diff"; + hash = "sha256-nBnAgTb8RDe/QpUhow3lyeR7UIVJX2o4lmP78e2fw/E="; + }) + ]; + nativeBuildInputs = [ which dieHook ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; From 0a944de72cb2f92d6ed8801e7877ae46b3166533 Mon Sep 17 00:00:00 2001 From: Rafael Kraut <14234815+RafaelKr@users.noreply.github.com> Date: Thu, 19 Sep 2024 15:16:07 +0200 Subject: [PATCH 03/10] unit: fix php82 module argument (cherry picked from commit f24fd1b48e6eb74d02282a94470517160ae4d9d5) --- pkgs/servers/http/unit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index d2d53df71352..81b39719bd19 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} - ${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} + ${optionalString withPHP82 "./configure php --module=php82 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} ${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} From 3fbb64e5b6242f5048919cedee0dbc71a455896e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Sep 2024 22:17:26 +0000 Subject: [PATCH 04/10] dendrite: 0.13.7 -> 0.13.8 (cherry picked from commit 1389dc968b663a1c10550e5f9955f8deb1d3cf3b) --- pkgs/servers/dendrite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dendrite/default.nix b/pkgs/servers/dendrite/default.nix index 1e40ab671511..dd3704ef2a9e 100644 --- a/pkgs/servers/dendrite/default.nix +++ b/pkgs/servers/dendrite/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "matrix-dendrite"; - version = "0.13.7"; + version = "0.13.8"; src = fetchFromGitHub { owner = "matrix-org"; repo = "dendrite"; rev = "v${version}"; - hash = "sha256-A6rQ8zqpV6SBpiALIPMF1nZtGvUtzoiTE2Rioh3T1WA="; + hash = "sha256-zUpZdG2cdZ95L70qLG2HaUlD+G66XTi4f1V4+ZZAh30="; }; - vendorHash = "sha256-ByRCI4MuU8/ilbeNNOXSsTlBVHL5MkxLHItEGeGC9MQ="; + vendorHash = "sha256-rGOB1ikY3BgChvD1YZUF66g8P6gE29b/k9kxvHR0+WQ="; subPackages = [ # The server From 3093d8ec1a34381af75d7510a30f56de07a96282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Wed, 18 Sep 2024 17:53:21 +0200 Subject: [PATCH 05/10] tor-browser: 13.5.3 -> 13.5.4 https://blog.torproject.org/new-release-tor-browser-1354/ (cherry picked from commit 9366f2b44a173b726534f9491862a8af11f71f94) --- pkgs/by-name/to/tor-browser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix index 5283e04db85f..154f70c83e00 100644 --- a/pkgs/by-name/to/tor-browser/package.nix +++ b/pkgs/by-name/to/tor-browser/package.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.5.3"; + version = "13.5.4"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-g4wSjFS3VFZcflN2lexAoSledOBCK9taixGEUbM3X1E="; + hash = "sha256-2gu/JzkLYvYveOM1XvDpyV3dLoixqKvfmyHGIAz8nis="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-sw8PFbCTUvmD1+fE3VXX/3A07CnzXjBydQ+b4rshpak="; + hash = "sha256-BnJuKKwB6VqsHlRCU1cAuuaNdNu56oSE4z4wYXnyy/Q="; }; }; From a219f9fb3f229f1d033e36d53e6e8fb0a93a06eb Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Thu, 19 Sep 2024 17:03:47 -0400 Subject: [PATCH 06/10] envoy: 1.30.5 -> 1.30.6 https://github.com/envoyproxy/envoy/releases/tag/v1.30.6 CVE-2024-45808: Malicious log injection via access logs CVE-2024-45806: Potential manipulate x-envoy headers from external sources CVE-2024-45809: Jwt filter crash in the clear route cache with remote JWKs CVE-2024-45810: Envoy crashes for LocalReply in http async client --- pkgs/servers/http/envoy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 77e81cfed49d..559ed5ef7ecb 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -24,9 +24,9 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.30.5"; - rev = "20d3fc67fb757d7d7a644e0e0bfc3988b1df56ab"; - hash = "sha256-uogckAaP+eumY1GZw2+T3CusLE0gR2VEV96/lroQ6+g="; + version = "1.30.6"; + rev = "810bfcb8cae456e3a5e6541a0ee853185e2586f7"; + hash = "sha256-71UCctIfhMIevj6Wjy+E07IOe9qHSUgKwqzvFtBAf2k="; }; # these need to be updated for any changes to fetchAttrs From c34f195b67b3601c465d46b8ef5185adcec0b62d Mon Sep 17 00:00:00 2001 From: Raroh73 <96078496+Raroh73@users.noreply.github.com> Date: Tue, 17 Sep 2024 14:18:58 +0200 Subject: [PATCH 07/10] xone: fix kernel 6.11 compatibility (cherry picked from commit ff4117b690cc2e8ad6cc2a1f0b82b302db9c0d50) --- pkgs/os-specific/linux/xone/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index 92a10878a36a..7508a35a8ff7 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -11,6 +11,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM="; }; + patches = [ + # Fix build on kernel 6.11 + # https://github.com/medusalix/xone/pull/48 + (fetchpatch { + name = "kernel-6.11.patch"; + url = "https://github.com/medusalix/xone/commit/28df566c38e0ee500fd5f74643fc35f21a4ff696.patch"; + hash = "sha256-X14oZmxqqZJoBZxPXGZ9R8BAugx/hkSOgXlGwR5QCm8="; + }) + ]; + setSourceRoot = '' export sourceRoot=$(pwd)/${finalAttrs.src.name} ''; From 0c123babc483a331d6d08ed1ccb3ed9d18fd3d67 Mon Sep 17 00:00:00 2001 From: Rutherther Date: Mon, 16 Sep 2024 20:57:45 +0200 Subject: [PATCH 08/10] mautrix-meta: 0.3.2 -> 0.4.0 This update cannot be done by the nixpkgs bot, as the structure of the project has been changed, so why wait. The mautrix-meta project has been moved under "cmd/mautrix-meta" There is also "cmd/lscli", but since this package is mainly about mautrix-meta, I think we can stay with this specific cmd. If we wanted, we could switch to both of them by removing this `subPackages` attribute. (cherry picked from commit 9ef2c90877ccf83181d0c7ab3fb19ef9f00144d1) --- pkgs/by-name/ma/mautrix-meta/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index f175c12c4bc9..b4fd32a9d265 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "0.3.2"; + version = "0.4.0"; - subPackages = [ "." ]; + subPackages = [ "cmd/mautrix-meta" ]; src = fetchFromGitHub { owner = "mautrix"; repo = "meta"; rev = "v${version}"; - hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg="; + hash = "sha256-KJuLBJy/g4ShcylkqIG4OuUalwboUSErSif3p7x4Zo4="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio="; + vendorHash = "sha256-ErY40xIDhhOHQI/jYa8DcnfjOI998neIMgb/IQNP/JQ="; passthru = { tests = { From 272a8a51ed86285ac664213e50277ceeda0b80d4 Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 13 Sep 2024 13:31:39 +0200 Subject: [PATCH 09/10] grafana-agent: 0.42.0 -> 0.43.0 https://github.com/grafana/agent/releases/tag/v0.43.0 https://github.com/grafana/agent/blob/v0.43.0/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.42.0...v0.43.0 (cherry picked from commit 3e49c02689024c19ebed7f7b562df0bbd2ebb469) --- pkgs/servers/monitoring/grafana-agent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 5c775651cdfc..696db336dd58 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,21 +15,21 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-qSxm00zC1Ms9C5R077Zn5FKluEqFs8KYUPnDUaMvMs8="; + hash = "sha256-0pwsZONhouGuypGTP64oJd3+nq8VMlyulb/WUJj0qGw="; }; - vendorHash = "sha256-rC8iqCZ6tzXVCOHNqH+jAMDh2yTAR88zj45HcgJ2lSg="; + vendorHash = "sha256-vz65gr56wj6PNiQwmfz1wg9SVmRUnrv7ZeWQkqdA4WI="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { yarnLock = src + "/internal/web/ui/yarn.lock"; - hash = "sha256-FvrfWcuKld242YfZ8CixF5GGFRp8iFWZ3Vkef3Kf4ag="; + hash = "sha256-bnJL7W7VfJIrJKvRt9Q6kdEyjLH/IJoCi0TENxz7SUE="; }; ldflags = let From 79d9106ed6cd613c99d32e24e96b5e56b7edc573 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 31 Aug 2024 17:14:41 +0300 Subject: [PATCH 10/10] arc-browser: 1.55.0-52417 -> 1.58.1-53264 Changelog: https://arc.net/e/123493AC-A3B7-470F-BC09-DC700B348B59 (cherry picked from commit 7a16ca4e1d5da4547f28863ddbd7443af6e6a2ef) --- pkgs/by-name/ar/arc-browser/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix index b177837cb83f..017cac0157b6 100644 --- a/pkgs/by-name/ar/arc-browser/package.nix +++ b/pkgs/by-name/ar/arc-browser/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "arc-browser"; - version = "1.55.0-52417"; + version = "1.58.1-53264"; src = fetchurl { url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg"; - hash = "sha256-8r5SAnk1iPqqad1RKVDXkqd6tHUQCRRYnkWrQdyub+o="; + hash = "sha256-xX2Wn0bhPeTn/flz5GiDJ8pnQj3HREc8wqJDlsjI+hs="; }; nativeBuildInputs = [ undmg ];