From 02bdc3521477086d4c4fb98c682755e2c83ef043 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Wed, 13 Sep 2023 17:00:59 +0200 Subject: ... --- _sources/generated.json | 34 ++++++++++++++++++++++++---------- _sources/generated.nix | 28 ++++++++++++++++++---------- nvfetcher.toml | 7 ++++++- overlays/scutiger.nix | 9 +++++++++ system-profiles/core/default.nix | 2 +- user-profiles/yt-dlp.nix | 8 +++++++- 6 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 overlays/scutiger.nix 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 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-MLDFU+Vp11eZ7hbY1qdmN0vVk2z2BIbMxSzTbLR49OU=", + "sha256": "sha256-h27C0b7tzkPa5FhKZvXF+UtawPxhB44d4BG9lcTPRco=", "type": "tarball", - "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz" + "url": "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.2.tar.gz" }, - "version": "2023.1" + "version": "2023.2" }, "bpf-examples": { "cargoLocks": null, @@ -160,11 +160,11 @@ "name": null, "owner": "hoyon", "repo": "mpv-mpris", - "rev": "1.0", - "sha256": "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4=", + "rev": "1.1", + "sha256": "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0=", "type": "github" }, - "version": "1.0" + "version": "1.1" }, "mpv-reload": { "cargoLocks": null, @@ -285,6 +285,20 @@ }, "version": "5f458f58aa782ee09febc9643fa8741cb8750727" }, + "scutiger": { + "cargoLocks": null, + "date": null, + "extract": null, + "name": "scutiger", + "passthru": null, + "pinned": false, + "src": { + "sha256": "sha256-secBZwE105LATZY+9/aQ8M4rD0SqbDqfQhymrjblEf4=", + "type": "tarball", + "url": "https://github.com/bk2204/scutiger/archive/refs/tags/v0.2.0.tar.gz" + }, + "version": "0.2.0" + }, "smartprom": { "cargoLocks": null, "date": null, @@ -301,7 +315,7 @@ }, "v4l2loopback": { "cargoLocks": null, - "date": "2023-05-14", + "date": "2023-09-13", "extract": null, "name": "v4l2loopback", "passthru": null, @@ -313,11 +327,11 @@ "name": null, "owner": "umlaeute", "repo": "v4l2loopback", - "rev": "9ba7e294ea6f45410a15f192381d4918e8df4f02", - "sha256": "sha256-rt5EfbwVpwDuMJgFxNefutSj+i9rf7TiZGUCOap9hrI=", + "rev": "5bb9bed4e2a34761dc5dc188faec7315ae3930fe", + "sha256": "sha256-h7Gu7rRlTKdu5pQOrYuzPbFFMrKiC+idb3vhzJQXUbQ=", "type": "github" }, - "version": "9ba7e294ea6f45410a15f192381d4918e8df4f02" + "version": "5bb9bed4e2a34761dc5dc188faec7315ae3930fe" }, "xcompose": { "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 @@ }; batman-adv = { pname = "batman-adv"; - version = "2023.1"; + version = "2023.2"; src = fetchTarball { - url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.1.tar.gz"; - sha256 = "sha256-MLDFU+Vp11eZ7hbY1qdmN0vVk2z2BIbMxSzTbLR49OU="; + url = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2023.2.tar.gz"; + sha256 = "sha256-h27C0b7tzkPa5FhKZvXF+UtawPxhB44d4BG9lcTPRco="; }; }; bpf-examples = { @@ -94,13 +94,13 @@ }; mpv-mpris = { pname = "mpv-mpris"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; - rev = "1.0"; + rev = "1.1"; fetchSubmodules = false; - sha256 = "sha256-7kPpCfiWe58V4fBOsEVvGoGeNIlMUAyD1fqS5/8k/e4="; + sha256 = "sha256-vZIO6ILatIWa9nJYOp4AMKwvaZLahqYWRLMDOizyBI0="; }; }; mpv-reload = { @@ -178,6 +178,14 @@ }; date = "2023-01-09"; }; + scutiger = { + pname = "scutiger"; + version = "0.2.0"; + src = fetchTarball { + url = "https://github.com/bk2204/scutiger/archive/refs/tags/v0.2.0.tar.gz"; + sha256 = "sha256-secBZwE105LATZY+9/aQ8M4rD0SqbDqfQhymrjblEf4="; + }; + }; smartprom = { pname = "smartprom"; version = "2.2.0"; @@ -188,15 +196,15 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "9ba7e294ea6f45410a15f192381d4918e8df4f02"; + version = "5bb9bed4e2a34761dc5dc188faec7315ae3930fe"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "9ba7e294ea6f45410a15f192381d4918e8df4f02"; + rev = "5bb9bed4e2a34761dc5dc188faec7315ae3930fe"; fetchSubmodules = true; - sha256 = "sha256-rt5EfbwVpwDuMJgFxNefutSj+i9rf7TiZGUCOap9hrI="; + sha256 = "sha256-h7Gu7rRlTKdu5pQOrYuzPbFFMrKiC+idb3vhzJQXUbQ="; }; - date = "2023-05-14"; + date = "2023-09-13"; }; xcompose = { 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" src.regex = "The latest version of ]*>batman-adv is ]*>batman-adv-([0-9\\.]+).tar.gz" src.from_pattern = "^.*batman-adv-([0-9\\.]+).tar.gz.*$" src.to_pattern = "\\1" -fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz" \ No newline at end of file +fetch.tarball = "https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-$ver.tar.gz" + +[scutiger] +src.github_tag = "bk2204/scutiger" +src.prefix = "v" +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 @@ +{ final, prev, sources, ... }: { + scutiger = final.rustPlatform.buildRustPackage { + inherit (sources.scutiger) pname version src; + + cargoHash = "sha256-d+wJ3trrldCVATsudsbglElU6q4LaS6feRocRyHal2k="; + + nativeBuildInputs = with final; [ pkg-config pcre2.dev zlib.dev git ]; + }; +} 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 { enable = true; lfs.enable = true; }; - environment.systemPackages = with pkgs; [ git-annex ]; + environment.systemPackages = with pkgs; [ git-annex scutiger ]; system.activationScripts.symlink-flake = '' 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 @@ sub-langs = "all,-live_chat,-rechat"; prefer-free-formats = true; embed-metadata = true; - downloader = "${pkgs.aria2}/bin/aria2c"; + # downloader = "${pkgs.axel}/bin/axel"; + concurrent-fragments = 4; + buffer-size = "16K"; sponsorblock-mark = "all"; restrict-filenames = true; + extractor-args = lib.concatStringsSep ";" [ + "youtube:player-client=android,web" + "youtube:formats=dashy" + ]; }; }; }; -- cgit v1.2.3