Upgrade syden peertube to flake

diff --git a/flakes/private/peertube/flake.lock b/flakes/private/peertube/flake.lock
new file mode 100644 (file)
index 0000000..4f335c9
--- /dev/null
+++ b/flakes/private/peertube/flake.lock
@@ -0,0 +1,98 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "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",
+        "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,
+        "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "peertube": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1611184594,
+        "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=",
+        "ref": "gitolite_local/syden",
+        "rev": "f49b8d9b697f098490e81ce0afd889ba37dcb2f3",
+        "revCount": 6316,
+        "type": "git",
+        "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
+      },
+      "original": {
+        "ref": "gitolite_local/syden",
+        "type": "git",
+        "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
+      }
+    },
+    "peertube_syden": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "myuids": "myuids",
+        "nixpkgs": "nixpkgs",
+        "peertube": "peertube"
+      },
+      "locked": {
+        "dir": "flakes/peertube",
+        "lastModified": 1611270106,
+        "narHash": "sha256-VKDczZDM9A2dGoSAEN6rUDxvLKYUuoDMefQc7fabvXo=",
+        "ref": "master",
+        "rev": "1279eb87299a44167c4ed4a10a9088d58654b5d3",
+        "revCount": 805,
+        "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"
+      }
+    },
+    "root": {
+      "inputs": {
+        "peertube_syden": "peertube_syden"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

diff --git a/flakes/private/peertube/flake.nix b/flakes/private/peertube/flake.nix
new file mode 100644 (file)
index 0000000..9e56d5b
--- /dev/null
+++ b/flakes/private/peertube/flake.nix
@@ -0,0 +1,19 @@
+{
+  description = "Patched peertube";
+  inputs.peertube_syden = {
+    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
+    type = "git";
+    dir = "flakes/peertube";
+    inputs.peertube = {
+      url = "https://git.immae.eu/github/Chocobozzz/PeerTube.git";
+      ref = "gitolite_local/syden";
+      flake = false;
+      type = "git";
+    };
+  };
+
+  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;
+  };
+}

diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix
index 5970cca5891e80a0021eaf079e1c994a98825673..5732928526b27661244bae3d37262e937d08e73e 100644 (file)
--- a/modules/private/websites/syden/peertube.nix
+++ b/modules/private/websites/syden/peertube.nix
@@ -3,7 +3,7 @@ let
   scfg = config.myServices.websites.syden.peertube;
   name = "peertube";
   dataDir = "/var/lib/syden_peertube";
-  package = pkgs.webapps.peertube.override { sendmail = true; syden = true; light = "fr-FR"; };
+  package = (pkgs.mylibs.flakeCompat ../../../../flakes/private/peertube).default;
   env = config.myEnv.tools.syden_peertube;
 in
 {
@@ -65,6 +65,7 @@ in
           captions: '${dataDir}/storage/captions/'
           cache: '${dataDir}/storage/cache/'
           plugins: '${dataDir}/storage/plugins/'
+          client_overrides: '${dataDir}/storage/client-overrides/'
         '';
     }];