Merge pull request #323122 from TomaSajt/lanraragi (5ea6f34e) · Commits · mdf / nixpkgs

pkgs/by-name/la/lanraragi/install.patch

+11 −8

Original line number	Diff line number	Diff line
		diff --git a/tools/install.pl b/tools/install.pl
		index dbeb7c11..06e4c675 100755
		index b7c7adb..a63de58 100644
		--- a/tools/install.pl
		+++ b/tools/install.pl
		@@ -9,6 +9,7 @@ use Config;
		@@ -10,7 +10,7 @@ index dbeb7c11..06e4c675 100755

		#Vendor dependencies
		my @vendor_css = (
		@@ -91,32 +92,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) {
		@@ -90,34 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) {
		$cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec";
		}

		@@ -30,9 +30,11 @@ index dbeb7c11..06e4c675 100755
		-
		-#Check for GhostScript
		-say("Checking for GhostScript...");
		-can_run('gs')
		- or warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.';
		-if ( can_run('gs') ) {
		- say("OK!");
		-} else {
		- warn 'NOT FOUND! PDF support will not work properly. Please install the "gs" tool.';
		-}
		-
		-#Check for libarchive
		-say("Checking for libarchive...");
		@@ -43,7 +45,7 @@ index dbeb7c11..06e4c675 100755
		#Check for PerlMagick
		say("Checking for ImageMagick/PerlMagick...");
		my $imgk;
		@@ -136,36 +111,11 @@ if ($@) {
		@@ -137,37 +110,11 @@ if ($@) {
		say("OK!");
		}

		@@ -67,7 +69,8 @@ index dbeb7c11..06e4c675 100755

		- say("\r\nObtaining remote Web dependencies...\r\n");
		-
		- if ( system("npm ci") != 0 ) {
		- my $npmcmd = $legacy ? "npm install" : "npm ci";
		- if ( system($npmcmd) != 0 ) {
		- die "Something went wrong while obtaining node modules - Bailing out.";
		- }
		-
		@@ -80,7 +83,7 @@ index dbeb7c11..06e4c675 100755
		make_path getcwd . "/public/css/vendor";
		make_path getcwd . "/public/css/webfonts";
		make_path getcwd . "/public/js/vendor";
		@@ -212,19 +162,3 @@ sub cp_node_module {
		@@ -214,19 +161,3 @@ sub cp_node_module {

		}

pkgs/by-name/la/lanraragi/package.nix

+6 −17

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		, stdenv
		, buildNpmPackage
		, fetchFromGitHub
		, fetchpatch
		, makeBinaryWrapper
		, perl
		, ghostscript
		@@ -11,32 +10,22 @@

		buildNpmPackage rec {
		pname = "lanraragi";
		version = "0.9.0";
		version = "0.9.10";

		src = fetchFromGitHub {
		owner = "Difegue";
		repo = "LANraragi";
		rev = "v.${version}";
		hash = "sha256-euZotpXTUSmxlA5rbTUhHpHH0Ojd3AZjGasxYZ+L7NY=";
		hash = "sha256-mW2cVd+SPbjc/+b0KY3je1eqw5ZT/GKFruE4Y/eFdD4=";
		};

		patches = [
		(fetchpatch {
		name = "fix-redis-auth.patch";
		url = "https://github.com/Difegue/LANraragi/commit/1711b39759ad02ab2a8863ce1f35f6479c9a2917.patch";
		hash = "sha256-WfKeieysIlS64qgVEc75JFKjxXuvZN85M6US/gwjTzw=";
		})
		(fetchpatch {
		name = "fix-ghostscript-device.patch";
		url = "https://github.com/Difegue/LANraragi/commit/087d63b11c89fda8cb3a30cdb2e86ecd6be66bb7.patch";
		hash = "sha256-Cu9d/dDlO0yuFCTKOyg5A0gIuiA+FcWD9PjexB/BK0U=";
		})
		./install.patch
		./fix-paths.patch
		./expose-password-hashing.patch # Used by the NixOS module
		];

		npmDepsHash = "sha256-/F/lhQIVGbbFxFuQXXwHUVlV2jhHt0hFf94v0FrTKt8=";
		npmDepsHash = "sha256-RAjZGuK0C6R22fVFq82GPQoD1HpRs3MYMluUAV5ZEc8=";

		nativeBuildInputs = [ perl makeBinaryWrapper ];

		@@ -59,6 +48,7 @@ buildNpmPackage rec {
		MojoliciousPluginTemplateToolkit
		MojoliciousPluginRenderFile
		MojoliciousPluginStatus
		IOSocketSocks
		IOSocketSSL
		CpanelJSONXS
		Minion
		@@ -69,9 +59,9 @@ buildNpmPackage rec {
		FileChangeNotify
		ModulePluggable
		TimeLocal
		YAMLSyck
		YAMLPP
		StringSimilarity
		] ++ lib.optional stdenv.isLinux LinuxInotify2;
		] ++ lib.optionals stdenv.isLinux [ LinuxInotify2 ];

		buildPhase = ''
		runHook preBuild
		@@ -135,4 +125,3 @@ buildNpmPackage rec {
		platforms = lib.platforms.unix;
		};
		}

pkgs/top-level/perl-packages.nix

+19 −6

Original line number	Diff line number	Diff line
		@@ -13021,6 +13021,19 @@ with self; {
		};
		};

		IOSocketSocks = buildPerlPackage {
		pname = "IO-Socket-Socks";
		version = "0.74";
		src = fetchurl {
		url = "mirror://cpan/authors/id/O/OL/OLEG/IO-Socket-Socks-0.74.tar.gz";
		hash = "sha256-N/Bxos9LqPCQoil8ZIK3osUJ61Lc1s5dgDXU7ixoJLE=";
		};
		meta = {
		description = "Provides a way to create socks client or server both 4 and 5 version";
		license = lib.licenses.free;
		};
		};

		IOSocketTimeout = buildPerlModule {
		pname = "IO-Socket-Timeout";
		version = "0.32";
		@@ -15919,10 +15932,10 @@ with self; {

		Minion = buildPerlPackage {
		pname = "Minion";
		version = "10.25";
		version = "10.30";
		src = fetchurl {
		url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.25.tar.gz";
		hash = "sha256-C+CoN1N2iJ2gRgRpY4TAz5iyYh0mUNnrAwf25LlAra0=";
		url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.30.tar.gz";
		hash = "sha256-twS9ZuxK8cAzlGifAsCsBIDr0GzpzKFykVAbkgLG7Rw=";
		};
		propagatedBuildInputs = [ Mojolicious YAMLLibYAML ];
		meta = {
		@@ -29122,10 +29135,10 @@ with self; {

		YAMLPP = buildPerlPackage {
		pname = "YAML-PP";
		version = "0.036";
		version = "0.38.0";
		src = fetchurl {
		url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.036.tar.gz";
		hash = "sha256-yLTlBYSt+S73Vz9rsB1u1Y5iF2MsV0J7cnTPp8pG/Bs=";
		url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-v0.38.0.tar.gz";
		hash = "sha256-qBlGXFL2o0EEmjlCdCwI4E8olLKmZILkOn9AfOELTqA=";
		};
		buildInputs = [ TestDeep TestWarn ];
		meta = {

Admin message