aboutsummaryrefslogtreecommitdiff
path: root/flakes
diff options
context:
space:
mode:
Diffstat (limited to 'flakes')
-rw-r--r--flakes/peertube/flake.nix2
-rw-r--r--flakes/private/peertube/flake.lock90
-rw-r--r--flakes/private/peertube/flake.nix13
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 @@
274 environment.NODE_ENV = "production"; 274 environment.NODE_ENV = "production";
275 environment.HOME = cfg.package; 275 environment.HOME = cfg.package;
276 276
277 path = [ pkgs.nodejs pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ]; 277 path = [ pkgs.nodejs pkgs.yarn pkgs.bashInteractive pkgs.ffmpeg pkgs.openssl ];
278 278
279 script = '' 279 script = ''
280 install -m 0750 -d ${cfg.dataDir}/config 280 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 @@
15 "type": "github" 15 "type": "github"
16 } 16 }
17 }, 17 },
18 "flake-utils_2": {
19 "locked": {
20 "lastModified": 1610051610,
21 "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
22 "owner": "numtide",
23 "repo": "flake-utils",
24 "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc",
25 "type": "github"
26 },
27 "original": {
28 "owner": "numtide",
29 "repo": "flake-utils",
30 "type": "github"
31 }
32 },
18 "myuids": { 33 "myuids": {
19 "locked": { 34 "locked": {
20 "dir": "flakes/myuids", 35 "dir": "flakes/myuids",
@@ -32,6 +47,23 @@
32 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" 47 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
33 } 48 }
34 }, 49 },
50 "myuids_2": {
51 "locked": {
52 "dir": "flakes/myuids",
53 "lastModified": 1611091761,
54 "narHash": "sha256-fE3FBeUxVaMezKjEpepdQW9apOza+0AfBALFhaaD0VA=",
55 "ref": "master",
56 "rev": "23f9fdf03a6673dbe334ae33be4f498cc4753191",
57 "revCount": 802,
58 "type": "git",
59 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
60 },
61 "original": {
62 "dir": "flakes/myuids",
63 "type": "git",
64 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
65 }
66 },
35 "nixpkgs": { 67 "nixpkgs": {
36 "locked": { 68 "locked": {
37 "lastModified": 1611097871, 69 "lastModified": 1611097871,
@@ -47,9 +79,41 @@
47 "type": "github" 79 "type": "github"
48 } 80 }
49 }, 81 },
82 "nixpkgs_2": {
83 "locked": {
84 "lastModified": 1611097871,
85 "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=",
86 "owner": "NixOS",
87 "repo": "nixpkgs",
88 "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c",
89 "type": "github"
90 },
91 "original": {
92 "owner": "NixOS",
93 "repo": "nixpkgs",
94 "type": "github"
95 }
96 },
50 "peertube": { 97 "peertube": {
51 "flake": false, 98 "flake": false,
52 "locked": { 99 "locked": {
100 "lastModified": 1610436329,
101 "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=",
102 "owner": "Chocobozzz",
103 "repo": "PeerTube",
104 "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86",
105 "type": "github"
106 },
107 "original": {
108 "owner": "Chocobozzz",
109 "ref": "v3.0.1",
110 "repo": "PeerTube",
111 "type": "github"
112 }
113 },
114 "peertube_2": {
115 "flake": false,
116 "locked": {
53 "lastModified": 1611184594, 117 "lastModified": 1611184594,
54 "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=", 118 "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=",
55 "ref": "gitolite_local/syden", 119 "ref": "gitolite_local/syden",
@@ -64,7 +128,7 @@
64 "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git" 128 "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git"
65 } 129 }
66 }, 130 },
67 "peertube_syden": { 131 "peertube_origin": {
68 "inputs": { 132 "inputs": {
69 "flake-utils": "flake-utils", 133 "flake-utils": "flake-utils",
70 "myuids": "myuids", 134 "myuids": "myuids",
@@ -73,6 +137,29 @@
73 }, 137 },
74 "locked": { 138 "locked": {
75 "dir": "flakes/peertube", 139 "dir": "flakes/peertube",
140 "lastModified": 1611273496,
141 "narHash": "sha256-U+q6Ir9VsL2egLjeXZ6YpRZxwLotKcrp2I0fOX6es+c=",
142 "ref": "master",
143 "rev": "ce95026934c4ea8c647365f68eb195459fcdff08",
144 "revCount": 806,
145 "type": "git",
146 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
147 },
148 "original": {
149 "dir": "flakes/peertube",
150 "type": "git",
151 "url": "https://git.immae.eu/perso/Immae/Config/Nix.git"
152 }
153 },
154 "peertube_syden": {
155 "inputs": {
156 "flake-utils": "flake-utils_2",
157 "myuids": "myuids_2",
158 "nixpkgs": "nixpkgs_2",
159 "peertube": "peertube_2"
160 },
161 "locked": {
162 "dir": "flakes/peertube",
76 "lastModified": 1611270106, 163 "lastModified": 1611270106,
77 "narHash": "sha256-VKDczZDM9A2dGoSAEN6rUDxvLKYUuoDMefQc7fabvXo=", 164 "narHash": "sha256-VKDczZDM9A2dGoSAEN6rUDxvLKYUuoDMefQc7fabvXo=",
78 "ref": "master", 165 "ref": "master",
@@ -89,6 +176,7 @@
89 }, 176 },
90 "root": { 177 "root": {
91 "inputs": { 178 "inputs": {
179 "peertube_origin": "peertube_origin",
92 "peertube_syden": "peertube_syden" 180 "peertube_syden": "peertube_syden"
93 } 181 }
94 } 182 }
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 @@
1{ 1{
2 description = "Patched peertube"; 2 description = "Patched peertube";
3 inputs.peertube_origin = {
4 url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
5 type = "git";
6 dir = "flakes/peertube";
7 };
3 inputs.peertube_syden = { 8 inputs.peertube_syden = {
4 url = "https://git.immae.eu/perso/Immae/Config/Nix.git"; 9 url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
5 type = "git"; 10 type = "git";
@@ -12,8 +17,10 @@
12 }; 17 };
13 }; 18 };
14 19
15 outputs = { self, peertube_syden }: { 20 outputs = { self, peertube_origin, peertube_syden }: {
16 packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube_syden; 21 packages.x86_64-linux.peertube = peertube_origin.packages.x86_64-linux.peertube;
17 defaultPackage.x86_64-linux = peertube_syden.defaultPackage.x86_64-linux; 22 packages.x86_64-linux.peertube_syden = peertube_syden.packages.x86_64-linux.peertube;
23 defaultPackage.x86_64-linux = peertube_origin.defaultPackage.x86_64-linux;
24 nixosModule = peertube_origin.nixosModule;
18 }; 25 };
19} 26}