From 2ded6f688a504d41948e4edf2cc37b8a7d465db1 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Wed, 19 Feb 2025 21:38:26 +0100
Subject: [PATCH 01/29] bitwarden-desktop: 2025.1.1 -> 2025.2.0 (#381008)

* bitwarden-desktop: 2025.1.1 -> 2025.2.0

* bitwarden-desktop: remove unused inputs

---------

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit b4ac7980bc0b0dadb14066bdd0be11dc876542af)
---
 .../dont-auto-setup-biometrics.patch          | 10 +++++-----
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
index b6307f43ed27..4102caca56ae 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
+++ b/pkgs/by-name/bi/bitwarden-desktop/dont-auto-setup-biometrics.patch
@@ -1,8 +1,8 @@
-diff --git a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
-index 8962e7f3ec..a7291420f2 100644
---- a/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
-+++ b/apps/desktop/src/key-management/biometrics/biometric.unix.main.ts
-@@ -109,7 +109,7 @@ export default class BiometricUnixMain implements OsBiometricService {
+diff --git a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
+index 791b4d6f88..dfee0bbf8d 100644
+--- a/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
++++ b/apps/desktop/src/key-management/biometrics/os-biometrics-linux.service.ts
+@@ -115,7 +115,7 @@ export default class OsBiometricsServiceLinux implements OsBiometricService {
      // The user needs to manually set up the polkit policy outside of the sandbox
      // since we allow access to polkit via dbus for the sandboxed clients, the authentication works from
      // the sandbox, once the policy is set up outside of the sandbox.
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 145dd67ee951..8d0903a8c02b 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -3,7 +3,7 @@
   buildNpmPackage,
   cargo,
   copyDesktopItems,
-  electron_33,
+  electron_34,
   fetchFromGitHub,
   gnome-keyring,
   jq,
@@ -23,7 +23,7 @@
 let
   description = "Secure and free password manager for all of your devices";
   icon = "bitwarden";
-  electron = electron_33;
+  electron = electron_34;
 
   bitwardenDesktopNativeArch =
     {
@@ -36,13 +36,13 @@ let
 in
 buildNpmPackage rec {
   pname = "bitwarden-desktop";
-  version = "2025.1.1";
+  version = "2025.2.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-0NXrTBkCyo9Hw+fyFTfXfa1efBlaM6xWd9Uvsbathpw=";
+    hash = "sha256-+RMeo+Kyum1WNm7citUe9Uk5yOtfhMPPlQRtnYL3Pj8=";
   };
 
   patches = [
@@ -66,8 +66,13 @@ buildNpmPackage rec {
     "--engine-strict"
     "--legacy-peer-deps"
   ];
+
+  npmRebuildFlags = [
+    # FIXME one of the esbuild versions fails to download @esbuild/linux-x64
+    "--ignore-scripts"
+  ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-DDsPkvLGOhjmdYEOmhZfe4XHGFyowvWO24YcCA5griM=";
+  npmDepsHash = "sha256-fYZJA6qV3mqxO2g+yxD0MWWQc9QYmdWJ7O7Vf88Qpbs=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
@@ -79,7 +84,7 @@ buildNpmPackage rec {
     ) patches;
     patchFlags = [ "-p4" ];
     sourceRoot = "${src.name}/${cargoRoot}";
-    hash = "sha256-IL8+n+rhRbvRO1jxJSy9PjUMb/tI4S/gzpUNOojBPWk=";
+    hash = "sha256-OldVFMI+rcGAbpDg7pHu/Lqbw5I6/+oXULteQ9mXiFc=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 
@@ -162,7 +167,7 @@ buildNpmPackage rec {
     # This may break in the future but its better than copy-pasting it manually.
     mkdir -p $out/share/polkit-1/actions/
     pushd apps/desktop/src/key-management/biometrics
-    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' biometric.unix.main.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
+    awk '/const polkitPolicy = `/{gsub(/^.*`/, ""); print; str=1; next} str{if (/`;/) str=0; gsub(/`;/, ""); print}' os-biometrics-linux.service.ts > $out/share/polkit-1/actions/com.bitwarden.Bitwarden.policy
     popd
 
     pushd apps/desktop/resources/icons

From 62bf6bf228eb84c5625dabf8d1ee22568705af8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Mar 2025 14:12:35 +0000
Subject: [PATCH 02/29] teams-for-linux: 1.12.7 -> 1.12.8

(cherry picked from commit 24bda1f07b1be07803e6f30047532ab9ada94ae0)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 49257ac739c7..82857a690835 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -15,16 +15,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "1.12.7";
+  version = "1.12.8";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-26YNDXZUMQA3AuRPTxB+X8hg2IEYvAGBHvzIAxSL3nk=";
+    hash = "sha256-OXrkv5xEjwiC/fzLY+KFD48VAnJ5fXgGfOTPV+LuF5g=";
   };
 
-  npmDepsHash = "sha256-Vu7VAV8hoQKqa8d2hMaNlBB4e8HA0h4ySc1qsYn8M6o=";
+  npmDepsHash = "sha256-AjljadHGDOI358mO5iCV8yXOvRn6XlwN4IPiussJWRU=";
 
   nativeBuildInputs = [
     makeWrapper

From 5a8954b2393d18bc7fe173efa7162c32ad7aaa6d Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 9 Mar 2025 10:19:44 -0500
Subject: [PATCH 03/29] teams-for-linux: 1.12.8 -> 1.13.0

(cherry picked from commit 39af0e4bc18f91e383df3873a1d064cd8a605645)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 82857a690835..13c61ec71a0c 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   alsa-utils,
   copyDesktopItems,
-  electron_33,
+  electron_34,
   makeDesktopItem,
   makeWrapper,
   nix-update-script,
@@ -15,16 +15,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "1.12.8";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-OXrkv5xEjwiC/fzLY+KFD48VAnJ5fXgGfOTPV+LuF5g=";
+    hash = "sha256-m2zJoJBjbeTU+WlZeH8R84mYKsxpUxN93SKOIVCjoj4=";
   };
 
-  npmDepsHash = "sha256-AjljadHGDOI358mO5iCV8yXOvRn6XlwN4IPiussJWRU=";
+  npmDepsHash = "sha256-TNX6QikNs/TI/Wt+eHIMwwORjjFIVAa1J/vHiOkHQXU=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -42,7 +42,7 @@ buildNpmPackage rec {
   buildPhase = ''
     runHook preBuild
 
-    cp -r ${electron_33.dist} electron-dist
+    cp -r ${electron_34.dist} electron-dist
     chmod -R u+w electron-dist
 
     npm exec electron-builder -- \
@@ -50,7 +50,7 @@ buildNpmPackage rec {
         -c.npmRebuild=true \
         -c.asarUnpack="**/*.node" \
         -c.electronDist=electron-dist \
-        -c.electronVersion=${electron_33.version}
+        -c.electronVersion=${electron_34.version}
 
     runHook postBuild
   '';
@@ -72,7 +72,7 @@ buildNpmPackage rec {
       popd
 
       # Linux needs 'aplay' for notification sounds
-      makeWrapper '${lib.getExe electron_33}' "$out/bin/teams-for-linux" \
+      makeWrapper '${lib.getExe electron_34}' "$out/bin/teams-for-linux" \
         --prefix PATH : ${
           lib.makeBinPath [
             alsa-utils

From 282331143fa8d0dc402174ecfb6e264e3523d13c Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 23 Mar 2025 10:19:14 -0500
Subject: [PATCH 04/29] teams-for-linux: 1.13.0 -> 1.13.1

Changelog
https://github.com/IsmaelMartinez/teams-for-linux/releases/tag/v1.13.1

(cherry picked from commit 812639024520644082c7946fe40180aa53c6e3f5)
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 13c61ec71a0c..88d3634b3af8 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -15,16 +15,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-m2zJoJBjbeTU+WlZeH8R84mYKsxpUxN93SKOIVCjoj4=";
+    hash = "sha256-0u5UyhRSa4gsLVQLctWMZe/oE8l9jrwCzkPtLWv2xlo=";
   };
 
-  npmDepsHash = "sha256-TNX6QikNs/TI/Wt+eHIMwwORjjFIVAa1J/vHiOkHQXU=";
+  npmDepsHash = "sha256-BHz1+pd88TDfTXtG0gl5kYiDeG/M94pYdpPtwBrBYzQ=";
 
   nativeBuildInputs = [
     makeWrapper

From bd19d122bac78abc9f9f29263ab7b202c29710e8 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 13 May 2025 15:34:20 +0200
Subject: [PATCH 05/29] rundeck: 5.11.1 -> 5.12.0

(cherry picked from commit b3405fc2d076d6a6a1ac34ce31387005e13d26d3)
---
 pkgs/by-name/ru/rundeck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index 914495c525b6..34cf6342c00f 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.11.1-20250415";
+  version = "5.12.0-20250512";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-WOxY2GGtll+2xkSbJUKOvgsr408nIvRcEuBULcawijc=";
+    hash = "sha256-LsKxMj+XCKTAMC3aIRnJcJkc2jytfTfu/gi0omGkMEk=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 842d9ba4e5dcdb76a6965f95f8400f4ee8f900c8 Mon Sep 17 00:00:00 2001
From: Christian Theune <ct@flyingcircus.io>
Date: Tue, 14 Jan 2025 16:56:17 +0100
Subject: [PATCH 06/29] varnish76: init at 7.6.1

(cherry picked from commit 0129b83a02516278fdcf123343034f6744767ad6)
---
 nixos/tests/all-tests.nix         | 1 +
 pkgs/servers/varnish/default.nix  | 5 +++++
 pkgs/servers/varnish/modules.nix  | 4 ++++
 pkgs/servers/varnish/packages.nix | 5 +++++
 pkgs/top-level/all-packages.nix   | 2 ++
 5 files changed, 17 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index a20b85838e77..682cdce5b769 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1185,6 +1185,7 @@ in
   v2ray = handleTest ./v2ray.nix { };
   varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
   varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
+  varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
   vault = handleTest ./vault.nix { };
   vault-agent = handleTest ./vault-agent.nix { };
   vault-dev = handleTest ./vault-dev.nix { };
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 17bc57781e69..f632049baf7e 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -110,4 +110,9 @@ in
       })
     ];
   };
+  # EOL 2025-09-15
+  varnish76 = common {
+    version = "7.6.1";
+    hash = "sha256-Wpu1oUn/J4Z7VKZs4W0qS5Pt/6VHPLh8nHH3aZz4Rbo=";
+  };
 }
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index 225d5c5e9f42..d51a2dae3f7c 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -59,4 +59,8 @@ in
     version = "0.24.0";
     hash = "sha256-2MfcrhhkBz9GyQxEWzjipdn1CBEqnCvC3t1G2YSauak=";
   };
+  modules25 = common {
+    version = "0.25.0";
+    hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
+  };
 }
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index f5d72f8226da..114e3db4b131 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -3,6 +3,7 @@
   callPackage,
   varnish60,
   varnish75,
+  varnish76,
 }:
 {
   varnish60Packages = rec {
@@ -23,4 +24,8 @@
     varnish = varnish75;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules24;
   };
+  varnish76Packages = rec {
+    varnish = varnish76;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f16e8d53fd55..56edb1e896e5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6258,10 +6258,12 @@ with pkgs;
   inherit (callPackages ../servers/varnish { })
     varnish60
     varnish75
+    varnish76
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
     varnish75Packages
+    varnish76Packages
     ;
 
   varnishPackages = varnish75Packages;

From adb6db2c6b9ffb3760ad792f6fcad7dfaf868100 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 29 Mar 2025 15:48:34 +0100
Subject: [PATCH 07/29] varnish76: 7.6.1 -> 7.6.2

Fixes CVE-2025-30346.
https://varnish-cache.org/security/VSV00015.html

https://github.com/varnishcache/varnish-cache/blob/7.6/doc/changes.rst#varnish-cache-762-2025-03-17
(cherry picked from commit a852293083619d88f7da911efbd566b4c94017c1)
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index f632049baf7e..f342d9d752b6 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -112,7 +112,7 @@ in
   };
   # EOL 2025-09-15
   varnish76 = common {
-    version = "7.6.1";
-    hash = "sha256-Wpu1oUn/J4Z7VKZs4W0qS5Pt/6VHPLh8nHH3aZz4Rbo=";
+    version = "7.6.2";
+    hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
   };
 }

From e93de65b207242dc84ba68ff7850682f7fa3580c Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 15 May 2025 09:50:23 +0200
Subject: [PATCH 08/29] varnish77: init at 7.7.0

(cherry picked from commit 98d6f4dc0afc6b2e9e50b28337125cf7ffe55dfb)
---
 nixos/tests/all-tests.nix         | 1 +
 pkgs/servers/varnish/default.nix  | 5 +++++
 pkgs/servers/varnish/modules.nix  | 4 ++++
 pkgs/servers/varnish/packages.nix | 5 +++++
 pkgs/top-level/all-packages.nix   | 2 ++
 5 files changed, 17 insertions(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 682cdce5b769..ad3f1de0eb65 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1186,6 +1186,7 @@ in
   varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
   varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
   varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
+  varnish77 = handleTest ./varnish.nix { package = pkgs.varnish77; };
   vault = handleTest ./vault.nix { };
   vault-agent = handleTest ./vault-agent.nix { };
   vault-dev = handleTest ./vault-dev.nix { };
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index f342d9d752b6..d9d373219af8 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -115,4 +115,9 @@ in
     version = "7.6.2";
     hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
   };
+  # EOL 2026-03-15
+  varnish77 = common {
+    version = "7.7.0";
+    hash = "sha256-aZSPIVEfgc548JqXFdmodQ6BEWGb1gVaPIYTFaIQtOQ=";
+  };
 }
diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix
index d51a2dae3f7c..46223e939f40 100644
--- a/pkgs/servers/varnish/modules.nix
+++ b/pkgs/servers/varnish/modules.nix
@@ -63,4 +63,8 @@ in
     version = "0.25.0";
     hash = "sha256-m/7moizVyvoP8xnpircAFVUqCmCfTGkgVyRc6zkdVsk=";
   };
+  modules26 = common {
+    version = "0.26.0";
+    hash = "sha256-xKMOkqm6/GoBve0AhPqyVMQv/oh5Rtj6uCeg/yId7BU=";
+  };
 }
diff --git a/pkgs/servers/varnish/packages.nix b/pkgs/servers/varnish/packages.nix
index 114e3db4b131..85d9fb6bd3a3 100644
--- a/pkgs/servers/varnish/packages.nix
+++ b/pkgs/servers/varnish/packages.nix
@@ -4,6 +4,7 @@
   varnish60,
   varnish75,
   varnish76,
+  varnish77,
 }:
 {
   varnish60Packages = rec {
@@ -28,4 +29,8 @@
     varnish = varnish76;
     modules = (callPackages ./modules.nix { inherit varnish; }).modules25;
   };
+  varnish77Packages = rec {
+    varnish = varnish77;
+    modules = (callPackages ./modules.nix { inherit varnish; }).modules26;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 56edb1e896e5..2450dc2ba7f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6259,11 +6259,13 @@ with pkgs;
     varnish60
     varnish75
     varnish76
+    varnish77
     ;
   inherit (callPackages ../servers/varnish/packages.nix { })
     varnish60Packages
     varnish75Packages
     varnish76Packages
+    varnish77Packages
     ;
 
   varnishPackages = varnish75Packages;

From 82bfd0e19290b8e8f715ff198b99c4b6e3a1b3f8 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 14 May 2025 13:38:38 +0200
Subject: [PATCH 09/29] varnish60: 6.0.13 -> 6.0.14

https://www.openwall.com/lists/oss-security/2025/05/13/5
(cherry picked from commit 495d053a6f3e66ad0e2bd0c682836dd1413d9e3d)
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index d9d373219af8..91eac7da3ced 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -95,8 +95,8 @@ in
 {
   # EOL (LTS) TBA
   varnish60 = common {
-    version = "6.0.13";
-    hash = "sha256-DcpilfnGnUenIIWYxBU4XFkMZoY+vUK/6wijZ7eIqbo=";
+    version = "6.0.14";
+    hash = "sha256-tZlBf3ppntxxYSufEJ86ot6ujvnbfIyZOu9B3kDJ72k=";
   };
   # EOL 2025-03-15
   varnish75 = common {

From b3a468f26364321a77470a477082510dc61f1b06 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 14 May 2025 14:11:04 +0200
Subject: [PATCH 10/29] varnish76: 7.6.2 -> 7.6.3

https://www.openwall.com/lists/oss-security/2025/05/13/5
(cherry picked from commit ae36141147442523ad611f45080566e33dcb7b65)
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 91eac7da3ced..20f82a117b41 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -112,8 +112,8 @@ in
   };
   # EOL 2025-09-15
   varnish76 = common {
-    version = "7.6.2";
-    hash = "sha256-OFxhDsxj3P61PXb0fMRl6J6+J9osCSJvmGHE+o6dLJo=";
+    version = "7.6.3";
+    hash = "sha256-JwP2Ru6JO3iEa8t91LlrKPkSX7iq9+ilaS2k3+SEVGc=";
   };
   # EOL 2026-03-15
   varnish77 = common {

From e790c3b03faadaa8e6694ad6165d56d32a212953 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 14 May 2025 14:28:49 +0200
Subject: [PATCH 11/29] varnish77: 7.7.0 -> 7.7.1

https://www.openwall.com/lists/oss-security/2025/05/13/5
(cherry picked from commit 8e09e92f117a8a1eaab47df4daa06aefe336f34b)
---
 pkgs/servers/varnish/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 20f82a117b41..bbc10e531974 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -117,7 +117,7 @@ in
   };
   # EOL 2026-03-15
   varnish77 = common {
-    version = "7.7.0";
-    hash = "sha256-aZSPIVEfgc548JqXFdmodQ6BEWGb1gVaPIYTFaIQtOQ=";
+    version = "7.7.1";
+    hash = "sha256-TAbFyZaApCm3KTT5/VE5Y/fhuoVTszyn7BLIWlwrdRo=";
   };
 }

From 4d0161235249ce2ebc16f51a7fb8878d749c2866 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Thu, 27 Feb 2025 17:45:48 -0300
Subject: [PATCH 12/29] xen: patch with XSA-467

When setting up interrupt remapping for legacy PCI(-X) devices,
including PCI(-X) bridges, a lookup of the upstream bridge is required.
This lookup, itself involving acquiring of a lock, is done in a context
where acquiring that lock is unsafe. This can lead to a deadlock.

The passing through of certain kinds of devices to an unprivileged guest
can result in a Denial of Service (DoS) affecting the entire host.

Note: Normal usage of such devices by a privileged domain can also
      trigger the issue.  In such a scenario, the deadlock is not
      considered a security issue, but just a plain bug.

Systems with Intel IOMMU hardware (VT-d) are affected.  Systems using
AMD or non-x86 hardware are not affected.

Only systems where certain kinds of devices are passed through to an
unprivileged guest are vulnerable.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>

(cherry picked from commit 5af1d19112213970bfec2319514b17aa3ac868c2)
---
 pkgs/by-name/xe/xen/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index b77a181c3c13..8383d175ad1a 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -12,6 +12,10 @@ buildXenPackage.override { inherit python3Packages; } {
       url = "https://lore.kernel.org/xen-devel/e2caa6648a0b6c429349a9826d8fbc4338222482.1733766758.git.andrii.sultanov@cloud.com/raw";
       hash = "sha256-JC1ueXuC1Jdi2gtUsjOHmTeEx56zjotMMLde5vBonxc=";
     })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
+      hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
+    })
   ];
   rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
   hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";

