From d5735a4c43254ede9d1ea9ccdb171105c1956d99 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Dec 2023 21:25:42 +0300 Subject: [PATCH 01/10] linux_testing: 6.7-rc3 -> 6.7-rc4 (cherry picked from commit 1a0ecd34372443169945c0071e80078ed3870478) --- 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 b6be53351a75..e4414e9776bf 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-rc3", - "hash": "sha256:1bi80271g76pcajzmzr0dxcmzzlzicqddm38mr7pkz8zi0070arf" + "version": "6.7-rc4", + "hash": "sha256:1igynlm5pv62brfkyjh6w8lzvmmy8c3g8phrn5wgdyy8svc48r8h" }, "6.5": { "version": "6.5.13", From 991fc48099489c6e608e5ff4cd964cf0f7d3a268 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Dec 2023 21:25:46 +0300 Subject: [PATCH 02/10] linux_6_6: 6.6.3 -> 6.6.4 (cherry picked from commit 39673d0592517121f29929d87fcb02a65cf4a205) --- 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 e4414e9776bf..e026e39c30da 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:03sk82dgvccv70i3hy8gf2hw0n4m305f7rxjw93p7jnjrbpdrp1r" }, "6.6": { - "version": "6.6.3", - "hash": "sha256:19wmjkyyv5glv1w647qisrv829hhhpba5x905a7p7kch9wyzrv98" + "version": "6.6.4", + "hash": "sha256:0i9ym5nqf704iz5674k66kn9a5hkm0y0sdhqy5c6v39xr5h9dr29" } } From 5f7ab3f53ee1b6f12b58d9ff5d469cbd0e1016ec Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Dec 2023 21:25:55 +0300 Subject: [PATCH 03/10] linux_6_1: 6.1.64 -> 6.1.65 (cherry picked from commit 18cbaa4bb7e27b7a1e785d81ca2854078a2a76ed) --- 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 e026e39c30da..e884a0a184b1 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.64", - "hash": "sha256:1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2" + "version": "6.1.65", + "hash": "sha256:02mj394ina3npp6qqinc4pc6afp5pg1rlbjc90g4p902d29jjwj0" }, "5.15": { "version": "5.15.140", From 061853165bd6b3a79f2f2b867ec6da56169aded5 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Dec 2023 21:26:01 +0300 Subject: [PATCH 04/10] linux_5_15: 5.15.140 -> 5.15.141 (cherry picked from commit cf3dda7dd939aefafb33ce7b12892e8ad966b380) --- 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 e884a0a184b1..597ec67d542c 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:02mj394ina3npp6qqinc4pc6afp5pg1rlbjc90g4p902d29jjwj0" }, "5.15": { - "version": "5.15.140", - "hash": "sha256:0isa9si9wjn10lw41431wdqsbp9y685ch5lzhwswng3g6j5ywaxy" + "version": "5.15.141", + "hash": "sha256:1yicgvq413801qrfzr0rdzwgg45dszrvfd6y9dmrhak9bk36lvck" }, "5.10": { "version": "5.10.202", From a68b8233a13f997323511f256f8c2a22dffa07a9 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Dec 2023 21:27:47 +0300 Subject: [PATCH 05/10] linux-rt_6_1: 6.1.59-rt16 -> 6.1.64-rt17 (cherry picked from commit 0b90eb978cd0c0c24a79831452c8ebb049f666a7) --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 85c8a8b8a10e..8aaf8c5ecb16 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.59-rt16"; # updated by ./update-rt.sh + version = "6.1.64-rt17"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "1860r1aan258yi2jq68bp1kdbcyy7ygc7d8g54wnc0vmqqj7fzv2"; + sha256 = "1ry7dp39010hfja1wial6r6q6ilgygwm7gdz22bg4rzaycwam7b2"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1cmgw6a8zlj89172mp85lxaksz1pvc155mj2fq59l1ry35gwb5q7"; + sha256 = "1vvn21bprsqqzmqvcmj1jx3xn1dc6kih5fib9qpcyrh0j1c7s077"; }; }; in [ rt-patch ] ++ kernelPatches; From e7944418b92dbab3de74a41d16c626619afd3ee7 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 2 Dec 2023 13:29:43 +0100 Subject: [PATCH 06/10] element-desktop: use electron version 27 Upstream switched to electron 27 in version 1.11.48 https://github.com/vector-im/element-desktop/releases/tag/v1.11.48 (cherry picked from commit 63743c5c217ed226c0d5a0b2108ab0bd558d9887) --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74a3d9283177..5e3de697c36e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4765,7 +4765,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_26; + electron = electron_27; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh From 2cc0caec048486fc0030b82c10f1ca7f30f9e750 Mon Sep 17 00:00:00 2001 From: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Sat, 2 Dec 2023 13:30:50 +0100 Subject: [PATCH 07/10] element-desktop: add jq to update script (cherry picked from commit 7f8c313f803627a18ec0c8a883d1da3fbfb9c245) --- .../networking/instant-messengers/element/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/element/update.sh b/pkgs/applications/networking/instant-messengers/element/update.sh index ca9f39c306db..f7983c1bf291 100755 --- a/pkgs/applications/networking/instant-messengers/element/update.sh +++ b/pkgs/applications/networking/instant-messengers/element/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github +#!nix-shell -I nixpkgs=../../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." From 4986bd431f5eddf3ba27988329dd83b44fc982e3 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 1 Dec 2023 22:58:22 +0100 Subject: [PATCH 08/10] gitlab: 16.5.1 -> 16.5.3 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.5.3-ee/CHANGELOG.md Fixes CVE-2023-3443 Fixes CVE-2023-3949 Fixes CVE-2023-3964 Fixes CVE-2023-4317 Fixes CVE-2023-4658 Fixes CVE-2023-4912 Fixes CVE-2023-5226 Fixes CVE-2023-5995 Fixes CVE-2023-6033 Fixes CVE-2023-6396 (cherry picked from commit 10f0ececc13f631bfe179ada2c29907da408fd12) --- .../version-management/gitlab/data.json | 14 +++++++------- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 01773299cf1b..9c708f176a91 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.5.1", - "repo_hash": "sha256-7vKdCFDgtXSTlYV9nfLuQ+LZCaGDLU9zp97rob4dj2A=", - "yarn_hash": "1df7lf2grxpfjy1vgwsxw9n310jgjb64vqcxn2a7wzgh0svr1yyf", + "version": "16.5.3", + "repo_hash": "sha256-0Tewet9A0+0wDcMWVhXMGx1zr/R2WN46h+pEP3pEkac=", + "yarn_hash": "03ryyk7dw7s8yjdx9wdrvllaydb0w5an06agkwf5npgr6x1bz3yv", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.5.1-ee", + "rev": "v16.5.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.5.1", - "GITLAB_PAGES_VERSION": "16.5.1", + "GITALY_SERVER_VERSION": "16.5.3", + "GITLAB_PAGES_VERSION": "16.5.3", "GITLAB_SHELL_VERSION": "14.29.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.4.0", - "GITLAB_WORKHORSE_VERSION": "16.5.1" + "GITLAB_WORKHORSE_VERSION": "16.5.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 8a646913b80a..d7bbf1d861e1 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.5.1"; + version = "16.5.3"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,7 +18,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-LrkFSsWIPqiEXUV5OyYkB2XUbCMXjbpcCmTacR33vOQ="; + hash = "sha256-lGwRGU24pyBypQRTvGRYaAmkVbPLaw+fSeAXJ1pyQaA="; }; vendorHash = "sha256-QLt/12P6OLpLqCINROLmzhoRpLGrB9WzME7FzhIcb0Q="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7358cc7fc7de..616a7eb02bec 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.5.1"; + version = "16.5.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-1fcsliorkl118MyUnZ3yrQjwLBQGsNBBA4dIEFHBJAI="; + hash = "sha256-eE+QuzqNm3zA0le8MWR3Kbc+/kQtKIrSd9sTmVYaNbQ="; }; vendorHash = "sha256-YG+ERETxp0BPh/V4820pMXTXu9YcodRhzme6qZJBC9Q="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a318eb3fad46..db4407fb4391 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.5.1"; + version = "16.5.3"; # nixpkgs-update: no auto update src = fetchFromGitLab { From 9256c51c250786cde501b73fed35a0abf2001163 Mon Sep 17 00:00:00 2001 From: Yaya Date: Fri, 1 Dec 2023 22:58:53 +0100 Subject: [PATCH 09/10] gitlab-container-registry: 3.85.0 -> 3.86.2 https://gitlab.com/gitlab-org/container-registry/-/blob/v3.86.2-gitlab/CHANGELOG.md (cherry picked from commit 189068ad42a3b61b1a2e96c74f3e20d14cc6d7e5) --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 44fc1630c196..2ce13dba4355 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.85.0"; + version = "3.86.2"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-F20f1qDsI+moBAL+Tpx5AALgOi0vTH7hZ5RIvRMwY1s="; + sha256 = "sha256-hZhlSZ/crwzc8KEkbMGY9zAYVbMT9p4y7Wm3B+F+iPU="; }; - vendorHash = "sha256-JWuSJD2Mi0om9vA6+mYbArfr2lmGlRua6IM0DhDzSBk="; + vendorHash = "sha256-3iBMn1kA/GZC/7FEFLd1/e7+mSsCOAo+zQo3dVpTHw4="; patches = [ ./Disable-inmemory-storage-driver-test.patch From 18230ed9b4d83aea79b6d8e6cad79c974e170110 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Tue, 5 Dec 2023 14:22:43 +0100 Subject: [PATCH 10/10] open62541: 1.3.8 -> 1.3.9 https://github.com/open62541/open62541/releases/tag/v1.3.9 (cherry picked from commit 25d8ad138414ed3aa436b79ab41f1f1d43b1f1f2) --- .../libraries/open62541/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/open62541/default.nix b/pkgs/development/libraries/open62541/default.nix index 7799c6d80ae3..571b6091645f 100644 --- a/pkgs/development/libraries/open62541/default.nix +++ b/pkgs/development/libraries/open62541/default.nix @@ -33,13 +33,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-koifSynnJX9IuwX8HUT1TzHoKgJfweNGAVlqUx7nEc4="; + hash = "sha256-FnLMR54xjIyYRqwCnvMJsNgsVwH7hVAixCNGhfIZPiw="; fetchSubmodules = true; }; @@ -92,16 +92,15 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; preCheck = let - disabledTests = - lib.optionals withPubSub [ - # "Cannot set socket option IP_ADD_MEMBERSHIP" - "pubsub_publish" - "check_pubsub_get_state" - "check_pubsub_publish_rt_levels" - "check_pubsub_subscribe_config_freeze" - "check_pubsub_subscribe_rt_levels" - "check_pubsub_multiple_subscribe_rt_levels" - ]; + disabledTests = lib.optionals withPubSub [ + # "Cannot set socket option IP_ADD_MEMBERSHIP" + "pubsub_publish" + "check_pubsub_get_state" + "check_pubsub_publish_rt_levels" + "check_pubsub_subscribe_config_freeze" + "check_pubsub_subscribe_rt_levels" + "check_pubsub_multiple_subscribe_rt_levels" + ]; regex = "^(${builtins.concatStringsSep "|" disabledTests})\$"; in lib.optionalString (disabledTests != []) '' checkFlagsArray+=(ARGS="-E ${lib.escapeRegex regex}")