all repos — nixfiles @ 6b0c72268d4df0f4add90ff1ae3d26512879a74b

System and user configuration, managed by nix and home-manager

marvin: use known-working version of caddy

Alin
commit

6b0c72268d4df0f4add90ff1ae3d26512879a74b

parent

fd8c5000ad3e8ff8da5c3ef11fb5f98cfbefed2d

2 files changed, 22 insertions(+), 1 deletion(-)

changed files
M flake.lock → flake.lock
@@ -118,6 +118,22 @@ "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
         "type": "github"
       }
     },
+    "caddy-darwin-nixpkgs": {
+      "locked": {
+        "lastModified": 1771861243,
+        "narHash": "sha256-mz05b1VyLWoTkNg8iJr3yXFJF7HDlwIUKI3ln39RacY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "80d901ec0377e19ac3f7bb8c035201e2e098cc97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "80d901e",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [

@@ -962,6 +978,7 @@ "root": {
       "inputs": {
         "agenix": "agenix",
         "angrr": "angrr",
+        "caddy-darwin-nixpkgs": "caddy-darwin-nixpkgs",
         "darwin": "darwin",
         "elgit": "elgit",
         "home-manager": "home-manager",
M flake.nix → flake.nix
@@ -11,6 +11,7 @@ nanopi = {
       url = "github:bdew/nixos-nanopi";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    caddy-darwin-nixpkgs.url = "github:NixOS/nixpkgs/80d901e";
 
     nixpkgs.follows = "srvos/nixpkgs";
     darwin = {

@@ -161,7 +162,7 @@ nix.settings.max-jobs = 4;
           }
         ];
       };
-      darwinConfigurations.marvin = darwin.lib.darwinSystem {
+      darwinConfigurations.marvin = darwin.lib.darwinSystem rec {
         system = "aarch64-darwin";
         modules = [
           {

@@ -173,6 +174,9 @@ srvos.darwinModules.desktop
           angrr.darwinModules.angrr
           ./system/hosts/marvin.nix
           ./packages/modules/darwin/caddy
+          {
+            services.caddy.package = inputs.caddy-darwin-nixpkgs.legacyPackages.${system}.caddy;
+          }
         ];
       };
       homeConfigurations."alin@marvin" = mkHomeConfiguration {