diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-09-05 15:36:50 +0200 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-09-05 16:21:43 +0200 |
| commit | 2f4c70939166d0a13aeaa17b8f8ecad98e201d30 (patch) | |
| tree | db142466adfea7bf82238e7ef205b83c298db70e /pkgs/applications/version-management/gitea | |
| parent | 86a1a0a68d01693864b894098a8922670ed59756 (diff) | |
| download | nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.tar nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.tar.gz nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.tar.bz2 nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.tar.lz nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.tar.xz nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.tar.zst nixpkgs-2f4c70939166d0a13aeaa17b8f8ecad98e201d30.zip | |
gitea: 1.12.3 -> 1.12.4
ChangeLog: https://github.com/go-gitea/gitea/releases/tag/v1.12.4 This release fixes a few security bugs: * https://github.com/go-gitea/gitea/issues?q=label%3Abackport%2Fv1.12+label%3Akind%2Fsecurity+is%3Aclosed
Diffstat (limited to 'pkgs/applications/version-management/gitea')
| -rw-r--r-- | pkgs/applications/version-management/gitea/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitea/static-root-path.patch | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 70169bd90e5..5005b9137a8 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.12.3"; + version = "1.12.4"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "05z1pp2lnbr82pw97wy0j0qk2vv1qv9c46df13d03xdfsc3gsm50"; + sha256 = "0zz3mwf1yhncvi6pl52lcwbl7k4kkrqyw8q3476akwszjn79n83c"; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch index 985dbe04082..e486397d9cf 100644 --- a/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -1,13 +1,13 @@ diff --git a/modules/setting/setting.go b/modules/setting/setting.go -index 714015c47..a2f85337e 100644 +index 45e55a2..9d18ee4 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go -@@ -641,7 +641,7 @@ func NewContext() { - PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80") +@@ -667,7 +667,7 @@ func NewContext() { OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() -- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath) -+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@") + if len(StaticRootPath) == 0 { +- StaticRootPath = AppWorkPath ++ StaticRootPath = "@data@" + } + StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath) StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour) - AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data")) - EnableGzip = sec.Key("ENABLE_GZIP").MustBool() |