From 4afab2e126ae55991a893c03f2fa7ecc89621c19 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Mon, 12 May 2025 14:09:17 -0300
Subject: [PATCH 13/29] xen: patch with XSA-469

Researchers at VU Amsterdam have released Training Solo, detailing
several speculative attacks which bypass current protections.

One issue, which Intel has named Indirect Target Selection, is a bug in
the hardware support for prediction-domain isolation.  The mitigation
for this involves both microcode and software changes in Xen.

For more details, see:
1.  https://vusec.net/projects/training-solo
2.  https://www.intel.com/content/www/us/en/developer/articles/technical/software-security-guidance/advisory-guidance/indirect-target-selection.html

Another issue discussed in the Training Solo paper pertains to
classic-BPF.  Xen does not have any capability similar to BPF filters,
so is not believed to be affected by this issue.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>

(cherry picked from commit c29710d4ad60296481c0702da4790a2250f2a7ed)
---
 pkgs/by-name/xe/xen/package.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 8383d175ad1a..e5fffebe293b 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -16,6 +16,34 @@ buildXenPackage.override { inherit python3Packages; } {
       url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
       hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
     })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
+      hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-02.patch";
+      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-03.patch";
+      hash = "sha256-UkYMSpUgFvr4GJPXLgQsCyppGkNbeiFMyCZORK5tfmA=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-04.patch";
+      hash = "sha256-lpiDPSHi+v2VfaWE9kp4+hveZKTzojD1F+RHsOtKE3A=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-05.patch";
+      hash = "sha256-EKo9a5STX0mTRopoThe3+6gCWat+3XbguLr9QgMheZs=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-06.patch";
+      hash = "sha256-HU+4apyTZNIFZ9cySOEtNh0JBJDG3LjDLwMvQYq0src=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch";
+      hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
+    })
   ];
   rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
   hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";

From c5a7c999afff10a47bc55a797e4a08182ce76679 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 11 Apr 2025 01:30:18 +0000
Subject: [PATCH 14/29] libplctag: 2.6.3 -> 2.6.4

(cherry picked from commit 8ff91b07530766f253ceba81b7aa8d37640d7fa4)
---
 pkgs/by-name/li/libplctag/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libplctag/package.nix b/pkgs/by-name/li/libplctag/package.nix
index b83fb999b2aa..15a07807b564 100644
--- a/pkgs/by-name/li/libplctag/package.nix
+++ b/pkgs/by-name/li/libplctag/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libplctag";
-  version = "2.6.3";
+  version = "2.6.4";
 
   src = fetchFromGitHub {
     owner = "libplctag";
     repo = "libplctag";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HUog7Tlm4jiqYXk22dziumCA/68c35+OwnTNYu9mV5E=";
+    hash = "sha256-pk+N78MITI8G+LHyc6fXhqWeLyCOdUEkPePM2RtpMCE=";
   };
 
   env = {

From eac64c6d01e42effd3b3b9ba3bb4b228d54226f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 May 2025 12:55:36 +0000
Subject: [PATCH 15/29] syslogng: 4.8.1 -> 4.8.2

(cherry picked from commit 233d20f90d208c187d3ea8b0e5104d024d3841dd)
---
 pkgs/by-name/sy/syslogng/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sy/syslogng/package.nix b/pkgs/by-name/sy/syslogng/package.nix
index 055b5a2b9062..f102f9146cca 100644
--- a/pkgs/by-name/sy/syslogng/package.nix
+++ b/pkgs/by-name/sy/syslogng/package.nix
@@ -66,13 +66,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "syslog-ng";
-  version = "4.8.1";
+  version = "4.8.2";
 
   src = fetchFromGitHub {
     owner = "syslog-ng";
     repo = "syslog-ng";
     rev = "syslog-ng-${finalAttrs.version}";
-    hash = "sha256-YdGbDpGMC0DPuPSbfe9HvZshBVdv1s1+hiHDnhYbs6Q=";
+    hash = "sha256-iWH64e5LBEiIy/A5N8pfOkjbn9wbmAswk2NhGyJ63f8=";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [

From f299e1c6f738df90ca38f3d322c4004a3e5e192b Mon Sep 17 00:00:00 2001
From: Jon Seager <jon@sgrs.uk>
Date: Fri, 16 May 2025 08:21:20 +0200
Subject: [PATCH 16/29] google-chrome: 136.0.7103.59 -> 136.0.7103.113

(cherry picked from commit 09cbcfa99c7ea35f4dd8c3a070b37bdb718483b5)
---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 2e3b9602e958..bcab2f1a7d9b 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -171,11 +171,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "136.0.7103.59";
+    version = "136.0.7103.113";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-dki7Ci91OpqMtgS84ynsxBWoB862t+eWFlxHvZUAUjc=";
+      hash = "sha256-BnKKu7X34g+zg4rDqjVXT3Kx2E8Gn5ELqs3LQS3GCkg=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -274,11 +274,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "136.0.7103.49";
+    version = "136.0.7103.114";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/dz4uae22obgiqcnhey5k6wspvu_136.0.7103.49/GoogleChrome-136.0.7103.49.dmg";
-      hash = "sha256-4eGfwVdts+tW4ouUKZg1EvnSYOu6CCBRMYie2hz2y00=";
+      url = "http://dl.google.com/release2/chrome/iwktnyywqpn7dye3zjzgosvevq_136.0.7103.114/GoogleChrome-136.0.7103.114.dmg";
+      hash = "sha256-myJawlgVBQlLtgBfSfCL5XfdnH8d7xd+j8JV2+2MZ/s=";
     };
 
     dontPatch = true;

From 7e734188fd640fae1543ad228f3685eae7ae769c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 11 May 2025 18:09:53 +0000
Subject: [PATCH 17/29] microsoft-edge: 135.0.3179.85 -> 136.0.3240.64

(cherry picked from commit ad4019c3aea14a3ceca9879faf00e0bde038afb2)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 64d6036d27d0..4f9da394768c 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -174,11 +174,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "135.0.3179.85";
+  version = "136.0.3240.64";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-x1YpKsvj2Jx1/VE13eE/aCkv+b7rGOQo4xcRYu2GQGA=";
+    hash = "sha256-zyoupNdtXK5mvI5oyp9AJVrWwYlMKOVaaBOnDOjHO0o=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 480ecdd1b53477c8038a17581ce2856449d09e57 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 16 May 2025 12:37:03 +0000
Subject: [PATCH 18/29] microsoft-edge: 136.0.3240.64 -> 136.0.3240.76

(cherry picked from commit 75500d4f1a1e62df4939f1702aea338109711377)
---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 4f9da394768c..eb36fbeded8f 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -174,11 +174,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "136.0.3240.64";
+  version = "136.0.3240.76";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-zyoupNdtXK5mvI5oyp9AJVrWwYlMKOVaaBOnDOjHO0o=";
+    hash = "sha256-biNM1exJ/xUcmhZjH7ZcFF9cYVqsPavbbtsJnRVlyFo=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 669f84d19213913189fc0a2e57108b662baaf08a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 16 May 2025 08:38:17 -0400
Subject: [PATCH 19/29] maintainers: remove zanculmarktum

https://github.com/NixOS/nixpkgs/pull/402413#issuecomment-2886577999
(cherry picked from commit 85c70ac44f2e06818201f211e9ccf5578b2a5379)
---
 maintainers/maintainer-list.nix            | 6 ------
 pkgs/by-name/mi/microsoft-edge/package.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 633d157cfb15..f74ba0a54804 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24672,12 +24672,6 @@
     githubId = 5986078;
     name = "Zunway Liang";
   };
-  zanculmarktum = {
-    name = "Azure Zanculmarktum";
-    email = "zanculmarktum@gmail.com";
-    github = "zanculmarktum";
-    githubId = 16958511;
-  };
   zane = {
     name = "Zane van Iperen";
     email = "zane@zanevaniperen.com";
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index eb36fbeded8f..c75fcb09e023 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -284,7 +284,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.unfree;
     mainProgram = "microsoft-edge";
     maintainers = with lib.maintainers; [
-      zanculmarktum
       kuwii
       rhysmdnz
     ];

From e77330cc2ac292489f5c26063cbff3216b5cefe0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 15 May 2025 15:04:44 +0200
Subject: [PATCH 20/29] nextcloud30: 30.0.10 -> 30.0.11

ChangeLog: https://github.com/nextcloud/server/releases/tag/v30.0.11
(cherry picked from commit a726df9405409e8190033eca535993439166800f)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index a7f0396cc715..bf60a05a7a34 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -73,8 +73,8 @@ in
   };
 
   nextcloud30 = generic {
-    version = "30.0.10";
-    hash = "sha256-40ldF8X1yRZFQtk/Y21pasyPOLYL7HDPGtLnnHbZlbo=";
+    version = "30.0.11";
+    hash = "sha256-WEJ3LV1xLxBdyPFdZ4hFnmFEuDbMiKBiyQU3CiZUN3o=";
     packages = nextcloud30Packages;
   };
 

From 007be4ad359204709cc896bc8be796dc5dc84ceb Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 15 May 2025 15:05:09 +0200
Subject: [PATCH 21/29] nextcloud31: 31.0.4 -> 31.0.5

ChangeLog: https://github.com/nextcloud/server/releases/tag/v31.0.5
(cherry picked from commit e6a91e9019fa4d294d179610a1f21364dde8eb50)
---
 pkgs/servers/nextcloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index bf60a05a7a34..de8bf5c4f866 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -79,8 +79,8 @@ in
   };
 
   nextcloud31 = generic {
-    version = "31.0.4";
-    hash = "sha256-pHVBVm1casb2Pk9hfifaKVFW2kfaos0i7uNAD9KtElE=";
+    version = "31.0.5";
+    hash = "sha256-Iii49STc2H8IoqkoHUGwT1y1ALdiS8jI4HuOMDkGFQM=";
     packages = nextcloud31Packages;
   };
 

