Unverified Commit 2c7c2901 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #325288 from nevivurn/feat/kavita-update 

kavita: 0.8.1 -> 0.8.2
parents a8e03434 19123264

pkgs/servers/web-apps/kavita/change-webroot.diff

+9 −9
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ index 0c92547..d54abb9 100644 
 }

 

diff --git a/API/Services/DirectoryService.cs b/API/Services/DirectoryService.cs

index e3dede8..8ec6358 100644

index 8c6c796..711f315 100644

--- a/API/Services/DirectoryService.cs

+++ b/API/Services/DirectoryService.cs

@@ -117,7 +117,7 @@ public class DirectoryService : IDirectoryService

@@ -120,7 +120,7 @@ public class DirectoryService : IDirectoryService

         ExistOrCreate(SiteThemeDirectory);

         FaviconDirectory = FileSystem.Path.Join(FileSystem.Directory.GetCurrentDirectory(), "config", "favicons");

         ExistOrCreate(FaviconDirectory);
@@ -39,7 +39,7 @@ index ab3ad3d..f1a068b 100644 
 

         _cacheOptions = new MemoryCacheEntryOptions()

diff --git a/API/Startup.cs b/API/Startup.cs

index 3b872f3..424984c 100644

index 7e3857c..84c466b 100644

--- a/API/Startup.cs

+++ b/API/Startup.cs

@@ -36,6 +36,7 @@ using Microsoft.AspNetCore.StaticFiles;
@@ -50,7 +50,7 @@ index 3b872f3..424984c 100644 
 using Microsoft.Extensions.Hosting;

 using Microsoft.Extensions.Logging;

 using Microsoft.Net.Http.Headers;

@@ -295,9 +296,6 @@ public class Startup

@@ -314,9 +315,6 @@ public class Startup

         app.UsePathBase(basePath);

         if (!env.IsDevelopment())

         {
@@ -60,15 +60,15 @@ index 3b872f3..424984c 100644 
             // Update DB with what's in config

             var dataContext = serviceProvider.GetRequiredService<DataContext>();

             var setting = dataContext.ServerSetting.SingleOrDefault(x => x.Key == ServerSettingKey.BaseUrl);

@@ -341,6 +339,7 @@ public class Startup

@@ -360,6 +358,7 @@ public class Startup

 

         app.UseStaticFiles(new StaticFileOptions

         {

+            FileProvider = new PhysicalFileProvider("@webroot@"),

             ContentTypeProvider = new FileExtensionContentTypeProvider(),

             HttpsCompression = HttpsCompressionMode.Compress,

             OnPrepareResponse = ctx =>

@@ -410,7 +409,7 @@ public class Startup

             // bcmap files needed for PDF reader localizations (https://github.com/Kareadita/Kavita/issues/2970)

             ContentTypeProvider = new FileExtensionContentTypeProvider

             {

@@ -439,7 +438,7 @@ public class Startup

         try

         {

             var htmlDoc = new HtmlDocument();

pkgs/servers/web-apps/kavita/default.nix

+6 −13
Original line number Diff line number Diff line 
{ lib

, stdenvNoCC

, fetchFromGitHub

, fetchpatch

, buildDotnetModule

, buildNpmPackage

, dotnetCorePackages

, nixosTests

, substituteAll

}:



stdenvNoCC.mkDerivation (finalAttrs: {

  pname = "kavita";

  version = "0.8.1";

  version = "0.8.2";



  src = fetchFromGitHub {

    owner = "kareadita";

    repo = "kavita";

    rev = "v${finalAttrs.version}";

    hash = "sha256-Z8bGVF6h//37zz/J+PDlJhm7c9AUs2pgKhYY/4ELMhQ=";

    # commit immediately following the v${version} tag

    # for correct version reporting

    rev = "44c046176e54fa81e3420a1a40dcd9871e0a45f1";

    hash = "sha256-cHX6nzajFqygdFF9y4KEAMv0tdNx9xFbpOoVNo8uafs=";

  };



  backend = buildDotnetModule {
@@ -25,13 +25,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    inherit (finalAttrs) version src;



    patches = [

      # Fix wrongly bumped version 0.8.0.10 -> 0.8.1

      # Remove on next release

      (fetchpatch {

        name = "fix-0.8.1-version.patch";

        url = "https://github.com/Kareadita/Kavita/commit/3c9565468ad5494aef11dace62ba4b18b0c7d7f3.patch";

        hash = "sha256-/dPHYrCeS6M82rw0lQ8K6C4jfXEvVVmjA85RKyVaxcE=";

      })

      # The webroot is hardcoded as ./wwwroot

      ./change-webroot.diff

      # Upstream removes database migrations between versions
@@ -65,7 +58,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { 
    npmBuildScript = "prod";

    npmFlags = [ "--legacy-peer-deps" ];

    npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers

    npmDepsHash = "sha256-+RJ9mX/cIainO2xS/hIrIOShPVbHkhkCq6q2bP8dGKM=";

    npmDepsHash = "sha256-H53lwRr43MQWBbwc8N0GikAOkN2N0CwyiY8eGHveNFc=";

  };



  dontBuild = true;

pkgs/servers/web-apps/kavita/nuget-deps.nix

+388 −388

File changed.

Preview size limit exceeded, changes collapsed.