diff --git a/configuration/common/default.nix b/configuration/common/default.nix index efebb33..21d8fd3 100644 --- a/configuration/common/default.nix +++ b/configuration/common/default.nix @@ -30,6 +30,8 @@ auto-optimise-store = true; # Keep buildtime dependencies keep-outputs = true; + # Build local, when caches are broken + fallback = true; }; environment.systemPackages = with pkgs; [ diff --git a/flake.lock b/flake.lock index ed9bec0..aa7580b 100644 --- a/flake.lock +++ b/flake.lock @@ -247,11 +247,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1694183432, - "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { diff --git a/hosts/hydra-1/configuration.nix b/hosts/hydra-1/configuration.nix index 56369e5..46626f5 100644 --- a/hosts/hydra-1/configuration.nix +++ b/hosts/hydra-1/configuration.nix @@ -77,15 +77,10 @@ ''; }; - services.nix-serve = { + services.harmonia = { enable = true; - port = 5005; - bindAddress = "127.0.0.1"; - secretKeyFile = config.age.secrets.nix-cache-key.path; - # Workaround https://github.com/NixOS/nix/issues/7704#issuecomment-1409480909 - package = pkgs.nix-serve-ng.override { - nix = pkgs.nixVersions.nix_2_12; - }; + settings.bind = "[::1]:5005"; + signKeyPath = config.age.secrets.nix-cache-key.path; }; services.nginx.enable = true; @@ -109,7 +104,13 @@ ''; }; locations."/" = { - proxyPass = "http://127.0.0.1:5005"; + proxyPass = "http://[::1]:5005"; + extraConfig = '' + proxy_redirect http:// https://; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + ''; }; }; };