diff --git a/machines/bart/configuration.nix b/machines/bart/configuration.nix index 32b6673..c546226 100644 --- a/machines/bart/configuration.nix +++ b/machines/bart/configuration.nix @@ -160,7 +160,6 @@ in enable = true; cookieSecure = true; disableRegistration = true; - httpPort = 3001; package = unstable.forgejo; appName = "Thilos SCM"; rootUrl = "https://${gitea_url}/"; @@ -176,6 +175,7 @@ in ENABLE_NOTIFY_MAIL = true; DEFAULT_KEEP_EMAIL_PRIVATE = true; DEFAULT_ALLOW_CREATE_ORGANIZATION = false; + HTTP_PORT = 3001; #explore = { # DISABLE_USERS_PAGE = true; #}; @@ -200,13 +200,11 @@ in "repository.upload" = { TEMP_PATH = "/tmp/gitea/uploads"; }; - packages = { - CHUNKED_UPLOAD_PATH = "/tmp/gitea/package-uploads"; - }; }; }; postgresql = { enable = true; # Ensure postgresql is enabled + package = pkgs.postgresql_15; ensureDatabases = [ "woodpecker" "gitea" ]; ensureUsers = [{ name = "woodpecker"; diff --git a/nix/sources.json b/nix/sources.json index c253036..e2405ab 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -12,15 +12,15 @@ "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { - "branch": "nixos-23.05", + "branch": "nixos-23.11", "description": "Nix Packages collection", "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "67be70a859530f6f7c358568eaa6ab0d84b36b01", - "sha256": "1387ylqj3mlcdz1dq4i8p52br1mdi0pc5gd1qyr7j70cdhc27gl4", + "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3", + "sha256": "05vmvgjwj75nx7dvp534h3y1zhf2zqddcxpcyjlkrj0zb4id9mcl", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/67be70a859530f6f7c358568eaa6ab0d84b36b01.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "unstable": {