diff --git a/machines/gerd/services/authelia/authelia.nix b/machines/gerd/services/authelia/authelia.nix index 37790f0..e9d819e 100644 --- a/machines/gerd/services/authelia/authelia.nix +++ b/machines/gerd/services/authelia/authelia.nix @@ -11,7 +11,7 @@ in { services.authelia.instances.main = { enable = true; package = pkgs.authelia.override { - authelia-web = pkgs.authelia.passthru.web.overrideAttrs (old: { + web = pkgs.authelia.passthru.web.overrideAttrs (old: { postPatch = old.postPatch + '' substituteInPlace src/views/LoginPortal/FirstFactor/FirstFactorForm.tsx \ --replace-fail "const [rememberMe, setRememberMe] = useState(false)" "const [rememberMe, setRememberMe] = useState(true)" diff --git a/machines/gerd/services/uptime-kuma.nix b/machines/gerd/services/uptime-kuma.nix index 3a86ad5..7e266eb 100644 --- a/machines/gerd/services/uptime-kuma.nix +++ b/machines/gerd/services/uptime-kuma.nix @@ -59,7 +59,6 @@ in { locations."/" = config.mine.shared.lib.authelia.mkProtectedLocation { proxyPass = "http://localhost:${builtins.toString config.services.uptime-kuma.settings.PORT}"; - proxyWebsockets = true; }; }; diff --git a/shared/sources/default.nix b/shared/sources/default.nix index cef1cbe..7976278 100644 --- a/shared/sources/default.nix +++ b/shared/sources/default.nix @@ -18,6 +18,30 @@ in sources // { # url = "https://github.com/NixOS/nixpkgs/pull/353360.patch"; # sha256 = "sha256-WPNnvVmtySyEk58kVIYWVx3VN8MhX4v2ITLLnUGhpz4="; # }) + (pkgs.writeText "authelia.patch" '' + diff --git a/pkgs/servers/authelia/default.nix b/pkgs/servers/authelia/default.nix + index 2c49c09b0550..35f0827f89d7 100644 + --- a/pkgs/servers/authelia/default.nix + +++ b/pkgs/servers/authelia/default.nix + @@ -7,6 +7,7 @@ + installShellFiles, + callPackage, + nixosTests, + + web ? callPackage ./web.nix { inherit nodejs pnpm fetchFromGitHub; }, + }: + + let + @@ -16,7 +17,7 @@ let + src + vendorHash + ; + - web = callPackage ./web.nix { inherit nodejs pnpm fetchFromGitHub; }; + + # web = callPackage ./web.nix { inherit nodejs pnpm fetchFromGitHub; }; + in + buildGoModule rec { + inherit + + '') ]; }; } diff --git a/shared/sources/sources.json b/shared/sources/sources.json index b069312..110851d 100644 --- a/shared/sources/sources.json +++ b/shared/sources/sources.json @@ -17,10 +17,10 @@ "homepage": "", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", - "sha256": "0rlzjdw5l0gcjmh34san0qb25a3xxfcwdh75ppr343nzfrj8zbsq", + "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "sha256": "02i8sgnjzk4srk4j7qnjzig0rd4ip7a1vpbi5ynaqs1hh56q10r9", "type": "tarball", - "url": "https://github.com/nix-community/disko/archive/19c1140419c4f1cdf88ad4c1cfb6605597628940.tar.gz", + "url": "https://github.com/nix-community/disko/archive/18d0a984cc2bc82cf61df19523a34ad463aa7f54.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -41,10 +41,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", - "sha256": "09qy7zv80bkd9ighsw0bdxjq70dw3qjnyvg7il1fycrsgs5x1gan", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "sha256": "0iqla32cwy147lx1jw84174qkf8jyd912vxqjfgggyil1k8fix66", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5135c59491985879812717f4c9fea69604e7f26f.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/3a228057f5b619feb3186e986dbe76278d707b6e.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }