Merge staging-next into staging
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -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" ''
|
||||
|
||||
@@ -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 = ''
|
||||
|
||||
15
pkgs/by-name/la/lanraragi/bail-if-cpanm-fails.patch
Normal file
15
pkgs/by-name/la/lanraragi/bail-if-cpanm-fails.patch
Normal file
@@ -0,0 +1,15 @@
|
||||
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...");
|
||||
}
|
||||
@@ -1,17 +1,17 @@
|
||||
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);
|
||||
|
||||
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 {
|
||||
$mojo->LRR_LOGGER->debug( "Shinobu Worker new PID is " . $proc->pid );
|
||||
@@ -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} ) {
|
||||
|
||||
|
||||
@@ -1,16 +1,8 @@
|
||||
diff --git a/tools/install.pl b/tools/install.pl
|
||||
index 9e155f0..a63de58 100644
|
||||
index 0931979..50745d7 100644
|
||||
--- a/tools/install.pl
|
||||
+++ b/tools/install.pl
|
||||
@@ -9,6 +9,7 @@ use Config;
|
||||
|
||||
use feature qw(say);
|
||||
use File::Path qw(make_path);
|
||||
+use File::Copy qw(copy);
|
||||
|
||||
#Vendor dependencies
|
||||
my @vendor_css = (
|
||||
@@ -90,33 +91,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) {
|
||||
@@ -92,36 +92,6 @@ if ( $ENV{HOMEBREW_FORMULA_PREFIX} ) {
|
||||
$cpanopt = " -l " . $ENV{HOMEBREW_FORMULA_PREFIX} . "/libexec";
|
||||
}
|
||||
|
||||
@@ -23,11 +15,14 @@ index 9e155f0..a63de58 100644
|
||||
-
|
||||
-say("\r\nWill now check if all LRR software dependencies are met. \r\n");
|
||||
-
|
||||
-#Check for Redis
|
||||
-say("Checking for Redis...");
|
||||
-can_run('redis-server')
|
||||
- or die 'NOT FOUND! Please install a Redis server before proceeding.';
|
||||
-say("OK!");
|
||||
-#Fails on win even if redis is in the path
|
||||
-if ( IS_UNIX ) {
|
||||
- #Check for Redis
|
||||
- say("Checking for Redis...");
|
||||
- can_run('redis-server')
|
||||
- or die 'NOT FOUND! Please install a Redis server before proceeding.';
|
||||
- say("OK!");
|
||||
-}
|
||||
-
|
||||
-#Check for GhostScript
|
||||
-say("Checking for GhostScript...");
|
||||
@@ -44,25 +39,7 @@ index 9e155f0..a63de58 100644
|
||||
#Check for PerlMagick
|
||||
say("Checking for ImageMagick/PerlMagick...");
|
||||
my $imgk;
|
||||
@@ -136,37 +110,11 @@ if ($@) {
|
||||
say("OK!");
|
||||
}
|
||||
|
||||
-#Build & Install CPAN Dependencies
|
||||
-if ( $back || $full ) {
|
||||
- say("\r\nInstalling Perl modules... This might take a while.\r\n");
|
||||
-
|
||||
- if ( $Config{"osname"} ne "darwin" ) {
|
||||
- say("Installing Linux::Inotify2 for non-macOS systems... (This will do nothing if the package is there already)");
|
||||
-
|
||||
- install_package( "Linux::Inotify2", $cpanopt );
|
||||
- }
|
||||
-
|
||||
- if ( system( "cpanm --installdeps ./tools/. --notest" . $cpanopt ) != 0 ) {
|
||||
- die "Something went wrong while installing Perl modules - Bailing out.";
|
||||
- }
|
||||
-}
|
||||
-
|
||||
@@ -170,13 +140,6 @@ if ( $back || $full ) {
|
||||
#Clientside Dependencies with Provisioning
|
||||
if ( $front || $full ) {
|
||||
|
||||
@@ -75,30 +52,4 @@ index 9e155f0..a63de58 100644
|
||||
-
|
||||
say("\r\nProvisioning...\r\n");
|
||||
|
||||
- #Load File::Copy
|
||||
- install_package( "File::Copy", $cpanopt );
|
||||
- File::Copy->import("copy");
|
||||
-
|
||||
make_path getcwd . "/public/css/vendor";
|
||||
make_path getcwd . "/public/css/webfonts";
|
||||
make_path getcwd . "/public/js/vendor";
|
||||
@@ -213,19 +161,3 @@ sub cp_node_module {
|
||||
|
||||
}
|
||||
|
||||
-sub install_package {
|
||||
-
|
||||
- my $package = $_[0];
|
||||
- my $cpanopt = $_[1];
|
||||
-
|
||||
- ## no critic
|
||||
- eval "require $package"; #Run-time evals are needed here to check if the package has been properly installed.
|
||||
- ## use critic
|
||||
-
|
||||
- if ($@) {
|
||||
- say("$package not installed! Trying to install now using cpanm$cpanopt");
|
||||
- system("cpanm $package $cpanopt");
|
||||
- } else {
|
||||
- say("$package package installed, proceeding...");
|
||||
- }
|
||||
-}
|
||||
#Load File::Copy
|
||||
|
||||
@@ -11,22 +11,33 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "lanraragi";
|
||||
version = "0.9.41";
|
||||
version = "0.9.50";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Difegue";
|
||||
repo = "LANraragi";
|
||||
tag = "v.${version}";
|
||||
hash = "sha256-HF2g8rrcV6f6ZTKmveS/yjil/mBxpvRUFyauv5f+qQ8=";
|
||||
hash = "sha256-WwAY74sFPFJNfrTcGfXEZE8svuOxoCXR70SFyHb2Y40=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/Difegue/LANraragi/pull/1340
|
||||
# Note: the PR was reverted upstream because it broke on windows
|
||||
./bail-if-cpanm-fails.patch
|
||||
|
||||
# Skip running `npm ci` and unnecessary build-time checks
|
||||
./install.patch
|
||||
|
||||
# Don't assume that the cwd is $out/share/lanraragi
|
||||
# Put logs and temp files into the cwd by default, instead of into $out/share/lanraragi
|
||||
./fix-paths.patch
|
||||
./expose-password-hashing.patch # Used by the NixOS module
|
||||
|
||||
# Expose the password hashing logic that can be used by the NixOS module
|
||||
# to set the admin password
|
||||
./expose-password-hashing.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-RAjZGuK0C6R22fVFq82GPQoD1HpRs3MYMluUAV5ZEc8=";
|
||||
npmDepsHash = "sha256-+vS/uoEmJJM3G9jwdwQTlhV0VkjAhhVd60x+PcYyWSw=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
@@ -36,25 +47,27 @@ buildNpmPackage rec {
|
||||
|
||||
buildInputs =
|
||||
with perl.pkgs;
|
||||
# deps listed in `tools/cpanfile`:
|
||||
[
|
||||
perl
|
||||
ImageMagick
|
||||
locallib
|
||||
Redis
|
||||
Encode
|
||||
ArchiveLibarchiveExtract
|
||||
ArchiveLibarchivePeek
|
||||
ArchiveZip
|
||||
# Digest::SHA (part of perl)
|
||||
ListMoreUtils
|
||||
NetDNSNative
|
||||
SortNaturally
|
||||
AuthenPassphrase
|
||||
FileReadBackwards
|
||||
# URI::Escape (part of URI)
|
||||
URI
|
||||
LogfileRotate
|
||||
# IPC::Cmd (part of perl)
|
||||
# Compress::Zlib (part of perl)
|
||||
Mojolicious
|
||||
MojoliciousPluginTemplateToolkit
|
||||
MojoliciousPluginRenderFile
|
||||
MojoliciousPluginStatus
|
||||
IOSocketSocks
|
||||
IOSocketSSL
|
||||
CpanelJSONXS
|
||||
@@ -62,26 +75,35 @@ buildNpmPackage rec {
|
||||
MinionBackendRedis
|
||||
ProcSimple
|
||||
ParallelLoops
|
||||
MCE # (has MCE::Loop)
|
||||
MCEShared
|
||||
SysCpuAffinity
|
||||
FileChangeNotify
|
||||
ModulePluggable
|
||||
TimeLocal
|
||||
YAMLPP
|
||||
StringSimilarity
|
||||
CHI
|
||||
CacheFastMmap
|
||||
# Locale::Maketext (part of perl)
|
||||
LocaleMaketextLexicon
|
||||
CHI
|
||||
# CHI::Driver::FastMmap (part of CHI)
|
||||
CacheFastMmap
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ LinuxInotify2 ];
|
||||
# deps listed in `tools/install.pm`:
|
||||
++ [
|
||||
ImageMagick
|
||||
NetDNSNative
|
||||
MojoliciousPluginStatus
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
LinuxInotify2
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# Check if every perl dependency was installed
|
||||
cpanm --installdeps ./tools --notest
|
||||
|
||||
perl ./tools/install.pl install-full
|
||||
rm -r node_modules public/js/vendor/*.map public/css/vendor/*.map
|
||||
rm public/js/vendor/*.map public/css/vendor/*.map
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
@@ -89,6 +111,8 @@ buildNpmPackage rec {
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = with perl.pkgs; [
|
||||
# App::Prove (part of perl)
|
||||
# Test::Harness (part of perl)
|
||||
TestMockObject
|
||||
TestTrap
|
||||
TestDeep
|
||||
@@ -108,7 +132,7 @@ buildNpmPackage rec {
|
||||
|
||||
mkdir -p $out/share/lanraragi
|
||||
chmod +x script/launcher.pl
|
||||
cp -r lib public script templates package.json lrr.conf $out/share/lanraragi
|
||||
cp -r lib public script locales templates package.json lrr.conf $out/share/lanraragi
|
||||
|
||||
makeWrapper $out/share/lanraragi/script/launcher.pl $out/bin/lanraragi \
|
||||
--prefix PERL5LIB : $PERL5LIB \
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
curl,
|
||||
webkitgtk_4_0,
|
||||
webkitgtk_4_1,
|
||||
libmicrohttpd,
|
||||
libsecret,
|
||||
qrencode,
|
||||
@@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "oidc-agent";
|
||||
version = "5.3.2";
|
||||
version = "5.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indigo-dc";
|
||||
repo = "oidc-agent";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G2E6/mMP8d9s6JsIlFwMQ8sm4FCF8Gm8OqrsTPjPUrA=";
|
||||
hash = "sha256-PV1aswfvEMtsgHWKfdtIo/BV+MHKKdul2vjFdyoT2Ic=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
webkitgtk_4_0
|
||||
webkitgtk_4_1
|
||||
libmicrohttpd
|
||||
libsecret
|
||||
qrencode
|
||||
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
|
||||
"BIN_PATH=$(out)"
|
||||
"PROMPT_BIN_PATH=$(out)"
|
||||
"LIB_PATH=$(out)/lib"
|
||||
"WEBKITGTK=webkit2gtk-4.1"
|
||||
];
|
||||
|
||||
installTargets = [
|
||||
@@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
# Override with patched binary to be used by help2man
|
||||
cp -r $out/bin/* bin
|
||||
make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man
|
||||
make install_man PREFIX=$out MAN_PATH=$out/share/man PROMPT_MAN_PATH=$out/share/man WEBKITGTK=webkit2gtk-4.1
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
60
pkgs/by-name/on/oneDNN_2/package.nix
Normal file
60
pkgs/by-name/on/oneDNN_2/package.nix
Normal file
@@ -0,0 +1,60 @@
|
||||
{
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
# This was originally called mkl-dnn, then it was renamed to dnnl, and it has
|
||||
# just recently been renamed again to oneDNN. See here for details:
|
||||
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
|
||||
# oneDNN_2 is currently only consumed by rocmPackages.migraphx and likely
|
||||
# to be dropped once migraphx can migrate to 3
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "oneDNN";
|
||||
version = "2.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
|
||||
};
|
||||
|
||||
# Substituting for CMake 4 compat.
|
||||
# There's an upstream patch in v3 which does not cleanly apply.
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 2.8.12)" \
|
||||
"cmake_minimum_required(VERSION 2.8.12...3.13)"
|
||||
'';
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# Tests fail on some Hydra builders, because they do not support SSE4.2.
|
||||
doCheck = false;
|
||||
|
||||
# Fixup bad cmake paths
|
||||
postInstall = ''
|
||||
substituteInPlace $out/lib/cmake/dnnl/dnnl-config.cmake \
|
||||
--replace "\''${PACKAGE_PREFIX_DIR}/" ""
|
||||
|
||||
substituteInPlace $out/lib/cmake/dnnl/dnnl-targets.cmake \
|
||||
--replace "\''${_IMPORT_PREFIX}/" ""
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}";
|
||||
description = "oneAPI Deep Neural Network Library (oneDNN)";
|
||||
homepage = "https://01.org/oneDNN";
|
||||
license = lib.licenses.asl20;
|
||||
teams = [ lib.teams.rocm ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
||||
@@ -8,12 +8,17 @@
|
||||
libjpeg,
|
||||
libpng,
|
||||
libtiff,
|
||||
libwebp,
|
||||
libjxl,
|
||||
libheif,
|
||||
opencolorio,
|
||||
openexr,
|
||||
openjph,
|
||||
robin-map,
|
||||
unzip,
|
||||
fmt,
|
||||
bzip2,
|
||||
ptex,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -42,13 +47,18 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
boost
|
||||
giflib
|
||||
libheif
|
||||
libjpeg
|
||||
libjxl
|
||||
libpng
|
||||
libtiff
|
||||
libwebp
|
||||
opencolorio
|
||||
openexr
|
||||
openjph
|
||||
robin-map
|
||||
bzip2
|
||||
ptex
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -13,17 +13,17 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "oxigraph";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oxigraph";
|
||||
repo = "oxigraph";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Q/wMRDTlz7xH59Mc+G+DOH0GYzE3KYPFvBZtVYVOeQI=";
|
||||
hash = "sha256-58PGRQlDziVENgm7OKPAzXXi4BkOJqytGCxxIXB2smc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-qk4NloQU0am8yqoViXZy9TmGvQ6RJt3otzaVugoF4mc=";
|
||||
cargoHash = "sha256-GQ+7dyQ1LyYK8RYImsqVMEQvIC5pRQUVYYgO4FOShaE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
rustPlatform.bindgenHook
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "prefect";
|
||||
version = "3.4.22";
|
||||
version = "3.4.23";
|
||||
pyproject = true;
|
||||
|
||||
# Trying to install from source is challenging
|
||||
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
|
||||
# Source will be missing sdist, uv.lock, ui artefacts ...
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S0ank+mQekyFObBLsv28YJyYEPaQ12c6O8jQya69/IQ=";
|
||||
hash = "sha256-XGgAc3vVd+3gcPo4UvYII1xxXnKol9Qf07kxf2f96MM=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "prometheus-nvidia-gpu-exporter";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utkuozdemir";
|
||||
repo = "nvidia_gpu_exporter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yaMyvI70BEn23heAkvJ8wU08CJp+wMzRnwt4py6sZhs=";
|
||||
hash = "sha256-+sXlQQUs8tmxtaqKUCBTfEZlL8fqBlhzcDFbX8Catsk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-A9CY14pdZLgm5eCWYlWmn3H7VPM4yxramv6pi2ER64I=";
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
xen,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qubes-core-vchan-xen";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QubesOS";
|
||||
repo = "qubes-core-vchan-xen";
|
||||
rev = "v${version}";
|
||||
hash = "sha256:02l1vs5c2jfw22gxvl2fb66m0d99n8ya1i7rphsb5cxsljvxary0";
|
||||
};
|
||||
|
||||
buildInputs = [ xen ];
|
||||
|
||||
buildPhase = ''
|
||||
make all PREFIX=/ LIBDIR="$out/lib" INCLUDEDIR="$out/include"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make install DESTDIR=$out PREFIX=/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Libraries required for the higher-level Qubes daemons and tools";
|
||||
homepage = "https://qubes-os.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.linux;
|
||||
broken = true;
|
||||
};
|
||||
|
||||
}
|
||||
@@ -8,14 +8,14 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustfinity";
|
||||
version = "0.2.14";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-Oh+AEgmBhlOQaCFECheuHCXT6hndpUnZH/l+tWMp2RQ=";
|
||||
hash = "sha256-5UhKL6lXli1mGorThv3SFclVKDATmxklZQ+S5hwqQgc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-e1RnPqfgeyeEh8Av81RTuaMgYc6zoBZcygbc29DNKqE=";
|
||||
cargoHash = "sha256-ZzVGr/Zj+WKKAUqJEbDZgEL7fHzRiI/aSF6e5sLZY+o=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
|
||||
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication {
|
||||
pname = "toolong";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
glib,
|
||||
wrapGAppsHook3,
|
||||
gsettings-desktop-schemas,
|
||||
runCommand,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -38,7 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
xdg-desktop-portal
|
||||
gsettings-desktop-schemas # settings exposed by settings portal
|
||||
gnome-desktop
|
||||
gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
|
||||
# schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
|
||||
(runCommand "gnome-settings-daemon-${gnome-settings-daemon.version}-gsettings-schemas" { } ''
|
||||
mkdir -p $out/share
|
||||
cp -r ${gnome-settings-daemon}/share/gsettings-schemas/ $out/share/
|
||||
'')
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
From fc15667c867a96887c8c37faf9cc7480f04e6bc5 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Heijligen <src@posteo.de>
|
||||
Date: Mon, 2 Jun 2025 14:52:57 +0200
|
||||
Subject: [PATCH] fix install
|
||||
|
||||
---
|
||||
Makefile | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 03a1da5c31..b70fbec613 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -107,12 +107,12 @@ install:
|
||||
$(CP) share/spark/theories/*why $(THEORIESDIR)
|
||||
$(CP) share/spark/theories/*mlw $(THEORIESDIR)
|
||||
$(CP) share/spark/runtimes/README $(RUNTIMESDIR)
|
||||
- @echo "Generate Coq files by preprocessing context files:"
|
||||
- $(MAKE) -C include generate
|
||||
- $(CP) include/src/*.ad? $(INCLUDEDIR)
|
||||
- $(CP) include/*.gpr $(LIBDIR)
|
||||
- $(CP) include/*.gpr.templ $(LIBDIR)
|
||||
- $(CP) include/proof $(LIBDIR)
|
||||
+ #@echo "Generate Coq files by preprocessing context files:"
|
||||
+ #$(MAKE) -C include generate
|
||||
+ #$(CP) include/src/*.ad? $(INCLUDEDIR)
|
||||
+ #$(CP) include/*.gpr $(LIBDIR)
|
||||
+ #$(CP) include/*.gpr.templ $(LIBDIR)
|
||||
+ #$(CP) include/proof $(LIBDIR)
|
||||
|
||||
doc: $(DOC)
|
||||
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@@ -29,6 +29,10 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
# TODO:
|
||||
# Build why3 (github.com/AdaCore/why3) as separate package and not as submodule.
|
||||
# The relevant tags on why3 may get changed without the submodule pointer being updated.
|
||||
|
||||
fetchSpark2014 =
|
||||
{ rev, hash }:
|
||||
fetchFromGitHub {
|
||||
@@ -64,7 +68,7 @@ let
|
||||
};
|
||||
patches = [
|
||||
# Disable Coq related targets which are missing in the fsf-14 branch
|
||||
./0001-fix-install.patch
|
||||
./0001-fix-install-fsf-14.patch
|
||||
|
||||
# Suppress warnings on aarch64: https://github.com/AdaCore/spark2014/issues/54
|
||||
./0002-mute-aarch64-warnings.patch
|
||||
@@ -74,6 +78,17 @@ let
|
||||
];
|
||||
commit_date = "2024-01-11";
|
||||
};
|
||||
"15" = {
|
||||
src = fetchSpark2014 {
|
||||
rev = "22bf1510e0829ba74f9d8d686badb65c7365ee91";
|
||||
hash = "sha256-KjAWMgMT3Tp/s/DQ20ZZajty9Zrv8aPFocwgv5LkjSw=";
|
||||
};
|
||||
patches = [
|
||||
# Disable Coq related targets which are missing in the fsf-15 branch
|
||||
./0001-fix-install-fsf-15.patch
|
||||
];
|
||||
commit_date = "2025-06-10";
|
||||
};
|
||||
};
|
||||
|
||||
thisSpark =
|
||||
@@ -118,6 +133,9 @@ stdenv.mkDerivation {
|
||||
])
|
||||
++ (lib.optionals (gnat_version == "14") [
|
||||
gpr2_24_2_next
|
||||
])
|
||||
++ (lib.optionals (gnat_version == "15") [
|
||||
gpr2
|
||||
]);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezvizapi";
|
||||
version = "1.0.3.1";
|
||||
version = "1.0.3.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RenierM26";
|
||||
repo = "pyEzvizApi";
|
||||
tag = version;
|
||||
hash = "sha256-z93a0/OeErszTmKgMDWBCIsyCLQMTcYVBEiPAW9rX3E=";
|
||||
hash = "sha256-vuMgTPOzNsfeMhqeDa03AwCL+jUO+COGJFjvfsUMLIY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -497,6 +497,11 @@ buildPythonPackage rec {
|
||||
daniel-fahey
|
||||
];
|
||||
badPlatforms = [
|
||||
# CMake Error at cmake/cpu_extension.cmake:188 (message):
|
||||
# vLLM CPU backend requires AVX512, AVX2, Power9+ ISA, S390X ISA, ARMv8 or
|
||||
# RISC-V support.
|
||||
"aarch64-darwin"
|
||||
|
||||
# CMake Error at cmake/cpu_extension.cmake:78 (find_isa):
|
||||
# find_isa Function invoked with incorrect arguments for function named:
|
||||
# find_isa
|
||||
|
||||
@@ -21,7 +21,9 @@
|
||||
boost,
|
||||
msgpack-cxx,
|
||||
sqlite,
|
||||
oneDNN,
|
||||
# TODO(@LunNova): Swap to `oneDNN` once v3 is supported
|
||||
# Upstream issue: https://github.com/ROCm/AMDMIGraphX/issues/4351
|
||||
oneDNN_2,
|
||||
blaze,
|
||||
texliveSmall,
|
||||
doxygen,
|
||||
@@ -53,15 +55,6 @@ let
|
||||
]
|
||||
)
|
||||
);
|
||||
oneDNN' = oneDNN.overrideAttrs rec {
|
||||
version = "2.7.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "oneapi-src";
|
||||
repo = "oneDNN";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "migraphx";
|
||||
@@ -120,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
boost
|
||||
msgpack-cxx
|
||||
sqlite
|
||||
oneDNN'
|
||||
oneDNN_2
|
||||
blaze
|
||||
python3Packages.pybind11
|
||||
python3Packages.onnx
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
boost,
|
||||
qtbase,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "snowman";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yegord";
|
||||
repo = "snowman";
|
||||
rev = "v${version}";
|
||||
sha256 = "1mrmhj2nddi0d47c266vsg5vbapbqbcpj5ld4v1qcwnnk6z2zn0j";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
qtbase
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
export sourceRoot=$sourceRoot/src
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Native code to C/C++ decompiler";
|
||||
homepage = "http://derevenets.com/";
|
||||
|
||||
# https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1982,7 +1982,6 @@ mapAliases {
|
||||
odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
|
||||
offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
|
||||
oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
|
||||
oneDNN_2 = throw "oneDNN_2 has been removed as it was only used by rocmPackages.migraphx"; # added 2025-07-18
|
||||
onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
|
||||
onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
|
||||
openai-triton-llvm = triton-llvm; # added 2024-07-18
|
||||
@@ -2294,6 +2293,7 @@ mapAliases {
|
||||
qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
|
||||
quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
|
||||
quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
|
||||
qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
|
||||
quickbms = throw "'quickbms' has been removed due to being unmaintained for many years."; # Added 2025-05-17
|
||||
quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
|
||||
quicklispPackagesABCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
|
||||
@@ -2446,6 +2446,7 @@ mapAliases {
|
||||
snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
|
||||
snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # Added 2024-03-04
|
||||
snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
|
||||
snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
|
||||
soldat-unstable = opensoldat; # Added 2022-07-02
|
||||
soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
|
||||
soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
|
||||
|
||||
@@ -6899,8 +6899,6 @@ with pkgs;
|
||||
nvml = cudaPackages.cuda_nvml_dev;
|
||||
};
|
||||
|
||||
snowman = qt5.callPackage ../development/tools/analysis/snowman { };
|
||||
|
||||
speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
|
||||
|
||||
splint = callPackage ../development/tools/analysis/splint {
|
||||
|
||||
@@ -2945,10 +2945,10 @@ with self;
|
||||
|
||||
CacheFastMmap = buildPerlPackage {
|
||||
pname = "Cache-FastMmap";
|
||||
version = "1.57";
|
||||
version = "1.60";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.57.tar.gz";
|
||||
hash = "sha256-4Es6KNmJ7bj7lur6zcK4f57MuE8EfrLifLJqp9CMx7g=";
|
||||
url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.60.tar.gz";
|
||||
hash = "sha256-my07Cu8JXSxZs1akSClQ0MOiLoTm5puXu5bcwe3GQv8=";
|
||||
};
|
||||
buildInputs = [ TestDeep ];
|
||||
meta = {
|
||||
@@ -19754,10 +19754,10 @@ with self;
|
||||
|
||||
MCE = buildPerlPackage {
|
||||
pname = "MCE";
|
||||
version = "1.889";
|
||||
version = "1.901";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.889.tar.gz";
|
||||
hash = "sha256-22FT5HTQRvwlMFC/U8VAAthM1Mp30hwrnfVv7rgJu+0=";
|
||||
url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.901.tar.gz";
|
||||
hash = "sha256-3RRrHpmFPjPBzbtowgJK7nQGeseDlNUbgdH6so9Q0TU=";
|
||||
};
|
||||
meta = {
|
||||
description = "Many-Core Engine for Perl providing parallel processing capabilities";
|
||||
@@ -19769,6 +19769,24 @@ with self;
|
||||
};
|
||||
};
|
||||
|
||||
MCEShared = buildPerlPackage {
|
||||
pname = "MCE-Shared";
|
||||
version = "1.893";
|
||||
src = fetchurl {
|
||||
url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-Shared-1.893.tar.gz";
|
||||
hash = "sha256-+kxIet+w2zyPK2qidNM9j4J/ojTGMbs689lPpKPJRi8=";
|
||||
};
|
||||
propagatedBuildInputs = [ MCE ];
|
||||
meta = {
|
||||
description = "MCE extension for sharing data supporting threads and processes";
|
||||
homepage = "https://github.com/marioroy/mce-shared";
|
||||
license = with lib.licenses; [
|
||||
artistic1
|
||||
gpl1Plus
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
LogLog4perl = buildPerlPackage {
|
||||
pname = "Log-Log4perl";
|
||||
version = "1.57";
|
||||
|
||||
Reference in New Issue
Block a user