From 31d5838761beb415ada8f0666dec8057da1a86ba Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 9 Aug 2024 18:12:44 +0200 Subject: [PATCH] forgejo,forgejo-lts: fix `passthru.updateScript` `nix-update` is unable to detect that the hashes are in `packages.nix` and `lts.nix` instead of `generic.nix` (where the `.src` attribute lies) respectively. `nix-update` provides a `--override-filename` flag to override that heuristic, so we use that. Additionally, scope `lts.nix` to the 7.x version series by using `--version-regex`. --- pkgs/by-name/fo/forgejo/generic.nix | 3 ++- pkgs/by-name/fo/forgejo/lts.nix | 6 ++++++ pkgs/by-name/fo/forgejo/package.nix | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 4f6d7769249f..080789bec45e 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -3,6 +3,7 @@ , hash , npmDepsHash , vendorHash +, nixUpdateExtraArgs ? [ ] }: { bash @@ -154,7 +155,7 @@ buildGoModule rec { ''; tests = if lts then nixosTests.forgejo-lts else nixosTests.forgejo; - updateScript = nix-update-script { }; + updateScript = nix-update-script { extraArgs = nixUpdateExtraArgs; }; }; meta = { diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 5244a3bcd82e..5db327d51b02 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -4,4 +4,10 @@ import ./generic.nix { npmDepsHash = "sha256-OqtYRjftwGxgW1JgMxyWd+9DndpEkd3LdQHSECc40yU="; vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; lts = true; + nixUpdateExtraArgs = [ + "--version-regex" + "v(7\.[0-9.]+)" + "--override-filename" + "pkgs/by-name/fo/forgejo/lts.nix" + ]; } diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 99d51617ff04..8ca93b3b9865 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -4,4 +4,8 @@ import ./generic.nix { npmDepsHash = "sha256-6AMaZadgcTvOBsIXJjZQB6Q1rkdn+R82pclXdVvtdWY="; vendorHash = "sha256-tNb0tCf+gjUmUqrjkzt7Wqqz21hW9WRh8CEdX8rv8Do="; lts = false; + nixUpdateExtraArgs = [ + "--override-filename" + "pkgs/by-name/fo/forgejo/package.nix" + ]; }