From e0199bf23d4a8c6c0a8de9c7a4ffd4da8dc0b3ed Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Sat, 27 Apr 2024 21:49:46 +0200
Subject: [PATCH] update kavita version

---
 flake.lock                  | 17 -----------------
 flake.nix                   |  4 +---
 modules/services/kavita.nix |  2 +-
 overlays.nix                |  7 -------
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/flake.lock b/flake.lock
index f4a70ee..b524e35 100644
--- a/flake.lock
+++ b/flake.lock
@@ -229,22 +229,6 @@
         "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": {
       "locked": {
         "lastModified": 1697935651,
@@ -315,7 +299,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
-        "nixpkgs-fixed-kavita": "nixpkgs-fixed-kavita",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index 8d6df78..44af488 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
       nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
       nixos-hardware.url = "github:NixOS/nixos-hardware/master";
       nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
-      nixpkgs-fixed-kavita.url = "github:davidkna/nixpkgs/kavita-fix-migrations";
       home-manager = {
         url = "github:nix-community/home-manager/release-23.11";
         inputs.nixpkgs.follows = "nixpkgs";
@@ -28,7 +27,6 @@
               nixos-hardware,
               nixos-wsl,
               nixpkgs-unstable,
-              nixpkgs-fixed-kavita,
               agenix,
               home-manager,
               home-manager-unstable,
@@ -47,7 +45,7 @@
         ./users/anon
         ./modules/collections/server.nix
         ./systems/server/configuration.nix
-        ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages fixed-kavita]; })
+        ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
         home-manager-unstable.nixosModules.home-manager
         agenix.nixosModules.default
       ];
diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix
index 7beb9d4..fac08a0 100644
--- a/modules/services/kavita.nix
+++ b/modules/services/kavita.nix
@@ -22,7 +22,7 @@ in
  services.kavita = {
     enable = true;
     user = "kavita";
-    package = pkgs.fixed-kavita.kavita;
+    package = pkgs.kavita;
     settings.Port = 5000;
     dataDir = baseDir;
     tokenKeyFile = config.age.secrets.kavita.path;
diff --git a/overlays.nix b/overlays.nix
index 99529af..99f666c 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -20,11 +20,4 @@
       config.allowUnfree = true;
     };
   };
-  
-  fixed-kavita = final: _prev: {
-    fixed-kavita = import inputs.nixpkgs-fixed-kavita {
-      system = final.system;
-      config.allowUnfree = true;
-    };
-  };
 }