Skip to content

chore(deps): update nixpkgs to nixos-25.05 #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srhb merged 7 commits into from
Jul 22, 2025
Merged

chore(deps): update nixpkgs to nixos-25.05 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
01a8904
chore(deps): update nixpkgs to nixos-25.05
dbcdk-platform-renovate[bot] May 17, 2025
69026fa
flake.lock: Update
johanot Jun 7, 2025
8fb86c5
flake: fix warnings - note that the defaultPackage -> package.default…
johanot Jun 12, 2025
ffc50db
issuer/init_resolvers: remove unused explicit lifetime
johanot Jun 12, 2025
df0ef6d
tests/lib: permissions clash on /etc/bind (the bind upstream module u…
johanot Jun 12, 2025
b12b237
tests/lib: nothing wants network-online.target, so its inactive. Inst…
johanot Jun 12, 2025
8a200f6
Merge pull request #152 from johanot/fix-2505
srhb Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
description = "faythe";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
crane.url = "github:ipetkov/crane";
crane.inputs.nixpkgs.follows = "nixpkgs";
};

outputs = { self, crane, nixpkgs }:
Expand All @@ -29,8 +28,10 @@
craneLib = crane.mkLib final;
};
in {
packages.${system}.${pname} = pkgs.${pname};
defaultPackage.${system} = pkgs.${pname};
packages.${system} = {
${pname} = pkgs.${pname};
default = pkgs.${pname};
};

overlays.default = final: prev:
let
Expand Down Expand Up @@ -77,7 +78,7 @@
clippy = pkgs."${pname}-clippy";
};

devShell.${system} = with pkgs; mkShell {
devShells.${system}.default = with pkgs; mkShell {
buildInputs = [
rust-analyzer
cargo
Expand Down
12 changes: 5 additions & 7 deletions nixos/lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ in
dnsutils
];

environment.etc."bind/zones/${domain}.zone" = {
environment.etc."zones/${domain}.zone" = {
mode = "0644";
user = "named";
group = "named";
Expand All @@ -82,7 +82,7 @@ in

services.bind.zones."${domain}" = {
master = true;
file = "/etc/bind/zones/${domain}.zone";
file = "/etc/zones/${domain}.zone";
# the bind zone module is very opinionated and this sets allow-transfer.
slaves = [ nodes.client.networking.primaryIPAddress ];
extraConfig = ''
Expand All @@ -91,7 +91,7 @@ in
};

# Hack to allow access to the directory copied from environment.etc
systemd.services.bind.serviceConfig.ExecStartPre = "+${pkgs.coreutils}/bin/chown named /etc/bind/zones";
systemd.services.bind.serviceConfig.ExecStartPre = "+${pkgs.coreutils}/bin/chown named /etc/zones";
};

client =
Expand Down Expand Up @@ -154,10 +154,8 @@ in
testScript = ''
start_all()

ns.wait_for_unit("network-online.target")
acme.wait_for_unit("network-online.target")
client.wait_for_unit("network-online.target")

acme.wait_for_unit("pebble.service")
client.wait_for_unit("faythe.service")
ns.wait_for_unit("bind.service")

client.wait_until_succeeds("ping -c1 ${nodes.ns.networking.primaryIPAddress}")
Expand Down
2 changes: 1 addition & 1 deletion src/issuer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ impl Resolvers {
}
}

async fn init_resolvers<'l>(config: &FaytheConfig) -> Result<HashMap<String, TokioAsyncResolver>, ResolverError> {
async fn init_resolvers(config: &FaytheConfig) -> Result<HashMap<String, TokioAsyncResolver>, ResolverError> {
let mut resolvers = HashMap::new();

for z in &config.zones {
Expand Down
Loading