From f74f7fb7ebcfdf8ef65922801b99a4b3e357203d Mon Sep 17 00:00:00 2001 From: Petingoso Date: Wed, 13 Aug 2025 21:29:27 +0100 Subject: [PATCH] lanraragi: 0.9.21 -> 0.9.41 --- pkgs/by-name/la/lanraragi/fix-paths.patch | 9 +++++---- pkgs/by-name/la/lanraragi/install.patch | 9 +++++---- pkgs/by-name/la/lanraragi/package.nix | 11 +++++++---- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/la/lanraragi/fix-paths.patch b/pkgs/by-name/la/lanraragi/fix-paths.patch index f545bd4759f7..c6edb7da6bcc 100644 --- a/pkgs/by-name/la/lanraragi/fix-paths.patch +++ b/pkgs/by-name/la/lanraragi/fix-paths.patch @@ -86,15 +86,16 @@ index ee29c507..6bdfc1bd 100644 # Folder location can be overriden by LRR_LOG_DIRECTORY if ( $ENV{LRR_LOG_DIRECTORY} ) { diff --git a/lib/LANraragi/Utils/TempFolder.pm b/lib/LANraragi/Utils/TempFolder.pm -index 792b1c1b..f0eb341b 100644 +index a5ab8a83..64a56255 100644 --- a/lib/LANraragi/Utils/TempFolder.pm +++ b/lib/LANraragi/Utils/TempFolder.pm -@@ -20,7 +20,7 @@ our @EXPORT_OK = qw(get_temp get_tempsize clean_temp_full clean_temp_partial); +@@ -13,7 +13,7 @@ our @EXPORT_OK = qw(get_temp); #Get the current tempfolder. #This can be called from any process safely as it uses FindBin. sub get_temp { -- my $temp_folder = "$FindBin::Bin/../public/temp"; -+ my $temp_folder = "./public/temp"; +- my $temp_folder = "$FindBin::Bin/../temp"; ++ my $temp_folder = "./temp"; # Folder location can be overriden by LRR_TEMP_DIRECTORY if ( $ENV{LRR_TEMP_DIRECTORY} ) { + diff --git a/pkgs/by-name/la/lanraragi/install.patch b/pkgs/by-name/la/lanraragi/install.patch index 42138483389a..3716be915ae2 100644 --- a/pkgs/by-name/la/lanraragi/install.patch +++ b/pkgs/by-name/la/lanraragi/install.patch @@ -1,5 +1,5 @@ diff --git a/tools/install.pl b/tools/install.pl -index f09218f..a63de58 100644 +index 9e155f0..a63de58 100644 --- a/tools/install.pl +++ b/tools/install.pl @@ -9,6 +9,7 @@ use Config; @@ -10,7 +10,7 @@ index f09218f..a63de58 100644 #Vendor dependencies my @vendor_css = ( -@@ -90,32 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { +@@ -90,33 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) { $cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec"; } @@ -20,6 +20,7 @@ index f09218f..a63de58 100644 -IPC::Cmd->import('can_run'); -require Config::AutoConf; - +- -say("\r\nWill now check if all LRR software dependencies are met. \r\n"); - -#Check for Redis @@ -43,7 +44,7 @@ index f09218f..a63de58 100644 #Check for PerlMagick say("Checking for ImageMagick/PerlMagick..."); my $imgk; -@@ -135,37 +110,11 @@ if ($@) { +@@ -136,37 +110,11 @@ if ($@) { say("OK!"); } @@ -81,7 +82,7 @@ index f09218f..a63de58 100644 make_path getcwd . "/public/css/vendor"; make_path getcwd . "/public/css/webfonts"; make_path getcwd . "/public/js/vendor"; -@@ -212,19 +161,3 @@ sub cp_node_module { +@@ -213,19 +161,3 @@ sub cp_node_module { } diff --git a/pkgs/by-name/la/lanraragi/package.nix b/pkgs/by-name/la/lanraragi/package.nix index b80b9aebb6ef..41d8dad607b1 100644 --- a/pkgs/by-name/la/lanraragi/package.nix +++ b/pkgs/by-name/la/lanraragi/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "lanraragi"; - version = "0.9.21"; + version = "0.9.41"; src = fetchFromGitHub { owner = "Difegue"; repo = "LANraragi"; - rev = "v.${version}"; - hash = "sha256-2YdQeBW1MQiUs5nliloISaxG0yhFJ6ulkU/Urx8PN3Y="; + tag = "v.${version}"; + hash = "sha256-HF2g8rrcV6f6ZTKmveS/yjil/mBxpvRUFyauv5f+qQ8="; }; patches = [ @@ -67,6 +67,9 @@ buildNpmPackage rec { TimeLocal YAMLPP StringSimilarity + CHI + CacheFastMmap + LocaleMaketextLexicon ] ++ lib.optionals stdenv.hostPlatform.isLinux [ LinuxInotify2 ]; @@ -123,7 +126,7 @@ buildNpmPackage rec { passthru.tests.module = nixosTests.lanraragi; meta = { - changelog = "https://github.com/Difegue/LANraragi/releases/tag/${src.rev}"; + changelog = "https://github.com/Difegue/LANraragi/releases/tag/${src.tag}"; description = "Web application for archival and reading of manga/doujinshi"; homepage = "https://github.com/Difegue/LANraragi"; license = lib.licenses.mit;