we can use unstable caddy now

This commit is contained in:
cy 2024-12-15 02:56:30 -05:00
parent f3275551bb
commit 0337509664
3 changed files with 1 additions and 22 deletions

19
flake.lock generated
View file

@ -57,8 +57,7 @@
"chromium": "chromium", "chromium": "chromium",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"sops-nix": "sops-nix", "sops-nix": "sops-nix"
"testpkgs": "testpkgs"
} }
}, },
"sops-nix": { "sops-nix": {
@ -80,22 +79,6 @@
"repo": "sops-nix", "repo": "sops-nix",
"type": "github" "type": "github"
} }
},
"testpkgs": {
"locked": {
"lastModified": 1733788258,
"narHash": "sha256-1vwUQvcs/pzRIg7Mo+QcE6ZavQWyjJP502n43b4VsGQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "248081c4729259c3add830d502779c5d04cbe074",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "248081c4729259c3add830d502779c5d04cbe074",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -12,8 +12,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
chromium.url = "github:NixOS/nixpkgs/314e12ba369ccdb9b352a4db26ff419f7c49fa84"; chromium.url = "github:NixOS/nixpkgs/314e12ba369ccdb9b352a4db26ff419f7c49fa84";
# this has the caddy module with environmentFile option
testpkgs.url = "github:NixOS/nixpkgs/248081c4729259c3add830d502779c5d04cbe074";
}; };
outputs = { outputs = {

View file

@ -5,10 +5,8 @@
inputs, inputs,
... ...
}: { }: {
disabledModules = ["services/web-servers/caddy/default.nix"];
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
"${inputs.testpkgs}/nixos/modules/services/web-servers/caddy"
../common.nix ../common.nix
./gitlab.nix ./gitlab.nix
./borg.nix ./borg.nix