Update from master 2023-09-11T01:03+00:00
This commit is contained in:
commit
57ef206512
@ -30,6 +30,8 @@
|
|||||||
auto-optimise-store = true;
|
auto-optimise-store = true;
|
||||||
# Keep buildtime dependencies
|
# Keep buildtime dependencies
|
||||||
keep-outputs = true;
|
keep-outputs = true;
|
||||||
|
# Build local, when caches are broken
|
||||||
|
fallback = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
@ -247,11 +247,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1694183432,
|
"lastModified": 1693985761,
|
||||||
"narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
|
"narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
|
"rev": "0bffda19b8af722f8069d09d8b6a24594c80b352",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -77,15 +77,10 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nix-serve = {
|
services.harmonia = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = 5005;
|
settings.bind = "[::1]:5005";
|
||||||
bindAddress = "127.0.0.1";
|
signKeyPath = config.age.secrets.nix-cache-key.path;
|
||||||
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;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx.enable = true;
|
services.nginx.enable = true;
|
||||||
@ -109,7 +104,13 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
locations."/" = {
|
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;
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user