aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock35
-rw-r--r--modules/nixos/cooklang-chef.nix21
-rw-r--r--pkgs/chef/default.nix2
3 files changed, 40 insertions, 18 deletions
diff --git a/flake.lock b/flake.lock
index 9d40a88..87437c7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1710146030,
- "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@@ -26,11 +26,11 @@
]
},
"locked": {
- "lastModified": 1703863825,
- "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
+ "lastModified": 1729742964,
+ "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
- "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
+ "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
@@ -41,11 +41,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1726150823,
- "narHash": "sha256-xGZgwHKZWLfs1xsS6hzGl+sDZTmXPsdbYd5acTgvQgs=",
+ "lastModified": 1748454422,
+ "narHash": "sha256-Zp2WyUlX4x9A9+uqzKzHO78esnySRgDN4JlxRWG3zno=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "329e7d9382cbe4eb605e203565c0864874785032",
+ "rev": "641789d5890bd80bf5595bcc9ac11317735a43b8",
"type": "github"
},
"original": {
@@ -67,11 +67,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1725532428,
- "narHash": "sha256-dCfawQDwpukcwQw++Cn/3LIh/RZMmH+k3fm91Oc5Pf0=",
+ "lastModified": 1743690424,
+ "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=",
"owner": "nix-community",
"repo": "poetry2nix",
- "rev": "a313fd7169ae43ecd1a2ea2f1e4899fe3edba4d2",
+ "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94",
"type": "github"
},
"original": {
@@ -112,8 +112,9 @@
"type": "github"
},
"original": {
- "id": "systems",
- "type": "indirect"
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
}
},
"treefmt-nix": {
@@ -124,11 +125,11 @@
]
},
"locked": {
- "lastModified": 1719749022,
- "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
+ "lastModified": 1730120726,
+ "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
+ "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
"type": "github"
},
"original": {
diff --git a/modules/nixos/cooklang-chef.nix b/modules/nixos/cooklang-chef.nix
index 65af966..823227c 100644
--- a/modules/nixos/cooklang-chef.nix
+++ b/modules/nixos/cooklang-chef.nix
@@ -59,6 +59,8 @@ in {
default = "/";
};
};
+
+ restartOnChanges = mkEnableOption "Restart cooklang-chef service on changes to ${cfg.recipeRoot}";
};
config = mkIf cfg.enable {
@@ -118,6 +120,25 @@ in {
};
};
+ systemd.services.cooklang-chef-watcher = mkIf cfg.restartOnChanges {
+ description = "Restart cooklang-chef on file change";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "/run/current-system/sw/bin/systemctl restart cooklang-chef.service";
+ Type = "oneshot";
+ };
+ };
+
+ systemd.paths.cooklang-chef-watcher = mkIf cfg.restartOnChanges {
+ description = "Restart cooklang-chef on file change";
+ wantedBy = [ "multi-user.target" ];
+ pathConfig = {
+ Unit = "cooklang-chef-watcher.service";
+ PathChanged = cfg.recipeRoot;
+ };
+ };
+
services.nginx = mkIf cfg.nginx.enable {
enable = mkDefault true;
virtualHosts.${cfg.nginx.virtualHost} = {
diff --git a/pkgs/chef/default.nix b/pkgs/chef/default.nix
index a2d6623..b765966 100644
--- a/pkgs/chef/default.nix
+++ b/pkgs/chef/default.nix
@@ -12,7 +12,7 @@ let
in rustPlatform.buildRustPackage {
inherit pname version src;
- cargoHash = "sha256-RnpcB7AtFu1/yV6n0U2HKFuUS+yMGL7+LY0fyrJe1TA=";
+ cargoHash = "sha256-77KPW4SQ9KI0H+ND3mFITJjftLjpLMXi7qp0PUZOINw=";
nativeBuildInputs = [
installShellFiles