Merge pull request #243883 from techknowlogick/gitea-1200
gitea: 1.19.4 -> 1.20.0
This commit is contained in:
commit
38823d15f4
|
@ -439,6 +439,8 @@ in
|
||||||
lfs = mkIf cfg.lfs.enable {
|
lfs = mkIf cfg.lfs.enable {
|
||||||
PATH = cfg.lfs.contentDir;
|
PATH = cfg.lfs.contentDir;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload";
|
||||||
};
|
};
|
||||||
|
|
||||||
services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
|
services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) {
|
||||||
|
@ -575,7 +577,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "notify";
|
||||||
User = cfg.user;
|
User = cfg.user;
|
||||||
Group = cfg.group;
|
Group = cfg.group;
|
||||||
WorkingDirectory = cfg.stateDir;
|
WorkingDirectory = cfg.stateDir;
|
||||||
|
|
|
@ -121,14 +121,10 @@ let
|
||||||
client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}")
|
client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}")
|
||||||
client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"')
|
client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"')
|
||||||
|
|
||||||
server.succeed(
|
server.wait_until_succeeds(
|
||||||
'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits '
|
'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits '
|
||||||
+ '-H "Accept: application/json" | jq length)" = "1"'
|
+ '-H "Accept: application/json" | jq length)" = "1"'
|
||||||
)
|
)
|
||||||
|
|
||||||
client1.shutdown()
|
|
||||||
client2.shutdown()
|
|
||||||
server.shutdown()
|
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
in
|
in
|
||||||
|
|
|
@ -20,12 +20,12 @@
|
||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "gitea";
|
pname = "gitea";
|
||||||
version = "1.19.4";
|
version = "1.20.0";
|
||||||
|
|
||||||
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
# not fetching directly from the git repo, because that lacks several vendor files for the web UI
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
|
url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz";
|
||||||
hash = "sha256-vNMNEKMpUoVLUGwPPVhLKfElFmjCWgZHY5i1liNs+xk=";
|
hash = "sha256-ME2ZYSeaHru/7wBFBmXLpf9dKpl0WrtrmAqmzw37tq4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorHash = null;
|
vendorHash = null;
|
||||||
|
|
Loading…
Reference in a new issue