Gabe/nix-config
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

fixed https://github.com/NixOS/nixpkgs/issues/398172 in nixpkgs fork.

Browse source 
just waiting for https://github.com/NixOS/nixpkgs/pull/398536 to get
reviewed and merged.
This commit is contained in:
Gabe Venberg 2025-04-14 12:57:56 +02:00
parent 357f6ae2f6
commit 90fe4a9ad0
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -225,16 +225,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743095683, "lastModified": 1744623728,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "narHash": "sha256-4yNH4c7zkUi3nuYHsmRRXXAcDLkT/fP5eQPoLhqMWwA=",
"owner": "nixos", "owner": "gabevenberg",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "rev": "b87080e2ab4478d9fb9b89114a9bea3e62ddd98f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "gabevenberg",
"ref": "nixos-unstable", "ref": "restic-server-htpasswd-file",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -3,7 +3,7 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:gabevenberg/nixpkgs/restic-server-htpasswd-file";
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL/main"; url = "github:nix-community/NixOS-WSL/main";

2
hosts/cirrostratus/restic.nix
View file

@ -12,7 +12,7 @@ in {
sopsFile = "${inputs.nix-secrets}/restic-server"; sopsFile = "${inputs.nix-secrets}/restic-server";
format = "binary"; format = "binary";
# TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to remove this. # TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to remove this.
path = "/backup/restic/.htpasswd"; # path = "/backup/restic/.htpasswd";
owner = "restic"; owner = "restic";
}; };
secrets.restic-url = { secrets.restic-url = {

2
modules/nixos/restic.nix
View file

@ -92,7 +92,7 @@
dataDir = cfg.server.repositoryPath; dataDir = cfg.server.repositoryPath;
listenAddress = "127.0.0.1:${cfg.server.port}"; listenAddress = "127.0.0.1:${cfg.server.port}";
# TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to enable this. # TODO: fix https://github.com/NixOS/nixpkgs/issues/398172 to enable this.
# extraFlags = ["--htpasswd-file='${cfg.server.htpasswdPath}'"]; htpasswd-file = cfg.server.htpasswdPath;
}; };
services.nginx.virtualHosts = services.nginx.virtualHosts =