From 81edb3c9865bbf6a6cbb98337ed0b2e69edfa099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 9 Jul 2025 15:50:25 +0200
Subject: [PATCH 1/3] nixos/nextcloud: move phpPackage default into option

This allows it to be accessed like options.services.nextcloud.phpPackage.default

(cherry picked from commit 5a7afe0a331f97d7dbc65abe38f9a1807d2d753d)
---
 nixos/modules/services/web-apps/nextcloud.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 54cbd2f4a18e..1d0cd68a1b31 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -436,6 +436,7 @@ in
       ];
     };
     phpPackage = mkPackageOption pkgs "php" {
+      default = [ "php83" ];
       example = "php82";
     };
 
@@ -1072,8 +1073,6 @@ in
             nextcloud31
         );
 
-      services.nextcloud.phpPackage = pkgs.php83;
-
       services.nextcloud.phpOptions = mkMerge [
         (mapAttrs (const mkOptionDefault) defaultPHPSettings)
         {

From cff7ac2122e3b5e9ca7ba4e27e6bd72215e1f31c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Jul 2025 19:35:52 +0000
Subject: [PATCH 2/3] libdwarf: 2.0.0 -> 2.1.0

---
 pkgs/by-name/li/libdwarf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libdwarf/package.nix b/pkgs/by-name/li/libdwarf/package.nix
index 6c68ef9c26dc..e98c999f6438 100644
--- a/pkgs/by-name/li/libdwarf/package.nix
+++ b/pkgs/by-name/li/libdwarf/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdwarf";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "davea42";
     repo = "libdwarf-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SsFg+7zGBEGxDSzfiIP5bxdttlBkhEiEQWaU12hINas=";
+    hash = "sha256-Q+ke5vRSBFZirCIBu8M88LzBQW851kjkW4vUgE89ejQ=";
   };
 
   nativeBuildInputs = [

From 47fd69710510380cdf7df8a569e35adfd1639abd Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 19 Jul 2025 23:35:01 +0200
Subject: [PATCH 3/3] chroma: 2.15.0 -> 2.19.0

https://github.com/alecthomas/chroma/releases/tag/v2.16.0
https://github.com/alecthomas/chroma/releases/tag/v2.17.0
https://github.com/alecthomas/chroma/releases/tag/v2.17.1
https://github.com/alecthomas/chroma/releases/tag/v2.17.2
https://github.com/alecthomas/chroma/releases/tag/v2.18.0
https://github.com/alecthomas/chroma/releases/tag/v2.19.0
---
 pkgs/by-name/ch/chroma/package.nix |  4 ++--
 pkgs/by-name/ch/chroma/src.json    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix
index 7dd707c5d280..929dbbb88b85 100644
--- a/pkgs/by-name/ch/chroma/package.nix
+++ b/pkgs/by-name/ch/chroma/package.nix
@@ -10,7 +10,7 @@ in
 
 buildGoModule rec {
   pname = "chroma";
-  version = "2.15.0";
+  version = "2.19.0";
 
   # To update:
   # nix-prefetch-git --rev v${version} https://github.com/alecthomas/chroma.git > src.json
@@ -21,7 +21,7 @@ buildGoModule rec {
     inherit (srcInfo) sha256;
   };
 
-  vendorHash = "sha256:14jg809xz647yv6sc8rnnksg2bpnn75panj8a2kdk2v87yrpq2zr";
+  vendorHash = "sha256-Gqldcp68Rn4wkfQptbmKUjkwLSb+qaFboJNfmWVkrPU=";
 
   modRoot = "./cmd/chroma";
 
diff --git a/pkgs/by-name/ch/chroma/src.json b/pkgs/by-name/ch/chroma/src.json
index e9cee45b9f29..1a5fd3cf2246 100644
--- a/pkgs/by-name/ch/chroma/src.json
+++ b/pkgs/by-name/ch/chroma/src.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/alecthomas/chroma.git",
-  "rev": "009385f9487ee14c8a54e49aaf4331fea0830310",
-  "date": "2024-12-30T09:27:18+11:00",
-  "path": "/nix/store/rr2cj4bmlfw803diwyfpbrpai35gifaw-chroma",
-  "sha256": "088w3aixwfk8s04iyb2mjn3kx5dl3gb9q14jzawabcdy2ar7iijn",
-  "hash": "sha256-VsZ4shK+saW4+pIEnNYbtJU+h5VVLB8J0Gg63qMaHCE=",
+  "rev": "adeac8f5dbfb6806a51bcf07eefd89fc8a0aee6a",
+  "date": "2025-07-01T09:59:45+10:00",
+  "path": "/nix/store/063ldbczafhxq02g5n28bxr1xnl6fwgd-chroma",
+  "sha256": "1r50gqbizi7l1l07syx9wgfyx1k8gzspmsbpk42jnwgw3h9dcw42",
+  "hash": "sha256-gnDWEhz8cSsFmXfpevV/aIbu3eOpe30ADfTEHxd+oOQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,