diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 9d1896f9dbcc..c8e2fbf68aa7 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -1,3 +1,10 @@ +{ lts ? false +, version +, hash +, npmDepsHash +, vendorHash +}: + { bash , brotli , buildGoModule @@ -20,11 +27,17 @@ }: let + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "forgejo"; + repo = "forgejo"; + rev = "v${version}"; + inherit hash; + }; + frontend = buildNpmPackage { pname = "forgejo-frontend"; - inherit (forgejo) src version; - - npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA="; + inherit src version npmDepsHash; patches = [ ./package-json-npm-build-frontend.patch @@ -38,18 +51,13 @@ let }; in buildGoModule rec { - pname = "forgejo"; - version = "7.0.5"; + pname = "forgejo" + lib.optionalString lts "-lts"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "forgejo"; - repo = "forgejo"; - rev = "v${version}"; - hash = "sha256-Y/Ita5dr3COACffAIAjcqHHcdKiUWWEb/f/MPzMG200="; - }; - - vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; + inherit + version + src + vendorHash + ; subPackages = [ "." "contrib/environment-to-ini" ]; diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix new file mode 100644 index 000000000000..1d48257ad2cd --- /dev/null +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -0,0 +1,7 @@ +import ./generic.nix { + version = "7.0.5"; + hash = "sha256-Y/Ita5dr3COACffAIAjcqHHcdKiUWWEb/f/MPzMG200="; + npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA="; + vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw="; + lts = false; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c04a8063878c..bff116702190 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2193,8 +2193,6 @@ with pkgs; diff-so-fancy = callPackage ../applications/version-management/diff-so-fancy { }; - forgejo = callPackage ../by-name/fo/forgejo/generic.nix { }; - gex = callPackage ../applications/version-management/gex { inherit (darwin.apple_sdk.frameworks) Security; };