diff options
Diffstat (limited to 'pkgs/by-name/fo/forgejo/package.nix')
| -rw-r--r-- | pkgs/by-name/fo/forgejo/package.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 04ee8268ab0a4..ade722176d0b2 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -24,7 +24,7 @@ let pname = "forgejo-frontend"; inherit (forgejo) src version; - npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw="; + npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA="; patches = [ ./package-json-npm-build-frontend.patch @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "7.0.1"; + version = "7.0.3"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-HTTbIS+GBEuhYuKSI5jlhoX6hl6BsXp77h8JSQZyknI="; + hash = "sha256-P+HVZmfNA1ao+fQ253tK8A2DNGNPxvdyzCvByQJ0FGA="; }; - vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw="; + vendorHash = "sha256-8qMpnGL5GXJuxOpxh9a1Bcxd7tVweUKwbun8UBxCfQA="; subPackages = [ "." ]; @@ -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 = { |