From 33021e5d338d1c5117582959a4c2cbcd5fab6f0a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 15 Nov 2024 09:45:50 +0100
Subject: [PATCH 1/2] invidious: format

---
 pkgs/by-name/in/invidious/package.nix | 40 +++++++++++++++++----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index a52d431a1ce9..4a7d9de5d579 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -1,14 +1,15 @@
-{ lib
-, callPackage
-, crystal
-, fetchFromGitHub
-, librsvg
-, pkg-config
-, libxml2
-, openssl
-, shards
-, sqlite
-, nixosTests
+{
+  lib,
+  callPackage,
+  crystal,
+  fetchFromGitHub,
+  librsvg,
+  pkg-config,
+  libxml2,
+  openssl,
+  shards,
+  sqlite,
+  nixosTests,
 
   # All versions, revisions, and checksums are stored in ./versions.json.
   # The update process is the following:
@@ -19,7 +20,7 @@
   #     but nix's sandboxing does not allow that)
   #   * if shard.lock changed
   #     * recreate shards.nix by running crystal2nix
-, versions ? lib.importJSON ./versions.json
+  versions ? lib.importJSON ./versions.json,
 }:
 let
   # normally video.js is downloaded at build time
@@ -75,8 +76,15 @@ crystal.buildCrystalPackage rec {
           --replace-fail 'Process.run(%(rsvg-convert' 'Process.run(%(${lib.getBin librsvg}/bin/rsvg-convert'
     '';
 
-  nativeBuildInputs = [ pkg-config shards ];
-  buildInputs = [ libxml2 openssl sqlite ];
+  nativeBuildInputs = [
+    pkg-config
+    shards
+  ];
+  buildInputs = [
+    libxml2
+    openssl
+    sqlite
+  ];
 
   format = "crystal";
   shardsFile = ./shards.nix;
@@ -114,7 +122,9 @@ crystal.buildCrystalPackage rec {
   '';
 
   passthru = {
-    tests = { inherit (nixosTests) invidious; };
+    tests = {
+      inherit (nixosTests) invidious;
+    };
     updateScript = ./update.sh;
   };
 

From 6e266cd41623dc3f72a589c6474fbb652ecca15d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 15 Nov 2024 09:58:55 +0100
Subject: [PATCH 2/2] invidious: clean derivation

---
 pkgs/by-name/in/invidious/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 4a7d9de5d579..6157e59d01da 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -34,7 +34,7 @@ crystal.buildCrystalPackage rec {
     owner = "iv-org";
     repo = "invidious";
     fetchSubmodules = true;
-    rev = versions.invidious.rev or "v${version}";
+    rev = versions.invidious.rev or "refs/tags/v${version}";
     inherit (versions.invidious) hash;
   };
 
@@ -128,12 +128,12 @@ crystal.buildCrystalPackage rec {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open source alternative front-end to YouTube";
     mainProgram = "invidious";
     homepage = "https://invidious.io/";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
       _999eagle
       GaetanLepage
       sbruder