diff --git a/hosts/by-name/servo/services/email/postfix.nix b/hosts/by-name/servo/services/email/postfix.nix index 337ee55ae..064ced580 100644 --- a/hosts/by-name/servo/services/email/postfix.nix +++ b/hosts/by-name/servo/services/email/postfix.nix @@ -99,8 +99,10 @@ in services.postfix.hostname = "mx.uninsane.org"; services.postfix.origin = "uninsane.org"; services.postfix.destination = [ "localhost" "uninsane.org" ]; - services.postfix.sslCert = "/var/lib/acme/mx.uninsane.org/fullchain.pem"; - services.postfix.sslKey = "/var/lib/acme/mx.uninsane.org/key.pem"; + services.postfix.config.smtpd_tls_chain_files = [ + "/var/lib/acme/mx.uninsane.org/key.pem" + "/var/lib/acme/mx.uninsane.org/fullchain.pem" + ]; # see: `man 5 virtual` services.postfix.virtual = '' diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix index 5bdbd69f5..f933860a9 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/master.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix @@ -14,8 +14,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "407f4a093c23788a07874508108773adb25d695e"; - sha256 = "sha256-Wf6X1VNRBRgN+Ciga2VtsJk8gZ46Mmn7yhMQ6MBePRw="; - version = "unstable-2025-06-14"; + rev = "018f6ec3c2288d42fe0bf95371d4f8188cfd2f97"; + sha256 = "sha256-JeAcMDnaqswMLgUqNw1Brab4eo/qSedzbmjoVUvYLTA="; + version = "unstable-2025-06-16"; branch = "master"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix index 1692fa34c..33877d37e 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "3029e20133be398ba1573367dfde47162eef5179"; - sha256 = "sha256-ccA/TZsxPrAyqCDKyUYWIvaeo5EiKER/jUxHZtdnN1w="; - version = "unstable-2025-06-14"; + rev = "dfe18c7f6e50a33d2596cd283c9f45749bcb2d3f"; + sha256 = "sha256-fdn/MpgquaC4X/ji3mXKXhbSu1YmvTCcd+uWsMfesyg="; + version = "unstable-2025-06-16"; branch = "staging-next"; } diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix index c61eb4c71..2ac38069d 100644 --- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix +++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix @@ -2,8 +2,8 @@ mkNixpkgs ? import ./mkNixpkgs.nix {}, }: mkNixpkgs { - rev = "57a132d403d90bb8f74365ad1ac7ef991a04b881"; - sha256 = "sha256-vr+OUDrKROXfJSM/FaAxyIVOdQudxn902yRouAwBZfE="; - version = "unstable-2025-06-14"; + rev = "3d1e6bebb203767fbe36a8666c2d825b50c269cb"; + sha256 = "sha256-pvdMJs0BPNetIZFhwOnHnvEihkaYrGka2Js8fhIQv6M="; + version = "unstable-2025-06-16"; branch = "staging"; }