From f33a4d26226c05d501b9d4d3e5e60a3a59991921 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 27 Jan 2025 18:37:29 +0100
Subject: [PATCH 1/2] peertube: move to by-name

---
 .../peertube/default.nix => by-name/pe/peertube/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{servers/peertube/default.nix => by-name/pe/peertube/package.nix} (99%)

diff --git a/pkgs/servers/peertube/default.nix b/pkgs/by-name/pe/peertube/package.nix
similarity index 99%
rename from pkgs/servers/peertube/default.nix
rename to pkgs/by-name/pe/peertube/package.nix
index e62bf9005deb..62cf67072afa 100644
--- a/pkgs/servers/peertube/default.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -10,7 +10,7 @@
   fixup-yarn-lock,
   jq,
   fd,
-  nodejs,
+  nodejs_18,
   which,
   yarn,
 }:
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     fd
   ];
 
-  buildInputs = [ nodejs ];
+  buildInputs = [ nodejs_18 ];
 
   buildPhase = ''
     # Build node modules
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df389f32233d..55fdf3f29722 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15782,10 +15782,6 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  peertube = callPackage ../servers/peertube {
-    nodejs = nodejs_18;
-  };
-
   photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
 
   phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };

From d7fe60b4ef7c9b9b0412413633da825c7cae396d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 9 Apr 2025 18:20:46 +0200
Subject: [PATCH 2/2] peertube: 6.3.3 -> 7.0.1

---
 pkgs/by-name/pe/peertube/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 62cf67072afa..0f99e03bab15 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -48,33 +48,33 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peertube";
-  version = "6.3.3";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "Chocobozzz";
     repo = "PeerTube";
     tag = "v${version}";
-    hash = "sha256-kPZcCJtnoqE1g0fAuM98IhuDy1E9QBDkFNWrWIpFIDA=";
+    hash = "sha256-DoUSzqb8lrU+s5R95rxCN/5A8sgb11edAhv0T6YACRo=";
   };
 
   yarnOfflineCacheServer = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-I6TC5KO+NQ0NAtoJzYQPLelp8/hYUtIeof+UI45qpdk=";
+    hash = "sha256-WLaIIyz6SEekLFeVO39Swpny5/x5Jc1zoxy/6bmOXTk=";
   };
 
   yarnOfflineCacheClient = fetchYarnDeps {
     yarnLock = "${src}/client/yarn.lock";
-    hash = "sha256-ADck9+5TDZ3OGInZ+NYYpBg9XXHugtiwyxYCYqSIOzM=";
+    hash = "sha256-/ZdORSnwk29ubsgKKB7RfHCetODNOH9DzkflQdDsMz0=";
   };
 
   yarnOfflineCacheAppsCli = fetchYarnDeps {
     yarnLock = "${src}/apps/peertube-cli/yarn.lock";
-    hash = "sha256-t5MwysPVLbtIfDhvnwWoGocck1ntP8OP9Vf9DF6L7Cg=";
+    hash = "sha256-lcWtZGE/6XGm8KXmzSowCHAb/vGwBoqkwk32Ru3mMYU=";
   };
 
   yarnOfflineCacheAppsRunner = fetchYarnDeps {
     yarnLock = "${src}/apps/peertube-runner/yarn.lock";
-    hash = "sha256-x5qFCprn8q0xC88HudLV7W53X1Nkbz3F52RMp2PxIu8=";
+    hash = "sha256-R7oXJUT698l2D1WkQGTWfkmbC7bC1XJ04xT0O8bwuI8=";
   };
 
   outputs = [