cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #32742 from afldcr/master

Browse source 
gitea: 1.2.3 -> 1.3.2
This commit is contained in:
Samuel Leathers 2017-12-17 12:53:53 -05:00 committed by GitHub
commit cfa5bb8d1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,13 +7,13 @@ with stdenv.lib;
buildGoPackage rec {
name = "gitea-${version}";
version = "1.2.3";
version = "1.3.2";
src = fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "0v24q14xzmqgwk10m7rqyn6pahd630v3bnc646ij4w8fbgr8hzja";
sha256 = "11gzb6x8zixmkm57x8hdncmdbbvppzld3yf7p7m0abigg8zyybsj";
};
patches = [ ./static-root-path.patch ];

6
pkgs/applications/version-management/gitea/static-root-path.patch
View file

@ -2,12 +2,12 @@ diff --git i/modules/setting/setting.go w/modules/setting/setting.go
index aafe2d1b..1e4a8064 100644
--- i/modules/setting/setting.go
+++ w/modules/setting/setting.go
@@ -683,7 +683,7 @@ func NewContext() {
@@ -730,7 +730,7 @@ func NewContext() {
LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL)
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
- StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(AppWorkPath)
+ StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString("@data@")
AppDataPath = sec.Key("APP_DATA_PATH").MustString("data")
AppDataPath = sec.Key("APP_DATA_PATH").MustString(path.Join(AppWorkPath, "data"))
EnableGzip = sec.Key("ENABLE_GZIP").MustBool()
EnablePprof = sec.Key("ENABLE_PPROF").MustBool(false)