From eb034b35d9d28c576f367f1d0ef62f707f8d26b9 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Sat, 31 May 2025 13:55:31 +0200
Subject: [PATCH] switched from unstable to 25.05 instead. However, Nextcloud
 admin reset is broken

---
 machines/gerd/services/nextcloud.nix | 6 ++++--
 shared/sources/sources.json          | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/machines/gerd/services/nextcloud.nix b/machines/gerd/services/nextcloud.nix
index 5624dc6..0fa0b67 100644
--- a/machines/gerd/services/nextcloud.nix
+++ b/machines/gerd/services/nextcloud.nix
@@ -127,7 +127,7 @@ let
 in {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud30;
+    package = pkgs.nextcloud31;
     datadir = stateDir;
 
     config.adminpassFile = config.age.secrets.nextcloud-admin-pass.path;
@@ -200,7 +200,9 @@ in {
     # runs this after all the main nextcloud-setup stuff
     script = lib.mkAfter ''
       ${nextcloudSetupLdap}
-      ${nextcloudSetupAdmin}
+      # TODO(eyJhb): fix, broken by upstream here 
+      # https://github.com/NixOS/nixpkgs/commit/2ce1e841032eac4913f2cd3dce416da3d5c799ef
+      # ${nextcloudSetupAdmin}
       ${nextcloudSetupEncryption}
       ${nextcloudSetupStorageQuota}
     '';
diff --git a/shared/sources/sources.json b/shared/sources/sources.json
index f4de43b..64d5621 100644
--- a/shared/sources/sources.json
+++ b/shared/sources/sources.json
@@ -67,15 +67,15 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-unstable",
+        "branch": "nixos-25.05",
         "description": "Nix Packages collection",
         "homepage": null,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
-        "sha256": "1fcmsax6cs1s6p9apzxg17why08xy47dz226wnb5wwr0aargqlj2",
+        "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
+        "sha256": "0klkpy7ah033y3cwj51a0l96lwmkqqvwgfv3kid4z9x5g2rqr0l5",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/4faa5f5321320e49a78ae7848582f684d64783e9.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/7282cb574e0607e65224d33be8241eae7cfe0979.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }