fix kavita

This commit is contained in:
Kopatz
2024-04-15 12:26:45 +02:00
parent 30e8d8b57e
commit d578b5df71
5 changed files with 30 additions and 3 deletions

17
flake.lock generated
View File

@@ -229,6 +229,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-fixed-kavita": {
"locked": {
"lastModified": 1711893330,
"narHash": "sha256-XUZvnZGGptiAtUhxAjnCDjF6Ov6D0/Ag61L+sPyjVHA=",
"owner": "davidkna",
"repo": "nixpkgs",
"rev": "9c2c6f35de1ed1e18467cf224ed86689e6f589c4",
"type": "github"
},
"original": {
"owner": "davidkna",
"ref": "kavita-fix-migrations",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1697935651, "lastModified": 1697935651,
@@ -299,6 +315,7 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-fixed-kavita": "nixpkgs-fixed-kavita",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur" "nur": "nur"
} }

View File

@@ -6,6 +6,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
nixpkgs-fixed-kavita.url = "github:davidkna/nixpkgs/kavita-fix-migrations";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-23.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -27,6 +28,7 @@
nixos-hardware, nixos-hardware,
nixos-wsl, nixos-wsl,
nixpkgs-unstable, nixpkgs-unstable,
nixpkgs-fixed-kavita,
agenix, agenix,
home-manager, home-manager,
home-manager-unstable, home-manager-unstable,
@@ -44,7 +46,7 @@
./users/anon ./users/anon
./modules/collections/server.nix ./modules/collections/server.nix
./systems/server/configuration.nix ./systems/server/configuration.nix
({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; }) ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages fixed-kavita]; })
home-manager-unstable.nixosModules.home-manager home-manager-unstable.nixosModules.home-manager
agenix.nixosModules.default agenix.nixosModules.default
]; ];

View File

@@ -7,7 +7,7 @@
../services/github-runner.nix ../services/github-runner.nix
../services/gitolite.nix ../services/gitolite.nix
# wait for https://github.com/NixOS/nixpkgs/pull/300228 # wait for https://github.com/NixOS/nixpkgs/pull/300228
#../services/kavita.nix ../services/kavita.nix
../services/grafana.nix ../services/grafana.nix
#../services/nextcloud.nix #../services/nextcloud.nix
../services/nginx.nix ../services/nginx.nix

View File

@@ -18,8 +18,9 @@ in
}; };
services.kavita = { services.kavita = {
enable = false; enable = true;
user = "kavita"; user = "kavita";
package = pkgs.fixed-kavita.kavita;
settings.Port = 5000; settings.Port = 5000;
dataDir = baseDir; dataDir = baseDir;
tokenKeyFile = config.age.secrets.kavita.path; tokenKeyFile = config.age.secrets.kavita.path;

View File

@@ -20,4 +20,11 @@
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; };
fixed-kavita = final: _prev: {
fixed-kavita = import inputs.nixpkgs-fixed-kavita {
system = final.system;
config.allowUnfree = true;
};
};
} }