From a1b8c658c03242e941bb9a471f4d46d590ecacf9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 15 May 2025 15:09:29 +0200
Subject: [PATCH 22/29] nextcloudPackages: update

(cherry picked from commit 292a46f1e083a9538790d195dfaac324da9f19e6)
---
 pkgs/servers/nextcloud/packages/30.json | 60 ++++++++++-----------
 pkgs/servers/nextcloud/packages/31.json | 72 ++++++++++++++-----------
 2 files changed, 71 insertions(+), 61 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/30.json b/pkgs/servers/nextcloud/packages/30.json
index 2ebf9c40cfae..e8f68dd0f177 100644
--- a/pkgs/servers/nextcloud/packages/30.json
+++ b/pkgs/servers/nextcloud/packages/30.json
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-tzlJJsP3uDA57LuOtfbYjd5yu2fkEunTqDM90LxVgnI=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.1/calendar-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "hash": "sha256-z/BMKay9Fj+aIypPA9cbEJ6dcB03oGPhy2TSGHJeRz0=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.4/calendar-v5.2.4.tar.gz",
+    "version": "5.2.4",
     "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-1BEK5T+6w8yLSXyj/Me8QMls/LSWaor5TpvC2HK3/4U=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.1/collectives-2.16.1.tar.gz",
