peter/haccfiles
1
0
Fork 0
forked from hacc/haccfiles
Code Issues Pull requests Projects Releases Wiki Activity

forgejo 7.0.2 → 7.0.4

Browse source 
copies the state of 7.0.3 on nixpkgs master, updates to 7.0.4
This commit is contained in:
stuebinm 2024-06-13 21:03:56 +02:00
parent 5f982dad47
commit 7a05ceb813
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/forgejo/default.nix
View file

@ -24,7 +24,7 @@ let
pname = "forgejo-frontend"; pname = "forgejo-frontend";
inherit (forgejo) src version; inherit (forgejo) src version;
npmDepsHash = "sha256-BffoEbIzTU61bw3ECEm5eDHcav4S27MB5jQKsMprkcw="; npmDepsHash = "sha256-Nu9aOjJpEAuCWWnJfZXy/GayiUDiyc3hOu6Bx7GxfxA=";
patches = [ patches = [
./package-json-npm-build-frontend.patch ./package-json-npm-build-frontend.patch
@ -39,19 +39,19 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "forgejo"; pname = "forgejo";
version = "7.0.2"; version = "7.0.4";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "forgejo"; owner = "forgejo";
repo = "forgejo"; repo = "forgejo";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YY5dHXWMqlCIPfqsDtHZLHjEdYmrFnh4yc0hfTUESww="; hash = "sha256-WtJJdqPbx5k9U+u3ZpI3q/dm3eidxdkFgc8IskaJg88=";
}; };
vendorHash = "sha256-UcjaMi/4XYLdaJhi2j3UWqHqkpTbZBo6EwNXxdRIKLw="; vendorHash = "sha256-TYVWou9fIVL4od2o1uOb/MRBpf2lIg/9Tem9w+ihYzU=";
subPackages = [ "." ]; subPackages = [ "." "contrib/environment-to-ini" ];
outputs = [ "out" "data" ]; outputs = [ "out" "data" ];
@ -80,10 +80,6 @@ buildGoModule rec {
export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)" export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)"
''; '';
preBuild = ''
go run build/merge-forgejo-locales.go
'';
postInstall = '' postInstall = ''
mkdir $data mkdir $data
cp -R ./{templates,options} ${frontend}/public $data cp -R ./{templates,options} ${frontend}/public $data
@ -93,10 +89,9 @@ buildGoModule rec {
--prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} --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 = (_: { overrideModAttrs = (_: {
postPatch = null; postPatch = null;
preBuild = null;
}); });
passthru = { passthru = {
@ -120,7 +115,7 @@ buildGoModule rec {
}; };
meta = { meta = {
description = "A self-hosted lightweight software forge"; description = "Self-hosted lightweight software forge";
homepage = "https://forgejo.org"; homepage = "https://forgejo.org";
changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}";
license = lib.licenses.mit; license = lib.licenses.mit;