Use peertube flake in modules

3 files changed, 100 insertions, 5 deletions

diff --git a/flakes/peertube/flake.nix b/flakes/peertube/flake.nix
index df6ef4a..2a594c0 100644
--- a/flakes/peertube/flake.nix
+++ b/flakes/peertube/flake.nix
@@ -274,7 +274,7 @@
             environment.NODE_ENV = "production";
             environment.HOME = cfg.package;
 
-            path = [ pkgs.nodejs pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ];
+            path = [ pkgs.nodejs pkgs.yarn pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ];
 
             script = ''
               install -m 0750 -d ${cfg.dataDir}/config
diff --git a/flakes/private/peertube/flake.lock b/flakes/private/peertube/flake.lock
index 4f335c9..3085b0a 100644
--- a/flakes/private/peertube/flake.lock
+++ b/flakes/private/peertube/flake.lock
@@ -15,6 +15,21 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1610051610,
+        "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "myuids": {
       "locked": {
         "dir": "flakes/myuids",
@@ -32,6 +47,23 @@
         "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
       }
     },
+    "myuids_2": {
+      "locked": {
+        "dir": "flakes/myuids",
+        "lastModified": 1611091761,
+        "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=",
+        "ref": "master",
+        "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191",
+        "revCount": 802,
+        "type": "git",
+        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+      },
+      "original": {
+        "dir": "flakes/myuids",
+        "type": "git",
+        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1611097871,
@@ -47,9 +79,41 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1611097871,
+        "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "peertube": {
       "flake": false,
       "locked": {
+        "lastModified": 1610436329,
+        "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=",
+        "owner": "Chocobozzz",
+        "repo": "PeerTube",
+        "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Chocobozzz",
+        "ref": "v3.0.1",
+        "repo": "PeerTube",
+        "type": "github"
+      }
+    },
+    "peertube_2": {
+      "flake": false,
+      "locked": {
         "lastModified": 1611184594,
         "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=",
         "ref": "gitolite_local/syden",
@@ -64,7 +128,7 @@
         "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
       }
     },
-    "peertube_syden": {
+    "peertube_origin": {
       "inputs": {
         "flake-utils": "flake-utils",
         "myuids": "myuids",
@@ -73,6 +137,29 @@
       },
       "locked": {
         "dir": "flakes/peertube",
+        "lastModified": 1611273496,
+        "narHash": "sha256-U+q6Ir9VsL2egLjeXZ6YpRZxwLotKcrp2I0fOX6es+c=",
+        "ref": "master",
+        "rev": "ce95026934c4ea8c647365f68eb195459fcdff08",
+        "revCount": 806,
+        "type": "git",
+        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+      },
+      "original": {
+        "dir": "flakes/peertube",
+        "type": "git",
+        "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
+      }
+    },
+    "peertube_syden": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "myuids": "myuids_2",
+        "nixpkgs": "nixpkgs_2",
+        "peertube": "peertube_2"
+      },
+      "locked": {
+        "dir": "flakes/peertube",
         "lastModified": 1611270106,
         "narHash": "sha256-VKDczZDM9A2dGoSAEN6rUDxvLKYUuoDMefQc7fabvXo=",
         "ref": "master",
@@ -89,6 +176,7 @@
     },
     "root": {
       "inputs": {
+        "peertube_origin": "peertube_origin",
         "peertube_syden": "peertube_syden"
       }
     }
diff --git a/flakes/private/peertube/flake.nix b/flakes/private/peertube/flake.nix
index 9e56d5b..bb399df 100644
--- a/flakes/private/peertube/flake.nix
+++ b/flakes/private/peertube/flake.nix
@@ -1,5 +1,10 @@
 {
   description = "Patched peertube";
+  inputs.peertube_origin = {
+    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
+    type = "git";
+    dir = "flakes/peertube";
+  };
   inputs.peertube_syden = {
     url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
     type = "git";
@@ -12,8 +17,10 @@
     };
   };
 
-  outputs = { self, peertube_syden }: {
-    packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube_syden;
-    defaultPackage.x86_64-linux = peertube_syden.defaultPackage.x86_64-linux;
+  outputs = { self, peertube_origin, peertube_syden }: {
+    packages.x86_64-linux.peertube = peertube_origin.packages.x86_64-linux.peertube;
+    packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube;
+    defaultPackage.x86_64-linux = peertube_origin.defaultPackage.x86_64-linux;
+    nixosModule = peertube_origin.nixosModule;
   };
 }