-    "version": "2.16.1",
+    "hash": "sha256-U6EQumuN7b309JtaWwdbluQcK7Gpt5O6q9fJu6qyVhE=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v2.17.0/collectives-2.17.0.tar.gz",
+    "version": "2.17.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-3G1di/PnOAIML2vwKglmuMApvn8+nXYjdqnySSSoLDI=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.0.6/contacts-v7.0.6.tar.gz",
-    "version": "7.0.6",
+    "hash": "sha256-OYObGIEAViBMWesL/kNv4FHO7SSa73rdVjklwuyPSrY=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.0/contacts-v7.1.0.tar.gz",
+    "version": "7.1.0",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -70,9 +70,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-Rb8VSCy/jL9U02mh2FBBK45nahMU6A90BFtKlLs4nNI=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.4/deck-v1.14.4.tar.gz",
-    "version": "1.14.4",
+    "hash": "sha256-A2n68T7x4la4VrMwsBMIWk6LWM4nge9FtQhl5eLp8jQ=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.14.5/deck-v1.14.5.tar.gz",
+    "version": "1.14.5",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -110,9 +110,9 @@
     ]
   },
   "files_retention": {
-    "hash": "sha256-krJOb925AjmnwmkFYg00eC4KmICr4Tf3jUANYWTRJdA=",
-    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v1.19.0/files_retention-v1.19.0.tar.gz",
-    "version": "1.19.0",
+    "hash": "sha256-1Ga6l+k+QWyFxcR65Zf9aCXgIe6uSAwofTcsCvFN530=",
+    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v1.19.1/files_retention-v1.19.1.tar.gz",
+    "version": "1.19.1",
     "description": "An app for Nextcloud to control automatic deletion of files after a given time.\nOptionally the users can be informed the day before.",
     "homepage": "https://github.com/nextcloud/files_retention",
     "licenses": [
@@ -190,18 +190,18 @@
     ]
   },
   "mail": {
-    "hash": "sha256-AV0vrDU4zeg7AQQpJkj5mHQatxCa2RMON5tY4Q/OjyM=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.0.0/mail-v5.0.0.tar.gz",
-    "version": "5.0.0",
-    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
+    "hash": "sha256-uDig7ySWlx7WqYzjB9H45p3a9EfUFxY3Es0dso6uQJs=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.0.7/mail-v5.0.7.tar.gz",
+    "version": "5.0.7",
+    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
       "agpl"
     ]
   },
   "maps": {
-    "hash": "sha256-/uoM29jXqeOvOJBu3xhv+KgqPE7T03pV269fdr2Er+0=",
-    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-2-nightly/maps-1.6.0-2-nightly.tar.gz",
+    "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",
     "version": "1.6.0",
     "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
     "homepage": "https://github.com/nextcloud/maps",
@@ -320,9 +320,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-4J4tEwwVjSUgJa6A1Luz8u0x8wjlkA6nukaqtt1VOZc=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.6/richdocuments-v8.5.6.tar.gz",
-    "version": "8.5.6",
+    "hash": "sha256-vvZZE76NLNgrqwufVV/FVp09W8udJvY6iWzxxMuLCU0=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.5.7/richdocuments-v8.5.7.tar.gz",
+    "version": "8.5.7",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -400,9 +400,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-qEsUJG63j+VRZc+tqeX4iTEs9/GIVsTsyeFEOwSBYCg=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.1.0/user_oidc-v7.1.0.tar.gz",
-    "version": "7.1.0",
+    "hash": "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz",
+    "version": "7.2.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -410,9 +410,9 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-i9V8fmmmed0rVKRNtYJysqJReuGPjE54GP5K5wN0+Ok=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.5.0/user_saml-v6.5.0.tar.gz",
-    "version": "6.5.0",
+    "hash": "sha256-MS1+fiDTufQXtKCG/45B2hQEfAVbsZb+TZb74f4EvAE=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.6.0/user_saml-v6.6.0.tar.gz",
+    "version": "6.6.0",
     "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index d0e64a42baf2..0377da7ebd7c 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -20,9 +20,9 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-tzlJJsP3uDA57LuOtfbYjd5yu2fkEunTqDM90LxVgnI=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.1/calendar-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "hash": "sha256-z/BMKay9Fj+aIypPA9cbEJ6dcB03oGPhy2TSGHJeRz0=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.2.4/calendar-v5.2.4.tar.gz",
+    "version": "5.2.4",
     "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-1BEK5T+6w8yLSXyj/Me8QMls/LSWaor5TpvC2HK3/4U=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v2.16.1/collectives-2.16.1.tar.gz",
-    "version": "2.16.1",
+    "hash": "sha256-U6EQumuN7b309JtaWwdbluQcK7Gpt5O6q9fJu6qyVhE=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v2.17.0/collectives-2.17.0.tar.gz",
+    "version": "2.17.0",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-3G1di/PnOAIML2vwKglmuMApvn8+nXYjdqnySSSoLDI=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.0.6/contacts-v7.0.6.tar.gz",
-    "version": "7.0.6",
+    "hash": "sha256-OYObGIEAViBMWesL/kNv4FHO7SSa73rdVjklwuyPSrY=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.1.0/contacts-v7.1.0.tar.gz",
+    "version": "7.1.0",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -70,9 +70,9 @@
     ]
   },
   "deck": {
-    "hash": "sha256-MDh3g8K6xnJ9fgPzOR3BnDdzlVGbU3uvloirVI+970A=",
-    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.0/deck-v1.15.0.tar.gz",
-    "version": "1.15.0",
+    "hash": "sha256-VUdHoLYyCg7DsNu2LYZelmcHM4B0cfkH8PwcTK844mo=",
+    "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.15.1/deck-v1.15.1.tar.gz",
+    "version": "1.15.1",
     "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized",
     "homepage": "https://github.com/nextcloud/deck",
     "licenses": [
@@ -110,9 +110,9 @@
     ]
   },
   "files_retention": {
-    "hash": "sha256-CwwYfezQUWhNkc7VpGkY+gJQTxEdtPnhxFAAQKkkaSM=",
-    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v2.0.0/files_retention-v2.0.0.tar.gz",
-    "version": "2.0.0",
+    "hash": "sha256-XsfqryUxaevIjUK5rE97UEMK2vm2J5cYCMM3RUU0SaI=",
+    "url": "https://github.com/nextcloud-releases/files_retention/releases/download/v2.0.1/files_retention-v2.0.1.tar.gz",
+    "version": "2.0.1",
     "description": "An app for Nextcloud to control automatic deletion of files after a given time.\nOptionally the users can be informed the day before.",
     "homepage": "https://github.com/nextcloud/files_retention",
     "licenses": [
@@ -190,15 +190,25 @@
     ]
   },
   "mail": {
-    "hash": "sha256-AV0vrDU4zeg7AQQpJkj5mHQatxCa2RMON5tY4Q/OjyM=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.0.0/mail-v5.0.0.tar.gz",
-    "version": "5.0.0",
-    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
+    "hash": "sha256-uDig7ySWlx7WqYzjB9H45p3a9EfUFxY3Es0dso6uQJs=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.0.7/mail-v5.0.7.tar.gz",
+    "version": "5.0.7",
+    "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
       "agpl"
     ]
   },
+  "maps": {
+    "hash": "sha256-E0S/CwXyye19lcuiONEQCyHJqlL0ZG1A9Q7oOTEZH1g=",
+    "url": "https://github.com/nextcloud/maps/releases/download/v1.6.0-3-nightly/maps-1.6.0-3-nightly.tar.gz",
+    "version": "1.6.0",
+    "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.",
+    "homepage": "https://github.com/nextcloud/maps",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "memories": {
     "hash": "sha256-BfxJDCGsiRJrZWkNJSQF3rSFm/G3zzQn7C6DCETSzw4=",
     "url": "https://github.com/pulsejet/memories/releases/download/v7.5.2/memories.tar.gz",
@@ -310,9 +320,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-jwwp3nnHxxO31dNwfv4OG6sPmTO2VmnFzNxylMVNVYo=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.6.4/richdocuments-v8.6.4.tar.gz",
-    "version": "8.6.4",
+    "hash": "sha256-fxVopw6n+0wU+OMiR3QFw1c/8YrzVMTtFfRharvNl0A=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.6.5/richdocuments-v8.6.5.tar.gz",
+    "version": "8.6.5",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -330,9 +340,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-lNct7bAJ7uyucSUvBwcDf3lPJiKx3N2k7+fi5Y5xLqg=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.0.2/spreed-v21.0.2.tar.gz",
-    "version": "21.0.2",
+    "hash": "sha256-O0W1olbpau+GjYdND/IYMl3GJntsG9p51VRbmRWksTI=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v21.0.4/spreed-v21.0.4.tar.gz",
+    "version": "21.0.4",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -380,9 +390,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-qEsUJG63j+VRZc+tqeX4iTEs9/GIVsTsyeFEOwSBYCg=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.1.0/user_oidc-v7.1.0.tar.gz",
-    "version": "7.1.0",
+    "hash": "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz",
+    "version": "7.2.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -390,9 +400,9 @@
     ]
   },
   "user_saml": {
-    "hash": "sha256-i9V8fmmmed0rVKRNtYJysqJReuGPjE54GP5K5wN0+Ok=",
-    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.5.0/user_saml-v6.5.0.tar.gz",
-    "version": "6.5.0",
+    "hash": "sha256-MS1+fiDTufQXtKCG/45B2hQEfAVbsZb+TZb74f4EvAE=",
+    "url": "https://github.com/nextcloud-releases/user_saml/releases/download/v6.6.0/user_saml-v6.6.0.tar.gz",
+    "version": "6.6.0",
     "description": "Using the SSO & SAML app of your Nextcloud you can make it easily possible to integrate your existing Single-Sign-On solution with Nextcloud. In addition, you can use the Nextcloud LDAP user provider to keep the convenience for users. (e.g. when sharing)\nThe following providers are supported and tested at the moment:\n\n* **SAML 2.0**\n\t* OneLogin\n\t* Shibboleth\n\t* Active Directory Federation Services (ADFS)\n\n* **Authentication via Environment Variable**\n\t* Kerberos (mod_auth_kerb)\n\t* Any other provider that authenticates using the environment variable\n\nWhile theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.",
     "homepage": "https://github.com/nextcloud/user_saml",
     "licenses": [

From 7959cc9b56a7de62c15f1ab54d8065b256d6f478 Mon Sep 17 00:00:00 2001
From: Tanel Dettenborn <tanel@ssrc.tii.ae>
Date: Thu, 23 Jan 2025 01:15:33 +0200
Subject: [PATCH 23/29] screen: 4.9.1 -> 5.0.0

Rational of swithing to version v5.0.0.
4.9.1 was broken cross-compilation with GCC 14.

Signed-off-by: Tanel Dettenborn <tanel@ssrc.tii.ae>
(cherry picked from commit 4fd304c580d3704b4f3a9955b354148b4f1d73b1)
---
 pkgs/tools/misc/screen/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 45319b2b79a6..0ea61f0650fa 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "screen";
-  version = "4.9.1";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "mirror://gnu/screen/screen-${version}.tar.gz";
-    hash = "sha256-Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk=";
+    hash = "sha256-8Eo50AoOXHyGpVM4gIkDCCrV301z3xov00JZdq7ZSXE=";
   };
 
   configureFlags = [
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
     "--enable-rxvt_osc"
   ];
 
+  # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416
+  NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU) "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types";
+
   nativeBuildInputs = [
     autoreconfHook
   ];

From 59f85b8457b95beb7d0f84aecc8a22f6e0bc1e8f Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Tue, 28 Jan 2025 23:47:16 +0200
Subject: [PATCH 24/29] screen: mark as broken on darwin

