diff options
| author | emilylange <git@emilylange.de> | 2024-05-20 22:19:00 +0200 |
|---|---|---|
| committer | emilylange <git@emilylange.de> | 2024-05-20 22:19:00 +0200 |
| commit | 215eb32ecbcbb15cecf0e2a995b7381d6be0b756 (patch) | |
| tree | 3d56f410064950071d994edda2efe99cb89074c0 | |
| parent | 1178d8a17f4da045d2f47beaac76a28d4c95e0b6 (diff) | |
forgejo: remove no longer needed preBuild phase (noop)
This slipped through the 1.21.11-1 -> 7.0.0 bump in 6c359d6488660331e53eb7203b22be2551a92b30. Upstream made this a noop with a deprecation warning instead of a hard fail in https://codeberg.org/forgejo/forgejo/pulls/2864. Note: In that PR (it's commit) they link to nixpkgs as downstream consumer of it (`build/merge-forgejo-locales.go`). ~~~ # Before Running phase: buildPhase NOT NEEDED: THIS IS A NOOP AS OF Forgejo 7.0 BUT KEPT FOR BACKWARD COMPATIBILITY Building subPackage ./. # After Running phase: buildPhase Building subPackage ./. ~~~ Upstream commit: https://codeberg.org/forgejo/forgejo/commit/6647e4d53f04f8d5585090c7f0cf266713542b4b
| -rw-r--r-- | pkgs/by-name/fo/forgejo/package.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 93fea61bfbc33..90c725c74e74b 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -80,10 +80,6 @@ buildGoModule rec { export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)" ''; - preBuild = '' - go run build/merge-forgejo-locales.go - ''; - postInstall = '' mkdir $data cp -R ./{templates,options} ${frontend}/public $data @@ -93,10 +89,9 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} ''; - # $data is not available in goModules.drv and preBuild isn't needed + # $data is not available in goModules.drv overrideModAttrs = (_: { postPatch = null; - preBuild = null; }); passthru = { |