Unverified Commit db8c42de authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 022751ad 695a0cbd

nixos/modules/services/web-apps/windmill.nix

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ in 
  options.services.windmill = {

    enable = lib.mkEnableOption "windmill service";



    package = lib.mkPackageOption pkgs "windmill" { };



    serverPort = lib.mkOption {

      type = lib.types.port;

      default = 8001;
@@ -132,7 +134,7 @@ in 
          DynamicUser = true;

          # using the same user to simplify db connection

          User = cfg.database.user;

          ExecStart = "${pkgs.windmill}/bin/windmill";

          ExecStart = lib.getExe cfg.package;

          Restart = "always";

        }

        // lib.optionalAttrs useUrlPath {

nixos/tests/lanraragi.nix

+6 −0
Original line number Diff line number Diff line
@@ -7,11 +7,17 @@ 
    machine1 =

      { pkgs, ... }:

      {

        # needed for the cache

        virtualisation.memorySize = 4096;



        services.lanraragi.enable = true;

      };

    machine2 =

      { pkgs, ... }:

      {

        # needed for the cache

        virtualisation.memorySize = 4096;



        services.lanraragi = {

          enable = true;

          passwordFile = pkgs.writeText "lrr-test-pass" ''

pkgs/by-name/em/empire-compiler/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -9,13 +9,13 @@ 


buildDotnetModule (finalAttrs: {

  pname = "empire-compiler";

  version = "0.3.4";

  version = "0.4.0";



  src = fetchFromGitHub {

    owner = "bc-security";

    repo = "empire-compiler";

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

    hash = "sha256-HV61N76yNh16TL93L0LlBWBar1/AzHNX5/zsxl65AGM=";

    hash = "sha256-DzX78ks+fWjv170c7IGZHWnWhhBnrI8ueTL7hxIhJb0=";

  };



  postPatch = ''

pkgs/by-name/la/lanraragi/bail-if-cpanm-fails.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff --git a/tools/install.pl b/tools/install.pl

index fa99f5beb..b369b3b3e 100755

--- a/tools/install.pl

+++ b/tools/install.pl

@@ -242,7 +242,9 @@ sub install_package {

 

     if ($@) {

         say("$package not installed! Trying to install now using cpanm$cpanopt");

-        system("cpanm --notest $package $cpanopt");

+        if ( system("cpanm --notest $package $cpanopt") != 0 ) {

+            die "Something went wrong while installing $package - Bailing out.";

+        }

     } else {

         say("$package package installed, proceeding...");

     }

pkgs/by-name/la/lanraragi/fix-paths.patch

+66 −28
Original line number Diff line number Diff line 
diff --git a/lib/LANraragi.pm b/lib/LANraragi.pm

index e6b833c4..4b90e4c5 100644

index 1342d66..600ccbe 100644

--- a/lib/LANraragi.pm

+++ b/lib/LANraragi.pm

@@ -21,6 +21,8 @@ use LANraragi::Utils::Minion;

 use LANraragi::Model::Search;

 use LANraragi::Model::Config;

@@ -25,6 +25,8 @@ use LANraragi::Model::Config;

 

 use constant IS_UNIX => ( $Config{osname} ne 'MSWin32' );

 

+use FindBin;

+

 # This method will run once at server start

 sub startup {

     my $self = shift;

@@ -30,7 +32,7 @@ sub startup {

@@ -34,7 +36,7 @@ sub startup {

     say "ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━!!!!!";

 

     # Load package.json to get version/vername/description
@@ -21,18 +21,18 @@ index e6b833c4..4b90e4c5 100644 
     my $version = $packagejson->{version};

     my $vername = $packagejson->{version_name};

diff --git a/lib/LANraragi/Model/Archive.pm b/lib/LANraragi/Model/Archive.pm

index 73e824dd..8bcea29c 100644

index 425f935..9483012 100644

--- a/lib/LANraragi/Model/Archive.pm

+++ b/lib/LANraragi/Model/Archive.pm

@@ -13,6 +13,7 @@ use Time::HiRes qw(usleep);

@@ -14,6 +14,7 @@ use File::Path  qw(remove_tree);

 use File::Basename;

 use File::Copy "cp";

 use File::Path qw(make_path);

+use FindBin;

 

 use LANraragi::Utils::Generic qw(remove_spaces remove_newlines render_api_response);

 use LANraragi::Utils::TempFolder qw(get_temp);

@@ -126,7 +127,7 @@ sub serve_thumbnail {

 use LANraragi::Utils::Generic    qw(render_api_response);

 use LANraragi::Utils::String     qw(trim trim_CRLF);

@@ -222,7 +223,7 @@ sub serve_thumbnail {

         } else {

 

             # If the thumbnail doesn't exist, serve the default thumbnail.
@@ -40,30 +40,30 @@ index 73e824dd..8bcea29c 100644 
+            $self->render_file( filepath => "$FindBin::Bin/../public/img/noThumb.png" );

         }

         return;

 

     } else {

diff --git a/lib/LANraragi/Utils/Generic.pm b/lib/LANraragi/Utils/Generic.pm

index 14736893..4352f023 100644

index 1b1ffbd..c0f87d6 100644

--- a/lib/LANraragi/Utils/Generic.pm

+++ b/lib/LANraragi/Utils/Generic.pm

@@ -17,6 +17,8 @@ use Sys::CpuAffinity;

 use LANraragi::Utils::TempFolder qw(get_temp);

 use LANraragi::Utils::Logging qw(get_logger);

@@ -28,6 +28,8 @@ BEGIN {

     }

 }

 

+use FindBin;

+

 # Generic Utility Functions.

 use Exporter 'import';

 our @EXPORT_OK =

@@ -161,7 +163,7 @@ sub start_shinobu {

 our @EXPORT_OK = qw(is_image is_archive render_api_response get_tag_with_namespace shasum_str start_shinobu

@@ -149,7 +151,7 @@ sub start_shinobu {

     my $mojo = shift;

 

     if ( IS_UNIX ) {

         my $proc = Proc::Simple->new();

-        $proc->start( $^X, "./lib/Shinobu.pm" );

+        $proc->start( $^X, "$FindBin::Bin/../lib/Shinobu.pm" );

         $proc->kill_on_destroy(0);

 

         $mojo->LRR_LOGGER->debug( "Shinobu Worker new PID is " . $proc->pid );

@@ -201,7 +203,7 @@ sub get_css_list {

@@ -198,7 +200,7 @@ sub get_css_list {

 

     #Get all the available CSS sheets.

     my @css;
@@ -72,11 +72,50 @@ index 14736893..4352f023 100644 
     while ( my $file = readdir($dir) ) {

         if ( $file =~ /.+\.css/ ) { push( @css, $file ); }

     }

diff --git a/lib/LANraragi/Utils/I18N.pm b/lib/LANraragi/Utils/I18N.pm

index b917c2c..bee242e 100644

--- a/lib/LANraragi/Utils/I18N.pm

+++ b/lib/LANraragi/Utils/I18N.pm

@@ -5,19 +5,22 @@ use warnings;

 use utf8;

 use base 'Locale::Maketext';

 

+# Technically, we could just not use FindBin::Bin, but then the search process

+# would go through a lot of unnecessary effort to finally find the translations

+use FindBin;

 use Locale::Maketext::Lexicon {

-    en      => [ Gettext => "../../locales/template/en.po" ],

-    es      => [ Gettext => "../../locales/template/es.po" ],

-    zh      => [ Gettext => "../../locales/template/zh.po" ],

-    "zh-cn" => [ Gettext => "../../locales/template/zh.po" ],

-    fr      => [ Gettext => "../../locales/template/fr.po" ],

-    id      => [ Gettext => "../../locales/template/id.po" ],

-    ko      => [ Gettext => "../../locales/template/ko.po" ],

-    no      => [ Gettext => "../../locales/template/nb_NO.po" ],

-    nb      => [ Gettext => "../../locales/template/nb_NO.po" ],

-    pt      => [ Gettext => "../../locales/template/pt.po" ],

-    "zh-tw" => [ Gettext => "../../locales/template/zh_Hant.po" ],

-    vi      => [ Gettext => "../../locales/template/vi.po" ],

+    en      => [ Gettext => "$FindBin::Bin/../locales/template/en.po" ],

+    es      => [ Gettext => "$FindBin::Bin/../locales/template/es.po" ],

+    zh      => [ Gettext => "$FindBin::Bin/../locales/template/zh.po" ],

+    "zh-cn" => [ Gettext => "$FindBin::Bin/../locales/template/zh.po" ],

+    fr      => [ Gettext => "$FindBin::Bin/../locales/template/fr.po" ],

+    id      => [ Gettext => "$FindBin::Bin/../locales/template/id.po" ],

+    ko      => [ Gettext => "$FindBin::Bin/../locales/template/ko.po" ],

+    no      => [ Gettext => "$FindBin::Bin/../locales/template/nb_NO.po" ],

+    nb      => [ Gettext => "$FindBin::Bin/../locales/template/nb_NO.po" ],

+    pt      => [ Gettext => "$FindBin::Bin/../locales/template/pt.po" ],

+    "zh-tw" => [ Gettext => "$FindBin::Bin/../locales/template/zh_Hant.po" ],

+    vi      => [ Gettext => "$FindBin::Bin/../locales/template/vi.po" ],

     _auto   => 0,

 };

 

diff --git a/lib/LANraragi/Utils/Logging.pm b/lib/LANraragi/Utils/Logging.pm

index ee29c507..6bdfc1bd 100644

index 7acbd01..b73ce3e 100644

--- a/lib/LANraragi/Utils/Logging.pm

+++ b/lib/LANraragi/Utils/Logging.pm

@@ -18,7 +18,7 @@ our @EXPORT_OK = qw(get_logger get_plugin_logger get_logdir get_lines_from_file)

@@ -19,7 +19,7 @@ our @EXPORT_OK = qw(get_logger get_plugin_logger get_logdir get_lines_from_file)

 # Get the Log folder.

 sub get_logdir {
@@ -86,7 +125,7 @@ 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 a5ab8a83..64a56255 100644

index a5ab8a8..64a5625 100644

--- a/lib/LANraragi/Utils/TempFolder.pm

+++ b/lib/LANraragi/Utils/TempFolder.pm

@@ -13,7 +13,7 @@ our @EXPORT_OK = qw(get_temp);
@@ -98,4 +137,3 @@ index a5ab8a83..64a56255 100644 
 

     # Folder location can be overriden by LRR_TEMP_DIRECTORY

     if ( $ENV{LRR_TEMP_DIRECTORY} ) {