Your one-stop-cake-shop for everything Freshly Baked has to offer

feat: add kavita #102

merged opened by thecoded.prof targeting main from private/coded/push-wotkptsxywxq
Labels

None yet.

requested-reviewers

None yet.

tested-working
rejected

None yet.

assignee

None yet.

Participants 2
AT URI
at://did:plc:t4ifz7bz4cnukxryiqnbgxxr/sh.tangled.repo.pull/3m4fvdrgisy22
+49 -40
Interdiff #1 #2
packetmix/packages/default.nix

This file has not been changed.

packetmix/packages/kavita/change-webroot.diff

This file has not been changed.

packetmix/packages/kavita/change-webroot.diff.license

This file has not been changed.

+49 -40
packetmix/packages/kavita/default.nix
··· 7 7 config.packages.kavita = { 8 8 systems = [ "x86_64-linux" ]; 9 9 package = 10 - { kavita, fetchFromGitHub, buildNpmPackage, buildDotnetModule, dotnetCorePackages, ... }: 11 - kavita.overrideAttrs (final: prev: { 12 - version = "0.8.8.3"; 13 - src = fetchFromGitHub { 14 - owner = prev.src.owner; 15 - repo = prev.src.repo; 16 - rev = "v${final.version}"; 17 - hash = "sha256-Va3scgMxcLhqP+s7x/iDneCPZQCF0iOIQAfTJENcvOI="; 18 - }; 10 + { 11 + kavita, 12 + fetchFromGitHub, 13 + buildNpmPackage, 14 + buildDotnetModule, 15 + dotnetCorePackages, 16 + ... 17 + }: 18 + kavita.overrideAttrs ( 19 + final: prev: { 20 + version = "0.8.8.3"; 21 + src = fetchFromGitHub { 22 + owner = prev.src.owner; 23 + repo = prev.src.repo; 24 + rev = "v${final.version}"; 25 + hash = "sha256-Va3scgMxcLhqP+s7x/iDneCPZQCF0iOIQAfTJENcvOI="; 26 + }; 19 27 20 - backend = buildDotnetModule { 21 - pname = "kavita-backend"; 22 - inherit (final) version src; 28 + backend = buildDotnetModule { 29 + pname = "kavita-backend"; 30 + inherit (final) version src; 23 31 24 - patches = [ 25 - # The webroot is hardcoded as ./wwwroot 26 - ./change-webroot.diff 27 - # NOTE: Upstream frequently removes old database migrations between versions. 28 - # Currently no migration patches are needed for upgrades from NixOS 24.11 (v0.8.3.2). 29 - # Future updates should check if migration restoration is needed for supported upgrade paths. 30 - ]; 31 - postPatch = '' 32 - substituteInPlace API/Services/DirectoryService.cs --subst-var out 32 + patches = [ 33 + # The webroot is hardcoded as ./wwwroot 34 + ./change-webroot.diff 35 + # NOTE: Upstream frequently removes old database migrations between versions. 36 + # Currently no migration patches are needed for upgrades from NixOS 24.11 (v0.8.3.2). 37 + # Future updates should check if migration restoration is needed for supported upgrade paths. 38 + ]; 39 + postPatch = '' 40 + substituteInPlace API/Services/DirectoryService.cs --subst-var out 33 41 34 - substituteInPlace API/Startup.cs API/Services/LocalizationService.cs API/Controllers/FallbackController.cs \ 35 - --subst-var-by webroot "${final.frontend}/lib/node_modules/kavita-webui/dist/browser" 36 - ''; 42 + substituteInPlace API/Startup.cs API/Services/LocalizationService.cs API/Controllers/FallbackController.cs \ 43 + --subst-var-by webroot "${final.frontend}/lib/node_modules/kavita-webui/dist/browser" 44 + ''; 37 45 38 - executables = [ "API" ]; 46 + executables = [ "API" ]; 39 47 40 - projectFile = "API/API.csproj"; 41 - nugetDeps = ./nuget-deps.json; 42 - dotnet-sdk = dotnetCorePackages.sdk_9_0; 43 - dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; 44 - }; 48 + projectFile = "API/API.csproj"; 49 + nugetDeps = ./nuget-deps.json; 50 + dotnet-sdk = dotnetCorePackages.sdk_9_0; 51 + dotnet-runtime = dotnetCorePackages.aspnetcore_9_0; 52 + }; 45 53 46 - frontend = buildNpmPackage { 47 - pname = "kavita-frontend"; 48 - inherit (final) version src; 54 + frontend = buildNpmPackage { 55 + pname = "kavita-frontend"; 56 + inherit (final) version src; 49 57 50 - sourceRoot = "${final.src.name}/UI/Web"; 58 + sourceRoot = "${final.src.name}/UI/Web"; 51 59 52 - npmBuildScript = "prod"; 53 - npmFlags = [ "--legacy-peer-deps" ]; 54 - npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers 55 - npmDepsHash = "sha256-SqW9qeg0CKfVKYsDXmVsnVNmcH7YkaXtXpPjIqGL0i0="; 56 - }; 57 - }); 60 + npmBuildScript = "prod"; 61 + npmFlags = [ "--legacy-peer-deps" ]; 62 + npmRebuildFlags = [ "--ignore-scripts" ]; # Prevent playwright from trying to install browsers 63 + npmDepsHash = "sha256-SqW9qeg0CKfVKYsDXmVsnVNmcH7YkaXtXpPjIqGL0i0="; 64 + }; 65 + } 66 + ); 58 67 }; 59 68 }
packetmix/packages/kavita/nuget-deps.json

This file has not been changed.

packetmix/packages/kavita/nuget-deps.json.license

This file has not been changed.

packetmix/systems/teal/copyparty.nix

This file has not been changed.

packetmix/systems/teal/kavita.nix

This file has not been changed.

History

7 rounds 3 comments
sign up or login to add to the discussion
2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
5/5 success
expand
expand 0 comments
pull request successfully merged
2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
5/5 success
expand
expand 3 comments

I think this maybe wasn't doing anything in our testing, so we should drop it (from copyparty)

    users.groups."copyparty+kavita".members = [

     

       

      "copyparty"

     

       

      "kavita"

     

       

    ];

     

       



     

       

    clicks.storage.impermanence.persist.directories = [

     

       

      "/var/lib/copyparty"

     

       

      (

     

       

        let

     

       

          mode = "0770";

     

       

          user = "copyparty";

     

       

          group = "copyparty+kavita";

     

       

        in

     

       

        {

     

       

          directory = "/var/lib/copyparty/data/groups/library";

     

       

          inherit mode user group;

     

       

          defaultPerms = {

     

       

            inherit mode user group;

     

       

          };

     

       

        }

     

       

      )

     

       

    ];

otherwise looks good

oh goodness, that codeblock formatting looks real tangled on my screen...

will remove and re push tmrw sometime. Also yea, that's one heck of a code block

2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
5/5 success
expand
expand 0 comments
2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
1/5 failed, 1/5 timeout, 3/5 success
expand
expand 0 comments
2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
1/5 failed, 4/5 success
expand
expand 0 comments
2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
1/5 failed, 1/5 timeout, 3/5 success
expand
expand 0 comments
2 commits
expand
feat: add kavita
feat(copyparty): Add folder for kavita library
1/5 failed, 2/5 timeout, 2/5 success
expand
expand 0 comments