diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2023-09-13 17:00:59 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2023-09-13 17:00:59 +0200 |
commit | 02bdc3521477086d4c4fb98c682755e2c83ef043 (patch) | |
tree | f1fe275ee22fcc2285084b131e64c33788dabe6a | |
parent | b417b44757c688ed9df71241d0721ce86fdc9a13 (diff) | |
download | nixos-02bdc3521477086d4c4fb98c682755e2c83ef043.tar nixos-02bdc3521477086d4c4fb98c682755e2c83ef043.tar.gz nixos-02bdc3521477086d4c4fb98c682755e2c83ef043.tar.bz2 nixos-02bdc3521477086d4c4fb98c682755e2c83ef043.tar.xz nixos-02bdc3521477086d4c4fb98c682755e2c83ef043.zip |
...
-rw-r--r-- | _sources/generated.json | 34 | ||||
-rw-r--r-- | _sources/generated.nix | 28 | ||||
-rw-r--r-- | nvfetcher.toml | 7 | ||||
-rw-r--r-- | overlays/scutiger.nix | 9 | ||||
-rw-r--r-- | system-profiles/core/default.nix | 2 | ||||
-rw-r--r-- | user-profiles/yt-dlp.nix | 8 |
6 files changed, 65 insertions, 23 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index 05d55bd9..9e3d0950 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
@@ -27,11 +27,11 @@ | |||
27 | "passthru": null, | 27 | "passthru": null, |
28 | "pinned": false, | 28 | "pinned": false, |
29 | "src": { | 29 | "src": { |
30 | "sha256": "sha256-MLDFU+Vp11eZ7hbY1qdmN0vVk2z2BIbMxSzTbLR49OU=", | 30 | "sha256": "sha256-h27C0b7tzkPa5FhKZvXF+UtawPxhB44d4BG9lcTPRco=", |
31 | "type": "tarball", | 31 | "type": "tarball", |
32 | "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz" | 32 | "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.2.tar.gz" |
33 | }, | 33 | }, |
34 | "version": "2023.1" | 34 | "version": "2023.2" |
35 | }, | 35 | }, |
36 | "bpf-examples": { | 36 | "bpf-examples": { |
37 | "cargoLocks": null, | 37 | "cargoLocks": null, |
@@ -160,11 +160,11 @@ | |||
160 | "name": null, | 160 | "name": null, |
161 | "owner": "hoyon", | 161 | "owner": "hoyon", |
162 | "repo": "mpv-mpris", | 162 | "repo": "mpv-mpris", |
163 | "rev": "1.0", | 163 | "rev": "1.1", |
164 | "sha256": "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4=", | 164 | "sha256": "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=", |
165 | "type": "github" | 165 | "type": "github" |
166 | }, | 166 | }, |
167 | "version": "1.0" | 167 | "version": "1.1" |
168 | }, | 168 | }, |
169 | "mpv-reload": { | 169 | "mpv-reload": { |
170 | "cargoLocks": null, | 170 | "cargoLocks": null, |
@@ -285,6 +285,20 @@ | |||
285 | }, | 285 | }, |
286 | "version": "5f458f58aa782ee09febc9643fa8741cb8750727" | 286 | "version": "5f458f58aa782ee09febc9643fa8741cb8750727" |
287 | }, | 287 | }, |
288 | "scutiger": { | ||
289 | "cargoLocks": null, | ||
290 | "date": null, | ||
291 | "extract": null, | ||
292 | "name": "scutiger", | ||
293 | "passthru": null, | ||
294 | "pinned": false, | ||
295 | "src": { | ||
296 | "sha256": "sha256-secBZwE105LATZY+9/aQ8M4rD0SqbDqfQhymrjblEf4=", | ||
297 | "type": "tarball", | ||
298 | "url": "https://github.com/bk2204/scutiger/archive/refs/tags/v0.2.0.tar.gz" | ||
299 | }, | ||
300 | "version": "0.2.0" | ||
301 | }, | ||
288 | "smartprom": { | 302 | "smartprom": { |
289 | "cargoLocks": null, | 303 | "cargoLocks": null, |
290 | "date": null, | 304 | "date": null, |
@@ -301,7 +315,7 @@ | |||
301 | }, | 315 | }, |
302 | "v4l2loopback": { | 316 | "v4l2loopback": { |
303 | "cargoLocks": null, | 317 | "cargoLocks": null, |
304 | "date": "2023-05-14", | 318 | "date": "2023-09-13", |
305 | "extract": null, | 319 | "extract": null, |
306 | "name": "v4l2loopback", | 320 | "name": "v4l2loopback", |
307 | "passthru": null, | 321 | "passthru": null, |
@@ -313,11 +327,11 @@ | |||
313 | "name": null, | 327 | "name": null, |
314 | "owner": "umlaeute", | 328 | "owner": "umlaeute", |
315 | "repo": "v4l2loopback", | 329 | "repo": "v4l2loopback", |
316 | "rev": "9ba7e294ea6f45410a15f192381d4918e8df4f02", | 330 | "rev": "5bb9bed4e2a34761dc5dc188faec7315ae3930fe", |
317 | "sha256": "sha256-rt5EfbwVpwDuMJgFxNefutSj+i9rf7TiZGUCOap9hrI=", | 331 | "sha256": "sha256-h7Gu7rRlTKdu5pQOrYuzPbFFMrKiC+idb3vhzJQXUbQ=", |
318 | "type": "github" | 332 | "type": "github" |
319 | }, | 333 | }, |
320 | "version": "9ba7e294ea6f45410a15f192381d4918e8df4f02" | 334 | "version": "5bb9bed4e2a34761dc5dc188faec7315ae3930fe" |
321 | }, | 335 | }, |
322 | "xcompose": { | 336 | "xcompose": { |
323 | "cargoLocks": null, | 337 | "cargoLocks": null, |
diff --git a/_sources/generated.nix b/_sources/generated.nix index 36346cbd..12ce1c0f 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
@@ -17,10 +17,10 @@ | |||
17 | }; | 17 | }; |
18 | batman-adv = { | 18 | batman-adv = { |
19 | pname = "batman-adv"; | 19 | pname = "batman-adv"; |
20 | version = "2023.1"; | 20 | version = "2023.2"; |
21 | src = fetchTarball { | 21 | src = fetchTarball { |
22 | url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz"; | 22 | url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.2.tar.gz"; |
23 | sha256 = "sha256-MLDFU+Vp11eZ7hbY1qdmN0vVk2z2BIbMxSzTbLR49OU="; | 23 | sha256 = "sha256-h27C0b7tzkPa5FhKZvXF+UtawPxhB44d4BG9lcTPRco="; |
24 | }; | 24 | }; |
25 | }; | 25 | }; |
26 | bpf-examples = { | 26 | bpf-examples = { |
@@ -94,13 +94,13 @@ | |||
94 | }; | 94 | }; |
95 | mpv-mpris = { | 95 | mpv-mpris = { |
96 | pname = "mpv-mpris"; | 96 | pname = "mpv-mpris"; |
97 | version = "1.0"; | 97 | version = "1.1"; |
98 | src = fetchFromGitHub { | 98 | src = fetchFromGitHub { |
99 | owner = "hoyon"; | 99 | owner = "hoyon"; |
100 | repo = "mpv-mpris"; | 100 | repo = "mpv-mpris"; |
101 | rev = "1.0"; | 101 | rev = "1.1"; |
102 | fetchSubmodules = false; | 102 | fetchSubmodules = false; |
103 | sha256 = "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4="; | 103 | sha256 = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0="; |
104 | }; | 104 | }; |
105 | }; | 105 | }; |
106 | mpv-reload = { | 106 | mpv-reload = { |
@@ -178,6 +178,14 @@ | |||
178 | }; | 178 | }; |
179 | date = "2023-01-09"; | 179 | date = "2023-01-09"; |
180 | }; | 180 | }; |
181 | scutiger = { | ||
182 | pname = "scutiger"; | ||
183 | version = "0.2.0"; | ||
184 | src = fetchTarball { | ||
185 | url = "https://github.com/bk2204/scutiger/archive/refs/tags/v0.2.0.tar.gz"; | ||
186 | sha256 = "sha256-secBZwE105LATZY+9/aQ8M4rD0SqbDqfQhymrjblEf4="; | ||
187 | }; | ||
188 | }; | ||
181 | smartprom = { | 189 | smartprom = { |
182 | pname = "smartprom"; | 190 | pname = "smartprom"; |
183 | version = "2.2.0"; | 191 | version = "2.2.0"; |
@@ -188,15 +196,15 @@ | |||
188 | }; | 196 | }; |
189 | v4l2loopback = { | 197 | v4l2loopback = { |
190 | pname = "v4l2loopback"; | 198 | pname = "v4l2loopback"; |
191 | version = "9ba7e294ea6f45410a15f192381d4918e8df4f02"; | 199 | version = "5bb9bed4e2a34761dc5dc188faec7315ae3930fe"; |
192 | src = fetchFromGitHub { | 200 | src = fetchFromGitHub { |
193 | owner = "umlaeute"; | 201 | owner = "umlaeute"; |
194 | repo = "v4l2loopback"; | 202 | repo = "v4l2loopback"; |
195 | rev = "9ba7e294ea6f45410a15f192381d4918e8df4f02"; | 203 | rev = "5bb9bed4e2a34761dc5dc188faec7315ae3930fe"; |
196 | fetchSubmodules = true; | 204 | fetchSubmodules = true; |
197 | sha256 = "sha256-rt5EfbwVpwDuMJgFxNefutSj+i9rf7TiZGUCOap9hrI="; | 205 | sha256 = "sha256-h7Gu7rRlTKdu5pQOrYuzPbFFMrKiC+idb3vhzJQXUbQ="; |
198 | }; | 206 | }; |
199 | date = "2023-05-14"; | 207 | date = "2023-09-13"; |
200 | }; | 208 | }; |
201 | xcompose = { | 209 | xcompose = { |
202 | pname = "xcompose"; | 210 | pname = "xcompose"; |
diff --git a/nvfetcher.toml b/nvfetcher.toml index b1be554f..bdde5795 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml | |||
@@ -83,4 +83,9 @@ src.webpage = "https://www.open-mesh.org/projects/open-mesh/wiki/Download" | |||
83 | src.regex = "The latest version of <a[^\\>]*>batman-adv</a> is <a[^\\>]*>batman-adv-([0-9\\.]+).tar.gz</a>" | 83 | src.regex = "The latest version of <a[^\\>]*>batman-adv</a> is <a[^\\>]*>batman-adv-([0-9\\.]+).tar.gz</a>" |
84 | src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$" | 84 | src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$" |
85 | src.to_pattern = "\\1" | 85 | src.to_pattern = "\\1" |
86 | fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz" \ No newline at end of file | 86 | fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz" |
87 | |||
88 | [scutiger] | ||
89 | src.github_tag = "bk2204/scutiger" | ||
90 | src.prefix = "v" | ||
91 | fetch.tarball = "https://github.com/bk2204/scutiger/archive/refs/tags/v$ver.tar.gz" | ||
diff --git a/overlays/scutiger.nix b/overlays/scutiger.nix new file mode 100644 index 00000000..7a56adaf --- /dev/null +++ b/overlays/scutiger.nix | |||
@@ -0,0 +1,9 @@ | |||
1 | { final, prev, sources, ... }: { | ||
2 | scutiger = final.rustPlatform.buildRustPackage { | ||
3 | inherit (sources.scutiger) pname version src; | ||
4 | |||
5 | cargoHash = "sha256-d+wJ3trrldCVATsudsbglElU6q4LaS6feRocRyHal2k="; | ||
6 | |||
7 | nativeBuildInputs = with final; [ pkg-config pcre2.dev zlib.dev git ]; | ||
8 | }; | ||
9 | } | ||
diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index aadf0260..46049e26 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix | |||
@@ -113,7 +113,7 @@ in { | |||
113 | enable = true; | 113 | enable = true; |
114 | lfs.enable = true; | 114 | lfs.enable = true; |
115 | }; | 115 | }; |
116 | environment.systemPackages = with pkgs; [ git-annex ]; | 116 | environment.systemPackages = with pkgs; [ git-annex scutiger ]; |
117 | 117 | ||
118 | system.activationScripts.symlink-flake = '' | 118 | system.activationScripts.symlink-flake = '' |
119 | if test -L /etc/nixos; then | 119 | if test -L /etc/nixos; then |
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix index 1a30ab5a..792f6613 100644 --- a/user-profiles/yt-dlp.nix +++ b/user-profiles/yt-dlp.nix | |||
@@ -14,9 +14,15 @@ | |||
14 | sub-langs = "all,-live_chat,-rechat"; | 14 | sub-langs = "all,-live_chat,-rechat"; |
15 | prefer-free-formats = true; | 15 | prefer-free-formats = true; |
16 | embed-metadata = true; | 16 | embed-metadata = true; |
17 | downloader = "${pkgs.aria2}/bin/aria2c"; | 17 | # downloader = "${pkgs.axel}/bin/axel"; |
18 | concurrent-fragments = 4; | ||
19 | buffer-size = "16K"; | ||
18 | sponsorblock-mark = "all"; | 20 | sponsorblock-mark = "all"; |
19 | restrict-filenames = true; | 21 | restrict-filenames = true; |
22 | extractor-args = lib.concatStringsSep ";" [ | ||
23 | "youtube:player-client=android,web" | ||
24 | "youtube:formats=dashy" | ||
25 | ]; | ||
20 | }; | 26 | }; |
21 | }; | 27 | }; |
22 | }; | 28 | }; |