buildfarm: Update to NixOS 22.05
Eelco Dolstra committed
Sep 8, 2022 at 15:56 UTC
7ee8243759a967e8985ea843f6c05e01ea0b50e5
4 files changed
+5
-13
delft/common.nix
-6
@@ -51,12 +51,6 @@ with lib;
51
allowed-uris = https://github.com/ https://git.savannah.gnu.org/
52
'';
53
54
- networking.defaultMailServer = {
55
- directDelivery = true;
56
- hostName = "smtp.tudelft.nl";
57
- domain = "st.ewi.tudelft.nl";
58
- };
59
-
54
networking.firewall.enable = true;
55
networking.firewall.rejectPackets = true;
56
networking.firewall.allowPing = true;
delft/flake.nix
+3
-3
@@ -1,9 +1,9 @@
1
{
2
#inputs.nixpkgs.url = "/home/deploy/src/edolstra-nixpkgs"; # toString ../../edolstra-nixpkgs; # = "nixpkgs/release-19.09";
3
- inputs.nixpkgs.url = "nixpkgs/nixos-21.11-small";
3
+ inputs.nixpkgs.url = "nixpkgs/nixos-22.05-small";
4
inputs.nix.follows = "hydra/nix";
5
- #inputs.hydra.url = "github:NixOS/hydra/master";
6
- inputs.hydra.url = "github:DeterminateSystems/hydra/queue-runner-exporter";
5
+ inputs.hydra.url = "github:NixOS/hydra";
6
+ #inputs.hydra.url = "github:DeterminateSystems/hydra/queue-runner-exporter";
7
outputs = flakes @ { self, nixpkgs, nix, hydra /*, dwarffs */ }: {
8
9
nixopsConfigurations.default =
delft/network.nix
+2
-2
@@ -54,7 +54,7 @@ in {
54
documentation.nixos.enable = false;
55
56
security.acme.acceptTerms = true;
57
- security.acme.email = "webmaster@nixos.org";
57
+ security.acme.defaults.email = "webmaster@nixos.org";
58
59
imports = [
60
../modules/wireguard.nix
@@ -63,7 +63,7 @@ in {
63
{ system.configurationRevision = flakes.self.rev
64
or (throw "Cannot deploy from an unclean source tree!");
65
nixpkgs.overlays = [
66
- flakes.nix.overlay
66
+ flakes.nix.overlays.default
67
networkoverlay
68
];
69
nix.registry.nixpkgs.flake = flakes.nixpkgs;
delft/rhea/default.nix
-2
@@ -49,11 +49,9 @@
49
50
nix.extraOptions = "gc-keep-outputs = false";
51
52
- networking.defaultMailServer.directDelivery = lib.mkForce false;
52
#services.postfix.enable = true;
53
#services.postfix.hostname = "hydra.nixos.org";
54
55
# Don't rate-limit the journal.
56
services.journald.rateLimitBurst = 0;
57
}
59
-