From 1cb6918b9bdc25641940494682458e1f4157aa3c Mon Sep 17 00:00:00 2001 From: schnusch Date: Tue, 21 Jun 2022 00:57:32 +0200 Subject: [PATCH 1/2] invidious: use nix-hash in update script --- pkgs/servers/invidious/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh index bf43fbb4b365..4810534cd298 100755 --- a/pkgs/servers/invidious/update.sh +++ b/pkgs/servers/invidious/update.sh @@ -60,7 +60,7 @@ info "Running scripts/fetch-player-dependencies.cr..." git -C "$git_dir" reset --hard "$new_rev" (cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified) rm -f "$git_dir/assets/videojs/.gitignore" -videojs_new_sha256=$(nix hash-path --type sha256 --base32 "$git_dir/assets/videojs") +videojs_new_sha256=$(nix-hash --type sha256 --base32 "$git_dir/assets/videojs") json_set '.videojs.sha256' "$videojs_new_sha256" if git -C "$git_dir" diff-tree --quiet "${old_rev}..${new_rev}" -- 'shard.lock'; then From 21dc8ddc411e60fb94c2d5deb999b9d590c6d610 Mon Sep 17 00:00:00 2001 From: schnusch Date: Sun, 5 Jun 2022 14:44:58 +0200 Subject: [PATCH 2/2] invidious: unstable-2022-05-11 -> unstable-2022-07-10 Some tests require JSON files from ./mocks/ which is a submodule. --- pkgs/servers/invidious/default.nix | 1 + pkgs/servers/invidious/versions.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index adcd694bad94..087683b5785c 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -21,6 +21,7 @@ crystal.buildCrystalPackage rec { src = fetchFromGitHub { owner = "iv-org"; repo = pname; + fetchSubmodules = true; inherit (versions.invidious) rev sha256; }; diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 40f8bb04182a..0f7c1431f0ed 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -4,9 +4,9 @@ "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" }, "invidious": { - "rev": "ca27e096f3249533cc7a9b123a8a8378f3312bb7", - "sha256": "0xjdzxnw6b5lk8pr82sjj60wfzxqkyamh0gpf2wxby52jvlbdcka", - "version": "unstable-2022-05-11" + "rev": "cbcf31a4f98706ea675cafb7509b37dc2b0ceace", + "sha256": "sha256-RliUNAOsU3ewyUl8hz4hvtlk7ztexW9Bl/N1vKLc6Dg=", + "version": "unstable-2022-07-10" }, "lsquic": { "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",