Disabling PAM doesn't help much.

(cherry picked from commit d5ea40e125589d37677f0d90b205152aade6ad79)
---
 pkgs/tools/misc/screen/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 0ea61f0650fa..f19716bbc960 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -71,5 +71,7 @@ stdenv.mkDerivation rec {
 
     platforms = platforms.unix;
     maintainers = [ ];
+    # checking for PAM support... configure: error: no
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From f6e7f019eb6eafdbf51e2ebbce26c773c184eaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 28 Jan 2025 23:21:14 +0100
Subject: [PATCH 25/29] screen: fix darwin build

(cherry picked from commit a2f04a39ea91f9f79ef8c4b0280a6a94dc7860f5)
---
 pkgs/tools/misc/screen/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index f19716bbc960..ccfe19bbfde7 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -32,15 +32,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
   ];
-  buildInputs =
-    [
-      ncurses
-      libxcrypt
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux pam
-    ++ lib.optional stdenv.hostPlatform.isDarwin utmp;
+  buildInputs = [
+    ncurses
+    libxcrypt
+    pam
+  ] ++ lib.optional stdenv.hostPlatform.isDarwin utmp;
 
-  doCheck = true;
+  # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS
+  doCheck = !stdenv.hostPlatform.isDarwin;
 
   meta = with lib; {
     homepage = "https://www.gnu.org/software/screen/";
@@ -71,7 +70,5 @@ stdenv.mkDerivation rec {
 
     platforms = platforms.unix;
     maintainers = [ ];
-    # checking for PAM support... configure: error: no
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 4c5482e1fb53bc3f3354e15b114fadb40dd2f70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 28 Jan 2025 23:21:21 +0100
Subject: [PATCH 26/29] screen: remove unused configureFlags

(cherry picked from commit d0ae116eafef7444cd826bc92a57c1e4f9ac2805)
---
 pkgs/tools/misc/screen/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index ccfe19bbfde7..3c50af1fe6bf 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -21,9 +21,6 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-telnet"
     "--enable-pam"
-    "--with-sys-screenrc=/etc/screenrc"
-    "--enable-colors256"
-    "--enable-rxvt_osc"
   ];
 
   # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416

From 51d5a958c56a9dbb40dd3197f4f4a2cedee35132 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 16 May 2025 12:05:09 +0200
Subject: [PATCH 27/29] screen: 5.0.0 -> 5.0.1

Fixes CVE-2025-46805, CVE-2025-46804, CVE-2025-46803, CVE-2025-46802,
CVE-2025-23395.

https://lists.gnu.org/archive/html/screen-devel/2025-05/msg00008.html
(cherry picked from commit 093210240256a91f1aa232b24a275fa614289e0f)
---
 pkgs/tools/misc/screen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 3c50af1fe6bf..6cfd4135a913 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "screen";
-  version = "5.0.0";
+  version = "5.0.1";
 
   src = fetchurl {
     url = "mirror://gnu/screen/screen-${version}.tar.gz";
-    hash = "sha256-8Eo50AoOXHyGpVM4gIkDCCrV301z3xov00JZdq7ZSXE=";
+    hash = "sha256-La429Ns3n/zRS2kVlrpuwYrDqeIrxHrCOXiatYQJhp0=";
   };
 
   configureFlags = [

From e8c60e89e37ec978ea458845344b046f2de76ad4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Fri, 16 May 2025 08:06:52 +0200
Subject: [PATCH 28/29] thunderbird: fix calendar again after icu76 switch

(cherry picked from commit 9312c4398cf365f8f7eed71bb54dbbffb81b2db7)
---
 .../networking/browsers/firefox/common.nix    |  2 +-
 .../mailreaders/thunderbird/packages.nix      | 31 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index f04c01c8de30..0d40b5fe8d46 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -65,7 +65,7 @@ in
   gnum4,
   gtk3,
   icu73,
-  icu76,
+  icu76, # if you fiddle with the icu parameters, please check Thunderbird's overrides
   libGL,
   libGLU,
   libevent,
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index c72fc1e034c2..f67dda1a1e13 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -5,23 +5,28 @@
   callPackage,
   fetchurl,
   icu73,
+  icu76,
   fetchpatch2,
   config,
 }:
 
 let
-  icu73' = icu73.overrideAttrs (attrs: {
-    # standardize vtzone output
-    # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071
-    patches = attrs.patches ++ [
-      (fetchpatch2 {
-        url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff";
-        stripLen = 3;
-        hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM=";
-      })
-    ];
-  });
+  patchICU =
+    icu:
+    icu.overrideAttrs (attrs: {
+      # standardize vtzone output
+      # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071
+      patches = attrs.patches ++ [
+        (fetchpatch2 {
+          url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff";
+          stripLen = 3;
+          hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM=";
+        })
+      ];
+    });
+  icu73' = patchICU icu73;
+  icu76' = patchICU icu76;
 
   common =
     {
@@ -46,6 +51,7 @@ let
 
       extraPassthru = {
         icu73 = icu73';
+        icu76 = icu76';
       };
 
       meta = with lib; {
@@ -73,6 +79,7 @@ let
         pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
 
         icu73 = icu73';
+        icu76 = icu76';
       };
 
 in

From 87c77012a9cb212b9e183fc2bca1b5e4cd3bbcb5 Mon Sep 17 00:00:00 2001
From: Mynacol <Mynacol@users.noreply.github.com>
Date: Thu, 8 May 2025 20:50:00 +0000
Subject: [PATCH 29/29] kexec-tools: Set meta.mainProgram to kexec

(cherry picked from commit cb8dcb7793fc658d8ef65530bf41582dad87a829)
---
 pkgs/by-name/ke/kexec-tools/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix
index 5eef5475390e..4ff1618e5b12 100644
--- a/pkgs/by-name/ke/kexec-tools/package.nix
+++ b/pkgs/by-name/ke/kexec-tools/package.nix
@@ -59,5 +59,6 @@ stdenv.mkDerivation rec {
       "sparc64-linux"
     ];
     license = licenses.gpl2Only;
+    mainProgram = "kexec";
   };
 }