From 4aa3dc45ca603d1bed0f97d0feeb2fbb43b2c7ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Sep 2023 02:55:46 +0000 Subject: [PATCH 01/21] open-vm-tools: 12.2.5 -> 12.3.0 (cherry picked from commit 63e43aaa9f8a1b370130495c3f4c2d1c8428b391) --- pkgs/applications/virtualization/open-vm-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index f60c9626c553..0a0e7ed40fbf 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "12.2.0"; + version = "12.3.0"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - hash = "sha256-ikodKEvlg+QU0af8IjiMjhMyQSV6icHVUczf0rWfVaI="; + hash = "sha256-YVpWomLED5sBKXKdJtuDjb7/aKB2flVIm2ED3xSsccE="; }; sourceRoot = "${src.name}/open-vm-tools"; From 471fedc8e643655014c5d483704c917453b90a85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jul 2023 15:24:04 +0000 Subject: [PATCH 02/21] vips: 8.14.2 -> 8.14.3 (cherry picked from commit 94aaa919d91bb986937a78a110fd164e25af0828) --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 9c4099783e0c..0d9290acd14d 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.14.2"; + version = "8.14.3"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - hash = "sha256-QUWZ11t2JEJBdpNuIY2uRiSL/hffRbV0SV5HowxWaME="; + hash = "sha256-2BE/cDQU/FP0Lo9/gZiG1IAskTbnhBtzbcL2dRziHmU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' From 2147f47fee147a8ef9d2472548b6ff06ba42c49d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Aug 2023 22:55:41 +0000 Subject: [PATCH 03/21] vips: 8.14.3 -> 8.14.4 (cherry picked from commit c033c47cb3b51c700993bfa9e7e1e368eb0e7cac) --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 0d9290acd14d..85f9e4c3d9e7 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.14.3"; + version = "8.14.4"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - hash = "sha256-2BE/cDQU/FP0Lo9/gZiG1IAskTbnhBtzbcL2dRziHmU="; + hash = "sha256-y2Tyi8rxal3s3jLURRGPuCAUuHITRPl1+zJZDp557+I="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' From 24760bb23c8380a53e42822cbea69a1bea9f1cad Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 25 Nov 2023 16:55:56 +0000 Subject: [PATCH 04/21] pgadmin4: add patches for CVE-2023-5002 --- pkgs/tools/admin/pgadmin/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 7e0ed163d93a..9984c7c24df6 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -2,6 +2,7 @@ , python3 , fetchFromGitHub , fetchYarnDeps +, fetchpatch , zlib , nixosTests , postgresqlTestHook @@ -43,6 +44,22 @@ pythonPackages.buildPythonApplication rec { format = "setuptools"; patches = [ + (fetchpatch { + name = "CVE-2023-5002.part-1.patch"; + url = "https://github.com/pgadmin-org/pgadmin4/commit/02ecc82e73f12e84e54c3947ada943d80f746c87.patch"; + excludes = [ "docs/en_US/release_notes_7_7.rst" ]; + hash = "sha256-9a7X+UtHOMB2GgOvup0IgEbRgJu/mAcmTvc1GOrs1Vg="; + }) + (fetchpatch { + name = "CVE-2023-5002.part-2.patch"; + url = "https://github.com/pgadmin-org/pgadmin4/commit/35f05e49b3632a0a674b9b36535a7fe2d93dd0c2.patch"; + hash = "sha256-OHco1of/1BPKewDFvkxGZWEx7uazzZs9vr0ziDf7zhM="; + }) + (fetchpatch { + name = "CVE-2023-5002.part-3.patch"; + url = "https://github.com/pgadmin-org/pgadmin4/commit/3b616b2fb1cf0dc31933aec751aea8ec266e5bcc.patch"; + hash = "sha256-EhpnAdWN8yfVmUv2JxQT1hIcV6mJxxFcsSFwxXX0qYw="; + }) # Expose setup.py for later use ./expose-setup.py.patch # check for permission of /etc/pgadmin/config_system and don't fail From 9332ee58fbc5c3e97a66eb3814ee5aaa19a26146 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 28 Nov 2023 14:57:18 +0000 Subject: [PATCH 05/21] sftpgo: 2.5.0 -> 2.5.5 https://github.com/drakkan/sftpgo/releases/tag/v2.5.5 --- pkgs/servers/sftpgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index e0c4bf9a1903..ba510139ceb6 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.5.0"; + version = "2.5.5"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-UL/CSNRvT9e+WAmE7nwd/EU7YOJ1mwMSnOIrd0dQJrk="; + hash = "sha256-SW+8Lp2NNW2I1BoOGVRzIx+1+DsffxlmHf8xFCxTyNw="; }; - vendorHash = "sha256-q6GgaMlmBPjovCpLku9/ENlEc0lF8gck1fM+fpptti4="; + vendorHash = "sha256-IQg50z+X0dUOk2zEiGejywEE+8SCtS3mdgUAxIddcQs="; ldflags = [ "-s" From c39f6453bd16ec80a6285190ce3f247aebc82166 Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 21 Nov 2023 14:50:15 -0800 Subject: [PATCH 06/21] librewolf-unwrapped: 119.0.1-1 -> 120.0-1 (cherry picked from commit 64282d466bc02218e88d2fa25bf7349c4cc7d715) --- .../networking/browsers/librewolf/src.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index afe766f841bc..9662b1b54e0d 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "119.0.1-1", + "packageVersion": "120.0-1", "source": { - "rev": "119.0.1-1", - "sha256": "1ghxrylxrb5i37i4z2hrb8dn9lndhs75pjvhdafg079jmar5wfn7" + "rev": "120.0-1", + "sha256": "1wms3kyimmfzl64rbphgap2sm87lwkl0pr24rx4rxf3px3bq97f3" }, "settings": { - "rev": "095f50ed91aa7db2de9c67763cf46bae09146a58", - "sha256": "0nwrzcqxa72wcbxjbilxl340i69m5l0qr7gq2s6a76bbzxg502gi" + "rev": "b587388bdbe63511c478cb8b5f82c2e80040414c", + "sha256": "03cw6wh7358pgld4qgs534pl2lnfvwc0xl2yyb3n3pyvmba6cyrp" }, "firefox": { - "version": "119.0.1", - "sha512": "4f3201aee10e7b831cc384b2c7430a24f4de81f703115a917f9eb7acecb2ae1725f11af56c41257a056bb9d7a4d749d590cc9baffcd6e13852be45aaecf8163a" + "version": "120.0", + "sha512": "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c" } } From 1f1dd2d3af5e60d0452b4490c33b3ab55f810b6d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Nov 2023 23:28:33 +0100 Subject: [PATCH 07/21] firefox-beta-unwrapped: 121.0b3 -> 121.0b4 (cherry picked from commit 2438f55f0989f1be60b292ef82fa1568b1b8967b) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index b1bd57f48b84..a24788a2e03b 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -29,11 +29,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "121.0b3"; + version = "121.0b4"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "95dd68c50af5784c44e40ad3a8ac6b4fb259fa8f56bc5e5de940d03dec1838b143712680826b4d260fefdad314464d24679911f21b1095512a86cdf4eb2648c9"; + sha512 = "b8c1be63be633744b249d2e0ffe77abcc92f0f70c0d7084395031643fb68c0b1fc32a6fcb55a25fc255e4eb8c40e818b209bb0077e416e652ae0c9463045fc12"; }; meta = { From 5796aca6b1fba2bc5c98ece317f47c599af58e5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Nov 2023 23:29:02 +0100 Subject: [PATCH 08/21] firefox-devedition-unwrapped: 121.0b3 -> 121.0b4 (cherry picked from commit 21672ccd691ebd2f18fa6b41446389c069adfdbb) --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a24788a2e03b..772c6e5ec503 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -57,12 +57,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "121.0b3"; + version = "121.0b4"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a5ed25159e63122f27bd05810eaf665834022ae407c029734ad41ef1ed5e3956497873f5210b7c385245056718837bd17c47cfc2e2e438a4c3274d2462ce51f8"; + sha512 = "11234fda39c80a217a715884524e12febf5f920a680b0828d3619ec6ae97fe6e377c36ac86353f1aadb0569e4f04e4105714c29b447eb80ea9bad18bdd664e75"; }; meta = { From 78bedf1c5411a32e5e59641b1c3c633011f92bd1 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Mon, 27 Nov 2023 14:48:22 +1300 Subject: [PATCH 09/21] microsoft-edge: 119.0.2151.44 -> 119.0.2151.72 (cherry picked from commit 353ec7d15489e325d442d25b9d811f5b3b886349) --- .../networking/browsers/microsoft-edge/browser.nix | 12 ++++++------ .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ .../networking/browsers/microsoft-edge/update.py | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index a2eda0dc3c17..fa74f90bca4e 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -1,4 +1,4 @@ -{ channel, version, revision, sha256 }: +{ channel, version, revision, hash }: { stdenv , fetchurl @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ @@ -128,13 +128,13 @@ stdenv.mkDerivation rec { --set-rpath "${libPath.libGLESv2}" \ opt/microsoft/${shortName}/libGLESv2.so - patchelf \ - --set-rpath "${libPath.libsmartscreenn}" \ - opt/microsoft/${shortName}/libsmartscreenn.so - patchelf \ --set-rpath "${libPath.liboneauth}" \ opt/microsoft/${shortName}/liboneauth.so + '' + lib.optionalString (lib.versionOlder version "120") '' + patchelf \ + --set-rpath "${libPath.libsmartscreenn}" \ + opt/microsoft/${shortName}/libsmartscreenn.so ''; installPhase = '' diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index d034c68d85fa..51b3d6730862 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "119.0.2151.44"; + version = "119.0.2151.72"; revision = "1"; - sha256 = "sha256-QY9Dk4tcpuNJGVcAcaIaVXAT95K87rK7ZQo7COMDpVU="; + hash = "sha256-thBx/+6thNXXKppA11IOG5EiMx7pA9FA3vSkwa9+F0o="; }; beta = import ./browser.nix { channel = "beta"; - version = "119.0.2151.44"; + version = "120.0.2210.22"; revision = "1"; - sha256 = "sha256-aLiitzCoMvJH2xAfo9bO7lEPMqKlb++BdJkrWx61SMc="; + hash = "sha256-GayVVZbtGLQmmXu+k4wdsD+rPwGiSPHnQwzVYyKWhHM="; }; dev = import ./browser.nix { channel = "dev"; - version = "120.0.2186.2"; + version = "121.0.2220.3"; revision = "1"; - sha256 = "sha256-L/rtOddk4bt8ffkRnq0BYcVjrSb7RmDaay85S5vixSM="; + hash = "sha256-M3r+SLp3lQ7oWDYoM7aNZDC5wbMxFZggsu0Iuyyw/cw="; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index c5a80d7e608e..856264101e47 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -50,7 +50,7 @@ def nix_expressions(latest: dict[str, Packages]): channel = "{channel}"; version = "{version}"; revision = "{revision}"; - sha256 = "{sri}"; + hash = "{sri}"; }};''' ) channel_strs.append(channel_str) From 225fbedbf36f2e11c5accd813049b98e1484dd90 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 13 Nov 2023 09:32:28 +0100 Subject: [PATCH 10/21] zellij: 0.39.0 -> 0.39.1 Signed-off-by: Matthias Beyer (cherry picked from commit 2cb360ea56957971e9531642cd4c493b167e0ae5) --- pkgs/tools/misc/zellij/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix index 6274dae69489..624fa1d15d5d 100644 --- a/pkgs/tools/misc/zellij/default.nix +++ b/pkgs/tools/misc/zellij/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.39.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - hash = "sha256-ZKtYXUNuBwQtEHTaPlptiRncFWattkkcAGGzbKalJZE="; + hash = "sha256-nT4P/ZlquJz48T8LCRQd5menL8vtGMBSUgZNJYx0Pn4="; }; - cargoHash = "sha256-4XRCXQYJaYvnIfEK2b0VuLy/HIFrafLrK9BvZMnCKpY="; + cargoHash = "sha256-jp3FS+sEvQY0DtVPCkJjAZlEc2bJOiA20+Pdt//yat4="; nativeBuildInputs = [ mandown From aff4446bb027ab7628ade7f2eeb7739b0ca4da6d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:46:05 +0100 Subject: [PATCH 11/21] linux_testing: 6.7-rc2 -> 6.7-rc3 (cherry picked from commit 4f711c3ba6aed91ce220d2435e2d347feffc4b6a) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index a521360392d7..704d36b6c204 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.7-rc2", - "hash": "sha256:026aqfblls4zl2j8rpnl7rjh9ma82jlwb6x00jryvv44kvwm0fgs" + "version": "6.7-rc3", + "hash": "sha256:1bi80271g76pcajzmzr0dxcmzzlzicqddm38mr7pkz8zi0070arf" }, "6.5": { "version": "6.5.12", From 9c065e24dbefce74c0f09901836d0ba35b127a84 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:46:40 +0100 Subject: [PATCH 12/21] linux_6_6: 6.6.2 -> 6.6.3 (cherry picked from commit dd27218c710e21e52be9d0b156b720722978ac60) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 704d36b6c204..e77c9259d8f2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -36,7 +36,7 @@ "hash": "sha256:0rwgzyfmrns6zir0dpxkwz2hm3z8c0af3wy11lmxamaa5i2wq3k7" }, "6.6": { - "version": "6.6.2", - "hash": "sha256:0zmpk5ls6282j88xpnymkr8z5hxpk2495hjjxm0jmb6ninnzdm3k" + "version": "6.6.3", + "hash": "sha256:19wmjkyyv5glv1w647qisrv829hhhpba5x905a7p7kch9wyzrv98" } } From 44e34b495b03deb8933e397e202b4bccb6a3d640 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:46:47 +0100 Subject: [PATCH 13/21] linux_6_5: 6.5.12 -> 6.5.13 (cherry picked from commit 5214ba12f37945b204bf8db26282e132e5175efe) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e77c9259d8f2..47d10a70c153 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:1bi80271g76pcajzmzr0dxcmzzlzicqddm38mr7pkz8zi0070arf" }, "6.5": { - "version": "6.5.12", - "hash": "sha256:17rmkzxszp2jg1zx2mmdcy30ffrsd0qms513sxd14klp5k9w2saa" + "version": "6.5.13", + "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" }, "6.4": { "version": "6.4.16", From 05dbb4c918c17f40d037b15b073748613ee7a502 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:00 +0100 Subject: [PATCH 14/21] linux_6_1: 6.1.63 -> 6.1.64 (cherry picked from commit 2f492ad3cf4b4b407448a24be84864bcc1d23404) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 47d10a70c153..e1fb38598bb8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln" }, "6.1": { - "version": "6.1.63", - "hash": "sha256:13bmy22mi4ybl21kr3hdy6qiaawiqz2jgl2gl9hwqkyx04xh97f2" + "version": "6.1.64", + "hash": "sha256:1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2" }, "5.15": { "version": "5.15.139", From 6fe1fef5184f6e2f87570ff7b6b0f623d906e864 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:06 +0100 Subject: [PATCH 15/21] linux_5_15: 5.15.139 -> 5.15.140 (cherry picked from commit c2a8b5f8d2bc566f2297fe5ff068b95a82a08a44) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e1fb38598bb8..f37ce95374b2 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2" }, "5.15": { - "version": "5.15.139", - "hash": "sha256:0kh4v1224a7p7ib64pnmc1qid3d1lvg3c14l5s4rpr8qzq6w2s4w" + "version": "5.15.140", + "hash": "sha256:0isa9si9wjn10lw41431wdqsbp9y685ch5lzhwswng3g6j5ywaxy" }, "5.10": { "version": "5.10.201", From 71ac863d28b7d0b93ed939896af99da004e3d82b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:13 +0100 Subject: [PATCH 16/21] linux_5_10: 5.10.201 -> 5.10.202 (cherry picked from commit f3f7cca7e51669b97e576ec2d26b2c965ed106f6) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f37ce95374b2..c420008b440d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0isa9si9wjn10lw41431wdqsbp9y685ch5lzhwswng3g6j5ywaxy" }, "5.10": { - "version": "5.10.201", - "hash": "sha256:0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a" + "version": "5.10.202", + "hash": "sha256:12zs2bz2plps6xp80sdg36zkyr00rf5l5c85jl4dd7b9klly04ij" }, "5.4": { "version": "5.4.261", From ab2c85787c41f8d0e783abb6595374acd4182571 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:19 +0100 Subject: [PATCH 17/21] linux_5_4: 5.4.261 -> 5.4.262 (cherry picked from commit f954c6ac3892269ddbbce80e08d944d5c55388c2) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c420008b440d..e5aadedcad9c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -24,8 +24,8 @@ "hash": "sha256:12zs2bz2plps6xp80sdg36zkyr00rf5l5c85jl4dd7b9klly04ij" }, "5.4": { - "version": "5.4.261", - "hash": "sha256:1hsgnv2vcziflhzrrxiny2yp88ybdqda48fm60xhpaphhs0cgfii" + "version": "5.4.262", + "hash": "sha256:1p34x33gkvpv26zcrpx1i6dr7dknyxj8gnp6caqb8sj58h3slgkx" }, "4.19": { "version": "4.19.299", From 9a2c5e2908d17867f5795c6629e6abdd4476f712 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:25 +0100 Subject: [PATCH 18/21] linux_4_19: 4.19.299 -> 4.19.300 (cherry picked from commit 3172e8e1fc2ae16cb58a149d796ce654b12a8b30) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e5aadedcad9c..5ca2a41a3b06 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:1p34x33gkvpv26zcrpx1i6dr7dknyxj8gnp6caqb8sj58h3slgkx" }, "4.19": { - "version": "4.19.299", - "hash": "sha256:12p431p2jqjfsf0all3fgn47z9fr2cdqyxipfrf4s4mlw4hpbyy6" + "version": "4.19.300", + "hash": "sha256:0ilksl94gjpc4pzc90swfawsl8lvibpq14nkaxzl0831i219ahd8" }, "4.14": { "version": "4.14.330", From 036f00ed5bab341aa2c9ace8c465e6fcb534710a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:30 +0100 Subject: [PATCH 19/21] linux_4_14: 4.14.330 -> 4.14.331 (cherry picked from commit c84f34c3c011b2f5ea40fb6920f91b7b09e7b732) --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 5ca2a41a3b06..b6be53351a75 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,8 +32,8 @@ "hash": "sha256:0ilksl94gjpc4pzc90swfawsl8lvibpq14nkaxzl0831i219ahd8" }, "4.14": { - "version": "4.14.330", - "hash": "sha256:0rwgzyfmrns6zir0dpxkwz2hm3z8c0af3wy11lmxamaa5i2wq3k7" + "version": "4.14.331", + "hash": "sha256:03sk82dgvccv70i3hy8gf2hw0n4m305f7rxjw93p7jnjrbpdrp1r" }, "6.6": { "version": "6.6.3", From 097d335f3a34213bd666bc6900bf634ad01c11a5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 29 Nov 2023 11:47:47 +0100 Subject: [PATCH 20/21] linux-rt_5_10: 5.10.199-rt97 -> 5.10.201-rt98 (cherry picked from commit 565eb9a83abcc455db502845a2518b7c54d25b90) --- pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 65ca352b53b8..ce26a38ed069 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.199-rt97"; # updated by ./update-rt.sh + version = "5.10.201-rt98"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1h944syk7n6c4j1djlx19n77alzwbxcdza77c9ykicgfynhpgsm0"; + sha256 = "0642y6qj2d4aww6jcki81ba53pvjyfazjxgzgj8brqx8ixchdz3a"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "13k7md0a63q4r5vqqvbszmg3kzp5np0hdaj1siyl4yvs9j78d03s"; + sha256 = "1g7xbjsfrgins3agz9sq9ia13h5k9605gak7s14z5i4vd34y8pk8"; }; }; in [ rt-patch ] ++ kernelPatches; From 10c1b56c33ee1e26dd5fd337aba06bd889774d6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 23:47:44 +0000 Subject: [PATCH 21/21] jellyfin-web: 10.8.11 -> 10.8.12 (cherry picked from commit 161368a1e485e606ca84afbd850109c3f911d1ad) --- pkgs/servers/jellyfin/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jellyfin/web.nix b/pkgs/servers/jellyfin/web.nix index 6f9d278091bb..bff9cd411aef 100644 --- a/pkgs/servers/jellyfin/web.nix +++ b/pkgs/servers/jellyfin/web.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.8.11"; + version = "10.8.12"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-Gl8eaC/AXBD956tAepwWVG3lSvL4rBCcgmkHeT/mrzM="; + hash = "sha256-T5MACoNg6yADfM7eike3f6V/ELZXrZYP+3Cz6ea8WtQ="; }; - npmDepsHash = "sha256-HoRteA6KFCFxDdwGtDKrvwWCMYNfYQWlit52RAN1eAU="; + npmDepsHash = "sha256-s+14x/jucCAxDWlQjCngjGtLB+4PCuO6R0qxP+SZ1+s="; npmBuildScript = [ "build:production" ];