From 9e050daa933c95c6bd699651f9bbf7ccbd17bc9d Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 2 Oct 2024 07:26:59 +0200 Subject: [PATCH 1/3] invidious-router: format with `nixfmt-rfc-style` --- pkgs/by-name/in/invidious-router/package.nix | 41 ++++++++++---------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index d61e0076f957a4..a1c18856a88659 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -2,29 +2,30 @@ lib, buildGoModule, fetchFromGitLab, -}: let +}: +let version = "1.1"; in - buildGoModule { - pname = "invidious-router"; - inherit version; +buildGoModule { + pname = "invidious-router"; + inherit version; - src = fetchFromGitLab { - owner = "gaincoder"; - repo = "invidious-router"; - rev = version; - hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; - }; + src = fetchFromGitLab { + owner = "gaincoder"; + repo = "invidious-router"; + rev = version; + hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; + }; - vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; + vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; - doCheck = true; + doCheck = true; - meta = { - homepage = "https://gitlab.com/gaincoder/invidious-router"; - description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; - license = with lib.licenses; [mit]; - maintainers = with lib.maintainers; [sils]; - mainProgram = "invidious-router"; - }; - } + meta = { + homepage = "https://gitlab.com/gaincoder/invidious-router"; + description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ sils ]; + mainProgram = "invidious-router"; + }; +} From 5cafb0d3d933c143227852b0c3be27e04236745d Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 2 Oct 2024 07:30:21 +0200 Subject: [PATCH 2/3] invidious-router: 1.1 -> 1.2 --- pkgs/by-name/in/invidious-router/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index a1c18856a88659..4bee845d290909 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -4,7 +4,7 @@ fetchFromGitLab, }: let - version = "1.1"; + version = "1.2"; in buildGoModule { pname = "invidious-router"; @@ -13,8 +13,8 @@ buildGoModule { src = fetchFromGitLab { owner = "gaincoder"; repo = "invidious-router"; - rev = version; - hash = "sha256-t8KQqMPkBbVis1odDcSu+H0uvyvoFqCmtWoHqVRxmfc="; + rev = "refs/tags/${version}"; + hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo="; }; vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; From 94c6a192b61da2d18d35b74c396dcd188fc7393c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Wed, 2 Oct 2024 07:34:02 +0200 Subject: [PATCH 3/3] invidious-router: add `updateScript` --- pkgs/by-name/in/invidious-router/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 4bee845d290909..5ac25de4e2a282 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitLab, + nix-update-script, }: let version = "1.2"; @@ -19,6 +20,8 @@ buildGoModule { vendorHash = "sha256-c03vYidm8SkoesRVQZdg/bCp9LIpdTmpXdfwInlHBKk="; + passthru.updateScript = nix-update-script { }; + doCheck = true; meta = {