diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-03-20 18:01:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-20 18:01:14 +0100 |
| commit | fb08d62502851a7459638789b35517420cfd7c6a (patch) | |
| tree | 497afee2fe140808c1cd9e414af1eed5e6fe0e32 | |
| parent | Merge pull request #171276 from oxzi/prometheus-alertmanager-irc-relay-module (diff) | |
| parent | gitea: 1.18.5 -> 1.19.0 (diff) | |
| download | nixpkgs-fb08d62502851a7459638789b35517420cfd7c6a.tar.gz | |
Merge pull request #222193 from Ma27/bump-gitea
gitea: 1.18.5 -> 1.19.0
| -rw-r--r-- | nixos/tests/gitea.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitea/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/gitea/static-root-path.patch | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index a8b5567c2075..86d4fce37929 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -93,7 +93,7 @@ let api_token = server.succeed( "curl --fail -X POST http://test:totallysafe@localhost:3000/api/v1/users/test/tokens " + "-H 'Accept: application/json' -H 'Content-Type: application/json' -d " - + "'{\"name\":\"token\"}' | jq '.sha1' | xargs echo -n" + + "'{\"name\":\"token\",\"scopes\":[\"all\"]}' | jq '.sha1' | xargs echo -n" ) server.succeed( diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 3141d08cdcec..a09476a20582 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -15,12 +15,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.18.5"; + version = "1.19.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"; - hash = "sha256-OGPn4fknYfzmuAi6CL8m/Ih4uRNraVDmpBm20qT3lKk="; + hash = "sha256-9nDzXSGYxYw34/Ekmj44VdGLVhRsGL2e5gfyoyPUqGQ="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/applications/version-management/gitea/static-root-path.patch index e486397d9cf1..7f70329c6040 100644 --- a/pkgs/applications/version-management/gitea/static-root-path.patch +++ b/pkgs/applications/version-management/gitea/static-root-path.patch @@ -1,10 +1,10 @@ -diff --git a/modules/setting/setting.go b/modules/setting/setting.go -index 45e55a2..9d18ee4 100644 ---- a/modules/setting/setting.go -+++ b/modules/setting/setting.go -@@ -667,7 +667,7 @@ func NewContext() { +diff --git a/modules/setting/server.go b/modules/setting/server.go +index 183906268..fa02e8915 100644 +--- a/modules/setting/server.go ++++ b/modules/setting/server.go +@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) { OfflineMode = sec.Key("OFFLINE_MODE").MustBool() - DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() + Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() if len(StaticRootPath) == 0 { - StaticRootPath = AppWorkPath + StaticRootPath = "@data@" |