From 2a294648ca23ee0f8b5d7692114fc9c99468eefa Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 8 Jun 2023 20:05:24 +0300 Subject: [PATCH 1/2] gitea: Fix substitution in wrong file after rebasing a patch This command is needed to substitute @data@ which is added by static-root-path.patch. When this patch was rebased for 1.19.0, the file name changed, but the command was not updated. --- pkgs/applications/version-management/gitea/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index fabf0907b369..1d29534a976e 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -34,7 +34,7 @@ buildGoModule rec { ]; postPatch = '' - substituteInPlace modules/setting/setting.go --subst-var data + substituteInPlace modules/setting/server.go --subst-var data ''; subPackages = [ "." ]; From c69621b8bdc47d8baa5aaca7a0b61253d7568772 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Thu, 8 Jun 2023 20:16:13 +0300 Subject: [PATCH 2/2] gitea: Add coreutils binaries to PATH coreutils is used by hooks which are generated by gitea, e.g.: $ cat hooks/pre-receive #!/usr/bin/env bash # AUTO GENERATED BY GITEA, DO NOT MODIFY data=$(cat) exitcodes="" hookname=$(basename $0) --- pkgs/applications/version-management/gitea/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 1d29534a976e..17b839617ef8 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -5,6 +5,7 @@ , makeWrapper , git , bash +, coreutils , gitea , gzip , openssh @@ -62,7 +63,7 @@ buildGoModule rec { cp -R ./options/locale $out/locale wrapProgram $out/bin/gitea \ - --prefix PATH : ${lib.makeBinPath [ bash git gzip openssh ]} + --prefix PATH : ${lib.makeBinPath [ bash coreutils git gzip openssh ]} ''; passthru = {