peertube: 6.0.4 -> 6.3.3

[liberodark]

Fix : #357286

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[liberodark]

@ofborg build peertube

@ofborg test peertube

[GaetanLepage]

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 357414

---

x86_64-linux

✅ 3 packages built:

• peertube
• peertube.cli
• peertube.runner

---

aarch64-linux

✅ 3 packages built:

• peertube
• peertube.cli
• peertube.runner

---

x86_64-darwin

❌ 3 packages failed to build:

• peertube
• peertube.cli
• peertube.runner

---

aarch64-darwin

❌ 3 packages failed to build:

• peertube
• peertube.cli
• peertube.runner

[Izorkin]

No update nginx configuration?

[Izorkin]

Patch:

diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index e3f15f4f438c..86e8403a8008 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -511,10 +511,20 @@ in {
           '' + nginxCommonHeaders;
         };

+        locations."~ ^/api/v1/users/[^/]+/imports/import-resumable$" = {
+          tryFiles = "/dev/null @api";
+          priority = 1130;
+
+          extraConfig = ''
+            client_max_body_size 0;
+            proxy_request_buffering off;
+          '' + nginxCommonHeaders;
+        };
+
         locations."~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$" = {
           tryFiles = "/dev/null @api";
           root = cfg.settings.storage.tmp;
-          priority = 1130;
+          priority = 1140;

           extraConfig = ''
             limit_except POST HEAD { deny all; }
@@ -527,7 +537,7 @@ in {
         locations."~ ^/api/v1/runners/jobs/[^/]+/(update|success)$" = {
           tryFiles = "/dev/null @api";
           root = cfg.settings.storage.tmp;
-          priority = 1135;
+          priority = 1150;

           extraConfig = ''
             client_max_body_size 12G;
@@ -537,7 +547,7 @@ in {

         locations."~ ^/api/v1/(videos|video-playlists|video-channels|users/me)" = {
           tryFiles = "/dev/null @api";
-          priority = 1140;
+          priority = 1160;

           extraConfig = ''
             client_max_body_size 6M;
@@ -547,7 +557,7 @@ in {

         locations."@api" = {
           proxyPass = "http://peertube";
-          priority = 1150;
+          priority = 1170;

           extraConfig = ''
             proxy_set_header Host $host;
@@ -685,8 +695,6 @@ in {
             if ($request_method = 'GET') {
               ${nginxCommonHeaders}
               ${nginxCommonHeadersExtra}
-
-              access_log off;
             }

             aio threads;
@@ -722,8 +730,6 @@ in {
             if ($request_method = 'GET') {
               ${nginxCommonHeaders}
               ${nginxCommonHeadersExtra}
-
-              access_log off;
             }

             aio threads;
@@ -759,8 +765,6 @@ in {
             if ($request_method = 'GET') {
               ${nginxCommonHeaders}
               ${nginxCommonHeadersExtra}
-
-              access_log off;
             }

             aio threads;
@@ -796,8 +800,6 @@ in {
             if ($request_method = 'GET') {
               ${nginxCommonHeaders}
               ${nginxCommonHeadersExtra}
-
-              access_log off;
             }

             aio threads;

[Izorkin]

Can we not change the formatting?

[liberodark]

I prefer it to be formatted via nixfmt I find it more readable and cleaner.

[Izorkin]

I on the contrary find it uncomfortable to read with this formatting :(

[liberodark]

Okay, I can cancel it.

[Izorkin]

Thanks!

[drupol]

Nope. Please update the hash.

[liberodark]

New PR : #358194