misc: update deps

Author: MarcelCoding

Cargo.lock

@@ -6,11 +6,11 @@ edition = "2021"
 [dependencies]
 clap = { version = "4.5", features = ["std", "color", "help", "usage", "error-context", "suggestions", "derive", "env"] }
 lettre = { version = "0.11", default-features = false, features = ["tokio1", "smtp-transport", "pool", "hostname", "builder"] }
-tokio = { version = "1.38", features = ["macros", "rt-multi-thread", "net", "fs", "signal"] }
+tokio = { version = "1.43", features = ["macros", "rt-multi-thread", "net", "fs", "signal"] }
 tracing = { version = "0.1", features = ["release_max_level_info"] }
 tracing-subscriber = { version = "0.3", features = ["fmt", "ansi"] }
-axum = { version = "0.7", features = ["tokio", "http1", "json"] }
-tower-http = { version = "0.5", features = ["trace", "validate-request", "sensitive-headers", "auth"] }
+axum = { version = "0.8", features = ["tokio", "http1", "json"] }
+tower-http = { version = "0.6", features = ["trace", "validate-request", "sensitive-headers", "auth"] }
 tera = { version = "1.20", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 anyhow = { version = "1.0", features = ["std"] }

Cargo.toml

@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -14,19 +14,17 @@
         in
         {
           packages = rec {
-            post = pkgs.callPackage ./derivation.nix {
-              cargoToml = ./Cargo.toml;
-            };
+            post = pkgs.callPackage ./package.nix { };
             default = post;
           };
         }
       ) // {
       overlays.default = _: prev: {
-        post = self.packages."${prev.system}".default;
+        inherit (self.packages."${prev.system}") post;
       };
 
       nixosModules = rec {
-        post = import ./module.nix;
+        post = ./module.nix;
         default = post;
       };
     };

derivation.nix

@@ -5,13 +5,8 @@ let
 in
 {
   options.services.post = {
-    package = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.post;
-      defaultText = lib.literalExpression "pkgs.post";
-      description = "Which post derivation to use.";
-    };
     enable = lib.mkEnableOption "post";
+    package = lib.mkPackageOption pkgs "post" { };
     listen = {
       addr = lib.mkOption {
         type = lib.types.str;
@@ -57,18 +52,17 @@ in
 
       environment =
         let
-          listenAddr = cfg.listen.addr;
-          smtpAddr = cfg.listen.addr;
+          addrToString = addr: port: "${if (lib.hasInfix ":" addr) then "[${addr}]" else addr}:${toString port}";
         in
         {
-          POST_LISTEN_ADDR = "${if (lib.hasInfix ":" listenAddr) then "[${listenAddr}]" else listenAddr}:${toString cfg.listen.port}";
-          POST_SMTP_ADDR = "${if (lib.hasInfix ":" smtpAddr) then "[${smtpAddr}]" else smtpAddr}:${toString cfg.smtp.port}";
+          POST_LISTEN_ADDR = addrToString cfg.listen.addr cfg.listen.port;
+          POST_SMTP_ADDR = addrToString cfg.smtp.addr cfg.smtp.port;
           POST_TEMPLATE_GLOB = cfg.templateGlob;
           POST_API_TOKEN_FILE = "%d/api_token";
         };
 
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/post";
+        ExecStart = lib.getExe cfg.package;
         DynamicUser = true;
         User = "post";
         LoadCredential = "api_token:${cfg.apiTokenFile}";

flake.lock

@@ -0,0 +1,19 @@
+{ lib, rustPlatform, ... }:
+
+let
+  manifest = (lib.importTOML ./Cargo.toml).package;
+in
+rustPlatform.buildRustPackage rec {
+  pname = manifest.name;
+  inherit (manifest) version;
+
+  src = lib.cleanSource ./.;
+  cargoLock.lockFile = ./Cargo.lock;
+
+  cargoBuildFlags = "-p ${pname}";
+  cargoTestFlags = "-p ${pname}";
+
+  meta = {
+    mainProgram = "post";
+  };
+}

flake.nix

@@ -8,5 +8,5 @@ mod send;
 pub(super) fn router() -> Router<Context> {
   Router::new()
     .route("/v1/send", post(send::adhoc))
-    .route("/v1/send/:template_name", post(send::template))
+    .route("/v1/send/{template_name}", post(send::template))
 }