From b857e3185706eef17f925e6a7cb7783d87efe751 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 25 Aug 2024 22:19:00 +0200 Subject: [PATCH 1/4] invidious: switch to github repo --- pkgs/servers/invidious/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 0cd88f4ffa92..a52d431a1ce9 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -1,7 +1,7 @@ { lib , callPackage , crystal -, fetchFromGitea +, fetchFromGitHub , librsvg , pkg-config , libxml2 @@ -29,8 +29,7 @@ crystal.buildCrystalPackage rec { pname = "invidious"; inherit (versions.invidious) version; - src = fetchFromGitea { - domain = "gitea.invidious.io"; + src = fetchFromGitHub { owner = "iv-org"; repo = "invidious"; fetchSubmodules = true; From 2c32d3f65ed0b48015a4f24070af56633c99ff55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9B=A7-440729=20=5Bsophie=5D?= Date: Mon, 26 Aug 2024 22:46:18 +0200 Subject: [PATCH 2/4] invidious: fix update script --- pkgs/servers/invidious/update.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh index 2ba5c3452c6c..848a6a9010ea 100755 --- a/pkgs/servers/invidious/update.sh +++ b/pkgs/servers/invidious/update.sh @@ -36,7 +36,7 @@ if [ ! -d "$git_dir" ]; then fi git -C "$git_dir" fetch origin --tags "$git_branch" -new_tag="$(git -C "$git_dir" ls-remote --tags --sort=committerdate origin | head -n1 | grep -Po '(?<=refs/tags/).*')" +new_tag="$(git -C "$git_dir" ls-remote --tags --sort=-committerdate origin | tail -n1 | grep -Po '(?<=refs/tags/).*')" new_version="${new_tag#v}" if [ "$new_version" = "$old_version" ]; then @@ -44,8 +44,9 @@ if [ "$new_version" = "$old_version" ]; then exit fi +info "updating to $new_tag" commit="$(git -C "$git_dir" rev-list "$new_tag" --max-count=1 --abbrev-commit)" -date="$(git -C "$git_dir" log -1 --format=%cd --date=format:%Y.%m.%d)" +date="$(git -C "$git_dir" log -1 --format=%cd --date=format:%Y.%m.%d "$commit")" json_set '.invidious.date' "$date" json_set '.invidious.commit' "$commit" json_set '.invidious.version' "$new_version" From 4d3a22cf1c3b158ee1ea32bad686a63a26ca8ea2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 27 Aug 2024 07:45:28 +0200 Subject: [PATCH 3/4] invidious: 2.20240427 -> 2.20240825.2 Diff: https://github.com/iv-org/invidious/compare/v2.20240427...v2.20240825.2 Changelog: https://github.com/iv-org/invidious/releases/tag/v2.20240825.2 --- pkgs/servers/invidious/shards.nix | 4 ++-- pkgs/servers/invidious/versions.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/servers/invidious/shards.nix index 8e38d563be20..97979576efa6 100644 --- a/pkgs/servers/invidious/shards.nix +++ b/pkgs/servers/invidious/shards.nix @@ -1,8 +1,8 @@ { ameba = { url = "https://github.com/crystal-ameba/ameba.git"; - rev = "v1.5.0"; - sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; + rev = "v1.6.1"; + sha256 = "1qlgqpgycfxvvrfzih7b9ayb6fvkffz5aw0msbj70z2q7wvsq29p"; }; athena-negotiation = { url = "https://github.com/athena-framework/negotiation.git"; diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 35a6f77b84b6..4a4776b17649 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -1,9 +1,9 @@ { "invidious": { - "hash": "sha256-YZ+uhn1ESuRTZxAMoxKCpxEaUfeCUqOrSr3LkdbrTkU=", - "version": "2.20240427", - "date": "2024.04.27", - "commit": "eda7444c" + "hash": "sha256-oNkEFATRVgPC8Bhp0v04an3LvqgsSEjLZdeblb7n8TI=", + "version": "2.20240825.2", + "date": "2024.08.26", + "commit": "4782a670" }, "videojs": { "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" From a1f7e3d10e8c3ce6b983a677516e2c62ddef33ba Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 27 Aug 2024 07:54:27 +0200 Subject: [PATCH 4/4] nixos/invidious: remove machine.config in test --- nixos/tests/invidious.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/invidious.nix b/nixos/tests/invidious.nix index 372b47b56c34..c042b1065c26 100644 --- a/nixos/tests/invidious.nix +++ b/nixos/tests/invidious.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; networking.firewall.allowedTCPPorts = [ config.services.postgresql.settings.port ]; }; - machine = { config, lib, pkgs, ... }: { + machine = { lib, pkgs, ... }: { services.invidious = { enable = true; }; @@ -81,11 +81,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { def activate_specialisation(name: str): - machine.succeed(f"${nodes.machine.config.system.build.toplevel}/specialisation/{name}/bin/switch-to-configuration test >&2") + machine.succeed(f"${nodes.machine.system.build.toplevel}/specialisation/{name}/bin/switch-to-configuration test >&2") - url = "http://localhost:${toString nodes.machine.config.services.invidious.port}" - port = ${toString nodes.machine.config.services.invidious.port} + url = "http://localhost:${toString nodes.machine.services.invidious.port}" + port = ${toString nodes.machine.services.invidious.port} # start postgres vm now postgres_tcp.start()