[nixpkgs] 25.05 -> 25.11

Merge branch 'master' into staging
[nixpkgs] update
2025-12-01 19:14:06 +01:00 · 2025-12-01 19:08:53 +01:00 · 2025-08-14 14:08:54 +02:00
7 changed files with 15 additions and 25 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -450,11 +450,11 @@
        "utils": "utils_4"
      },
      "locked": {
-        "lastModified": 1764942243,
-        "narHash": "sha256-P02Zm0VAON9SqRxqe6h5vfxgpCBYeiz5JPWGIn6KFFg=",
+        "lastModified": 1751462005,
+        "narHash": "sha256-vhr2GORiXij3mL+QIfnL0sKSbbBIglw1wnHWNmFejiA=",
        "ref": "refs/heads/master",
-        "rev": "f56b7eb6887b7e0fecae4a1f4c1311392eebad8d",
-        "revCount": 156,
+        "rev": "f505fb17bf1882cc3683e1e252ce44583cbe58ce",
+        "revCount": 155,
        "type": "git",
        "url": "https://git.dynamicdiscord.de/kalipso/zineshop"
      },
--- a/machines/bakunin/configuration.nix
+++ b/machines/bakunin/configuration.nix
@@ -48,7 +48,7 @@ in
      firefox
      thunderbird
      telegram-desktop
-      tor-browser
+      tor-browser-bundle-bin
      keepassxc
      libreoffice
      gimp
--- a/machines/durruti/host_config.nix
+++ b/machines/durruti/host_config.nix
@@ -49,10 +49,6 @@ in
      locations."/" = {
        proxyPass = "http://10.0.0.10";
        extraConfig = ''
-          client_max_body_size 10G;
-          client_body_timeout 3600s;
-          send_timeout 3600s;
-          fastcgi_buffers 64 4K;
        '';
      };
    };
--- a/machines/fanny/configuration.nix
+++ b/machines/fanny/configuration.nix
@@ -165,10 +165,7 @@ in
        proxyPass = "http://10.0.0.13";
        extraConfig = ''
          proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
-          client_body_timeout 3600s;
-          send_timeout 3600s;
-          fastcgi_buffers 64 4K;
+          client_max_body_size 10G;
        '';
      };
    };
--- a/machines/louise/configuration.nix
+++ b/machines/louise/configuration.nix
@@ -31,7 +31,7 @@
      firefox
      thunderbird
      telegram-desktop
-      tor-browser
+      tor-browser-bundle-bin
      keepassxc
      libreoffice
      gimp
--- a/machines/nextcloud/configuration.nix
+++ b/machines/nextcloud/configuration.nix
@@ -31,13 +31,9 @@ with lib;
    lokiHost = "10.0.0.14";
  };

-  services.postgresqlBackup = {
-    enable = true;
-  };
-
  services.nextcloud = {
    enable = true;
-    package = pkgs.nextcloud32;
+    package = pkgs.nextcloud31;
    hostName = "cloud.malobeo.org";
    config.adminpassFile = config.sops.secrets.nextcloudAdminPass.path;
    maxUploadSize = "10G";
@@ -52,9 +48,14 @@ with lib;
    extraAppsEnable = true;
    extraApps = {
      inherit (config.services.nextcloud.package.packages.apps) contacts calendar polls registration collectives forms;
+      appointments = pkgs.fetchNextcloudApp {
+        sha256 = "sha256-ls1rLnsX7U9wo2WkEtzhrvliTcWUl6LWXolE/9etJ78=";
+        url = "https://github.com/SergeyMosin/Appointments/raw/refs/tags/v2.4.3/build/artifacts/appstore/appointments.tar.gz";
+        license = "agpl3Plus";
+      };
      deck = pkgs.fetchNextcloudApp {
-        sha256 = "sha256-epjwIANb6vTNx9KqaG6jZc14YPoFMBTCj+/c9JHcWkA=";
-        url = "https://link.storjshare.io/raw/jvrl62dakd6htpyxohjkiiqiw5ma/mal/deck32.tar.gz";
+        sha256 = "sha256-1sqDmJpM9SffMY2aaxwzqntdjdcUaRySyaUDv9VHuiE=";
+        url = "https://link.storjshare.io/raw/jw7pf6gct34j3pcqvlq6ddasvdwq/mal/deck.tar.gz";
        license = "agpl3Plus";
      };
    };
--- a/machines/vpn/configuration.nix
+++ b/machines/vpn/configuration.nix
@@ -45,10 +45,6 @@ with lib;
        proxyPass = "http://10.100.0.101";
        extraConfig = ''
          proxy_set_header Host $host;
-          client_max_body_size ${inputs.self.nixosConfigurations.nextcloud.config.services.nextcloud.maxUploadSize};
-          client_body_timeout 3600s;
-          send_timeout 3600s;
-          fastcgi_buffers 64 4K;
        '';
      };
    };
Author	SHA1	Message	Date
kalipso	e8f929a35a	[nixpkgs] 25.05 -> 25.11 Some checks failed Check flake syntax / flake-check (push) Failing after 4m31s Details	2025-12-01 19:14:06 +01:00
kalipso	42f2c91b8e	Merge branch 'master' into staging	2025-12-01 19:08:53 +01:00
kalipso	7bee418e79	[nixpkgs] update All checks were successful Check flake syntax / flake-check (push) Successful in 7m9s Details	2025-08-14 14:08:54 +02:00