From 100d943cc1bfc11feca48ecc8bdab73108ce7af1 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 29 Dec 2022 23:02:32 +0100 Subject: [PATCH 1/3] gitea: 1.17.4 -> 1.18.0 ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.18.0 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index aa394fb45278..e4c10e98793a 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -14,12 +14,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.17.4"; + version = "1.18.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.io/gitea/${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-koZEr89QhxCf2Dd/7SWiS/ZZoRIBfyu0mbxKknjXPK4="; + sha256 = "sha256-X0KvIB2JvSoh2MR9FcwKObQzod2GxhKeGqIKU5CKTEM="; }; patches = [ From 0cd88dbc60085fd12fc8c6f44a638e5f04a77ce8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:18:49 +0100 Subject: [PATCH 2/3] nixos/gitea: adapt configs for 1.18 Co-authored-by: Izorkin --- nixos/modules/services/misc/gitea.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index ceb4c1172854..00e90f5b32b4 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -395,7 +395,7 @@ in ROOT_URL = cfg.rootUrl; } (mkIf cfg.enableUnixSocket { - PROTOCOL = "unix"; + PROTOCOL = "http+unix"; HTTP_ADDR = "/run/gitea/gitea.sock"; }) (mkIf (!cfg.enableUnixSocket) { @@ -404,7 +404,6 @@ in }) (mkIf cfg.lfs.enable { LFS_START_SERVER = true; - LFS_CONTENT_PATH = cfg.lfs.contentDir; }) ]; @@ -426,6 +425,10 @@ in oauth2 = { JWT_SECRET = "#oauth2jwtsecret#"; }; + + lfs = mkIf (cfg.lfs.enable) { + PATH = cfg.lfs.contentDir; + }; }; services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { From b5c6d4dabd07be704d8806e6f93de180646aae3c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 2 Jan 2023 11:15:52 +0100 Subject: [PATCH 3/3] gitea: mark as broken on darwin Build is currently failing: ``` /nix/store/za0pnll14dv61b124n6xxnjapd150lcr-go-1.19.4/share/go/pkg/tool/darwin_amd64/link: running clang failed: exit status 1 Undefined symbols for architecture x86_64: "_pam_start_confdir", referenced from: __cgo_897673d6bfaf_Cfunc_pam_start_confdir in 000032.o _check_pam_start_confdir in 000033.o (maybe you meant: _check_pam_start_confdir, __cgo_897673d6bfaf_Cfunc_check_pam_start_confdir , __cgo_897673d6bfaf_Cfunc_pam_start_confdir ) ld: symbol(s) not found for architecture x86_64 clang-11: error: linker command failed with exit code 1 (use -v to see invocation) error: builder for '/nix/store/zqr2xx5a66km81m8av714sm45gy3ym0g-gitea-1.18.0.drv' failed with exit code 1; ``` --- pkgs/applications/version-management/gitea/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index e4c10e98793a..e90213c971a3 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildGoPackage , fetchurl , makeWrapper @@ -68,5 +69,6 @@ buildGoPackage rec { homepage = "https://gitea.io"; license = licenses.mit; maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ]; + broken = stdenv.isDarwin; }; }