BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #208290 from Ma27/bump-gitea

Browse source 
gitea: 1.17.4 -> 1.18.0
This commit is contained in:
Maximilian Bosch 2023-01-02 12:01:05 +01:00 committed by GitHub
commit ba633b04e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/misc/gitea.nix
View file

@ -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) {

6
pkgs/applications/version-management/gitea/default.nix
View file

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildGoPackage
, fetchurl
, makeWrapper
@ -14,12 +15,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 = [
@ -68,5 +69,6 @@ buildGoPackage rec {
homepage = "https://gitea.io";
license = licenses.mit;
maintainers = with maintainers; [ disassembler kolaente ma27 techknowlogick ];
broken = stdenv.isDarwin;
};
}