Merge master into staging-next
This commit is contained in:
@@ -12001,6 +12001,12 @@
|
||||
githubId = 12898828;
|
||||
keys = [ { fingerprint = "B44A DFDF F869 A66A 3FDF DD8B 8609 A7B5 19E5 E342"; } ];
|
||||
};
|
||||
kmatasfp = {
|
||||
email = "el-development@protonmail.com";
|
||||
name = "Kaur Matas";
|
||||
github = "kmatasfp";
|
||||
githubId = 33095685;
|
||||
};
|
||||
kmcopper = {
|
||||
email = "kmcopper@danwin1210.me";
|
||||
name = "Kyle Copperfield";
|
||||
@@ -23433,6 +23439,12 @@
|
||||
githubId = 17836748;
|
||||
name = "Mason Mackaman";
|
||||
};
|
||||
usertam = {
|
||||
email = "nix@usertam.dev";
|
||||
github = "usertam";
|
||||
githubId = 22500027;
|
||||
name = "Samuel Tam";
|
||||
};
|
||||
uskudnik = {
|
||||
email = "urban.skudnik@gmail.com";
|
||||
github = "uskudnik";
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
fftwSinglePrec,
|
||||
lame,
|
||||
mpg123,
|
||||
withFlac ? true,
|
||||
flac,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -48,12 +50,12 @@ stdenv.mkDerivation rec {
|
||||
qt5compat
|
||||
rtl-sdr
|
||||
soapysdr-with-plugins
|
||||
];
|
||||
] ++ lib.optional withFlac flac;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DRTLSDR=true"
|
||||
"-DSOAPYSDR=true"
|
||||
];
|
||||
] ++ lib.optional withFlac "-DFLAC=true";
|
||||
|
||||
meta = {
|
||||
description = "DAB/DAB+ Software Radio";
|
||||
|
||||
@@ -19,12 +19,12 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.98.0";
|
||||
version = "1.99.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
hash = "sha256-wkaspxwWJ7xJVQ+VZ9Z85zbzOcLAb3v55EJQjd+jiw8=";
|
||||
hash = "sha256-pnC8BLf2encv7UR10q6rTTpAZ6T0fETwumwTSu+Q8Ro=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dolibarr";
|
||||
version = "20.0.0";
|
||||
version = "20.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dolibarr";
|
||||
repo = "dolibarr";
|
||||
rev = version;
|
||||
hash = "sha256-nxytzUEpEo1qeIlpbPQ4mETl5DAAP+d1bqUcYxEW26E=";
|
||||
tag = version;
|
||||
hash = "sha256-5OEZpBxTYXhO27ea/GBmJI9uDLRDgMNc9ehQ7mvvSrY=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
|
||||
find . -type f -name "*.php" -print0 | xargs -0 sed -i 's|/etc/dolibarr|${stateDir}|g'
|
||||
|
||||
substituteInPlace htdocs/filefunc.inc.php \
|
||||
--replace '//$conffile = ' '$conffile = ' \
|
||||
--replace '//$conffiletoshow = ' '$conffiletoshow = '
|
||||
--replace-fail '//$conffile = ' '$conffile = ' \
|
||||
--replace-fail '//$conffiletoshow = ' '$conffiletoshow = '
|
||||
|
||||
substituteInPlace htdocs/install/inc.php \
|
||||
--replace '//$conffile = ' '$conffile = ' \
|
||||
--replace '//$conffiletoshow = ' '$conffiletoshow = '
|
||||
--replace-fail '//$conffile = ' '$conffile = ' \
|
||||
--replace-fail '//$conffiletoshow = ' '$conffiletoshow = '
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@@ -38,10 +38,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.tests = { inherit (nixosTests) dolibarr; };
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Enterprise resource planning (ERP) and customer relationship manager (CRM) server";
|
||||
changelog = "https://github.com/Dolibarr/dolibarr/releases/tag/${src.tag}";
|
||||
homepage = "https://dolibarr.org/";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
|
||||
Generated
+1768
File diff suppressed because it is too large
Load Diff
@@ -1,59 +1,72 @@
|
||||
{
|
||||
fetchurl,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeRustPlatform,
|
||||
rustc,
|
||||
cargo,
|
||||
llvmPackages,
|
||||
cmake,
|
||||
gcc,
|
||||
|
||||
# gcc compile error at deps: aws-lc-sys, function 'memcpy' inlined from 'OPENSSL_memcpy'
|
||||
# error: '__builtin_memcpy' specified bound exceeds maximum object size
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91397
|
||||
useRustPlatform ? makeRustPlatform {
|
||||
inherit rustc cargo;
|
||||
inherit (llvmPackages) stdenv;
|
||||
},
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.9.0";
|
||||
# nixpkgs-update: no auto update
|
||||
|
||||
suffix =
|
||||
{
|
||||
x86_64-linux = "x86_64";
|
||||
aarch64-linux = "aarch64";
|
||||
}
|
||||
."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
|
||||
|
||||
dlbin =
|
||||
hash:
|
||||
fetchurl {
|
||||
url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz";
|
||||
hash =
|
||||
hash."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
useRustPlatform.buildRustPackage rec {
|
||||
pname = "firecracker";
|
||||
inherit version;
|
||||
version = "1.9.1";
|
||||
|
||||
sourceRoot = ".";
|
||||
src = dlbin {
|
||||
x86_64-linux = "sha256-lcE3QMfKGm37QOD1HNCp7v7h8iPNLDU4dV0Dw6m6Ujc=";
|
||||
aarch64-linux = "sha256-xVZOdt7CuOgJLFLw+KTF9FzzF5HpWpMC9DYKdx33j2k=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "firecracker-microvm";
|
||||
repo = "firecracker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NgT06Xfb6j+d5EcqFjQeaiY08uJJjmrddzdwSoqpKbQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"micro_http-0.1.0" = "sha256-bso39jUUyhlNutUxHw8uHtKWQIHmoikfQ5O3RIePboo=";
|
||||
};
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
mv release-v${version}-${suffix}/firecracker-v${version}-${suffix} firecracker
|
||||
mv release-v${version}-${suffix}/jailer-v${version}-${suffix} jailer
|
||||
chmod +x firecracker jailer
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
gcc
|
||||
useRustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
./firecracker --version
|
||||
./jailer --version
|
||||
'';
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
checkFlags = [
|
||||
# requires /sys/devices/virtual/dmi
|
||||
"--skip=fingerprint::dump::tests::test_read_valid_sysfs_file"
|
||||
# requires /dev/kvm
|
||||
"--skip=template::dump::tests::test_dump"
|
||||
"--skip=tests::test_fingerprint_dump_command"
|
||||
"--skip=tests::test_template_dump_command"
|
||||
"--skip=tests::test_template_verify_command"
|
||||
"--skip=utils::tests::test_build_microvm"
|
||||
# requires seccomp == 0
|
||||
"--skip=tests::test_filter_apply"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
install -D firecracker $out/bin/firecracker
|
||||
install -D jailer $out/bin/jailer
|
||||
releaseDir="build/cargo_target/${stdenv.hostPlatform.rust.rustcTarget}/release"
|
||||
for bin in $(find $releaseDir -maxdepth 1 -type f -executable); do
|
||||
install -Dm555 -t $out/bin $bin
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
@@ -62,11 +75,9 @@ stdenv.mkDerivation {
|
||||
changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}";
|
||||
mainProgram = "firecracker";
|
||||
license = licenses.asl20;
|
||||
platforms = [
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with maintainers; [
|
||||
usertam
|
||||
thoughtpolice
|
||||
qjoly
|
||||
techknowlogick
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh-dash";
|
||||
version = "4.7.3";
|
||||
version = "4.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dlvhdr";
|
||||
repo = "gh-dash";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QDqGsVgY3Je1VgQVobDhNkVjrCyvMNEdghXc0ny+yyo=";
|
||||
hash = "sha256-0LiuEhp1caTdROBvkqEpI80y3s5zW3jIUTEKtY2OD0o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";
|
||||
|
||||
Generated
+32
-32
@@ -2,161 +2,161 @@
|
||||
{
|
||||
"pname": "AWSSDK.Core",
|
||||
"version": "3.7.300.11",
|
||||
"sha256": "1460yndb9gfy4qx36g4lxaqxzb3p19kfqp7czi28i1p7z7nh38vi"
|
||||
"hash": "sha256-caMB7fnnhohE/Oxc7GYKd6zfseqUPDM6Jt69tJr1wJA="
|
||||
},
|
||||
{
|
||||
"pname": "AWSSDK.S3",
|
||||
"version": "3.7.304",
|
||||
"sha256": "0hjls7477rm3g7bvd8m7ch37lmllnsv71x1lhjjn8g2nk7d3lk0q"
|
||||
"hash": "sha256-GEw62plWPGSlhDT0cLa2lFZ6BmSnorbXeaPmc8jRVEI="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Core",
|
||||
"version": "1.36.0",
|
||||
"sha256": "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"
|
||||
"hash": "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Blobs",
|
||||
"version": "12.19.1",
|
||||
"sha256": "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k"
|
||||
"hash": "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U="
|
||||
},
|
||||
{
|
||||
"pname": "Azure.Storage.Common",
|
||||
"version": "12.18.1",
|
||||
"sha256": "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k"
|
||||
"hash": "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "1.1.1",
|
||||
"sha256": "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"
|
||||
"hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Bcl.AsyncInterfaces",
|
||||
"version": "6.0.0",
|
||||
"sha256": "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"
|
||||
"hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Analyzers",
|
||||
"version": "3.3.4",
|
||||
"sha256": "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"
|
||||
"hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.Common",
|
||||
"version": "4.7.0",
|
||||
"sha256": "1zj4wwsad2j7y1byigm3c386rv56xr05mwxjlgqh0h0n5w5yjc4w"
|
||||
"hash": "sha256-nDDpCy8WQADxo7LzWkDupuxs0GCjvuhX8EeKpjTnRP4="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.CodeAnalysis.CSharp",
|
||||
"version": "4.7.0",
|
||||
"sha256": "1lz3ha3pp58hd4y031z64slcf9rh7g1cgkrlrbhi4vpa67xhynnh"
|
||||
"hash": "sha256-0FoP+zHqbhLhyjTPx8I7MCfHqCbmhwE8aRCVe4eC49M="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection",
|
||||
"version": "7.0.0",
|
||||
"sha256": "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"
|
||||
"hash": "sha256-N2DHyHiaNvYDQ77f8HI0gE0uIX2aj/rvejVGdCXRP4g="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
|
||||
"version": "7.0.0",
|
||||
"sha256": "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"
|
||||
"hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Http",
|
||||
"version": "7.0.0",
|
||||
"sha256": "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw"
|
||||
"hash": "sha256-PHLmTf8/qmhLO/8IdotsRCoIA2cczhefgw7gOf8Iy6Q="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging",
|
||||
"version": "7.0.0",
|
||||
"sha256": "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"
|
||||
"hash": "sha256-rr/NXIZ/3FG5FYGrHD7iIIr12AksP4CnfUy1YvEdDa8="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Logging.Abstractions",
|
||||
"version": "7.0.0",
|
||||
"sha256": "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"
|
||||
"hash": "sha256-uoMkX/TnwP0YabThacTMmyxdc9itQp73CN7xEFFox74="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Options",
|
||||
"version": "7.0.0",
|
||||
"sha256": "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"
|
||||
"hash": "sha256-pj9I/2HpCU7bLu002/Bb5NF+ofUrJ3IyH7yVqfP8IC0="
|
||||
},
|
||||
{
|
||||
"pname": "Microsoft.Extensions.Primitives",
|
||||
"version": "7.0.0",
|
||||
"sha256": "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"
|
||||
"hash": "sha256-AGnfNNDvZDGZ0Er9JQxeyLoUbVH+jfXF3anFr12qk6w="
|
||||
},
|
||||
{
|
||||
"pname": "Newtonsoft.Json",
|
||||
"version": "13.0.3",
|
||||
"sha256": "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"
|
||||
"hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
|
||||
},
|
||||
{
|
||||
"pname": "Polly",
|
||||
"version": "7.2.4",
|
||||
"sha256": "0lvhi2a18p6ay780lbw18656297s9i45cvpp4dr9k5lhg7fwl2y1"
|
||||
"hash": "sha256-wQvK3XmQlplyI/duVkhM+iRhikGBLwrQ8cpcFJSIcFM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Collections.Immutable",
|
||||
"version": "7.0.0",
|
||||
"sha256": "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"
|
||||
"hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
|
||||
},
|
||||
{
|
||||
"pname": "System.CommandLine",
|
||||
"version": "2.0.0-beta4.22272.1",
|
||||
"sha256": "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"
|
||||
"hash": "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="
|
||||
},
|
||||
{
|
||||
"pname": "System.CommandLine.NamingConventionBinder",
|
||||
"version": "2.0.0-beta4.22272.1",
|
||||
"sha256": "07hcz8jcqla4fs7cd2r0lanqsa13nl9l37spby9bc5p2apkyrz0m"
|
||||
"hash": "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4="
|
||||
},
|
||||
{
|
||||
"pname": "System.Diagnostics.DiagnosticSource",
|
||||
"version": "6.0.1",
|
||||
"sha256": "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"
|
||||
"hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="
|
||||
},
|
||||
{
|
||||
"pname": "System.IO.Hashing",
|
||||
"version": "6.0.0",
|
||||
"sha256": "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"
|
||||
"hash": "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="
|
||||
},
|
||||
{
|
||||
"pname": "System.Linq.Async",
|
||||
"version": "6.0.1",
|
||||
"sha256": "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"
|
||||
"hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Memory.Data",
|
||||
"version": "1.0.2",
|
||||
"sha256": "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"
|
||||
"hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="
|
||||
},
|
||||
{
|
||||
"pname": "System.Numerics.Vectors",
|
||||
"version": "4.5.0",
|
||||
"sha256": "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"
|
||||
"hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
|
||||
},
|
||||
{
|
||||
"pname": "System.Reflection.Metadata",
|
||||
"version": "7.0.0",
|
||||
"sha256": "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"
|
||||
"hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
|
||||
},
|
||||
{
|
||||
"pname": "System.Runtime.CompilerServices.Unsafe",
|
||||
"version": "6.0.0",
|
||||
"sha256": "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"
|
||||
"hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Encodings.Web",
|
||||
"version": "4.7.2",
|
||||
"sha256": "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"
|
||||
"hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
|
||||
},
|
||||
{
|
||||
"pname": "System.Text.Json",
|
||||
"version": "4.7.2",
|
||||
"sha256": "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"
|
||||
"hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
|
||||
},
|
||||
{
|
||||
"pname": "System.Threading.Tasks.Extensions",
|
||||
"version": "4.5.4",
|
||||
"sha256": "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"
|
||||
"hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
|
||||
}
|
||||
]
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "gh-gei";
|
||||
version = "1.9.0";
|
||||
version = "1.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "github";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6lEEeAYrMB9wwATsORuaS21wLOB+gq/od88FobSse50=";
|
||||
hash = "sha256-hUURXPKhiI3n1BrW8IzVVmPuJyO4AxM8D5uluaJXk+4=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
dotnet-sdk = dotnetCorePackages.sdk_8_0;
|
||||
projectFile = "src/gei/gei.csproj";
|
||||
nugetDeps = ./deps.json; # File generated with `nix-build -A gh-gei.passthru.fetch-deps`.
|
||||
|
||||
|
||||
@@ -4,20 +4,21 @@
|
||||
fetchFromGitLab,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
pname = "glab";
|
||||
version = "1.50.0";
|
||||
version = "1.51.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-WQO+9Fmlzj21UPJ9cdFc6JC8mbkzOWxz077JR+11BXA=";
|
||||
hash = "sha256-EWcoEm6DbRT0PP2qYhdwDHCkbeAG6vDVATPhX9pPfiw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nwHY0221nacHk4M+RKA8BEJLCoJJdIKwP0ZPjhYxc7Q=";
|
||||
vendorHash = "sha256-f6qAFeB9kshtQ2AW6OnEGSnhJYlJ2gAGRDplVmQSVNA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
@@ -43,6 +44,8 @@ buildGo123Module rec {
|
||||
--zsh <($out/bin/glab completion -s zsh)
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "GitLab CLI tool bringing GitLab to your command line";
|
||||
license = lib.licenses.mit;
|
||||
|
||||
@@ -20,13 +20,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "golem";
|
||||
version = "1.0.27";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golemcloud";
|
||||
repo = "golem";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-H8Dykn079107gZTV2w/T/gyIVxJtV8NuhuCM2+46yyI=";
|
||||
hash = "sha256-6AUUgXWlDaoI16p/Hrl115XMGYUIDD5YWHX6JfDk9SI=";
|
||||
};
|
||||
|
||||
# Taker from https://github.com/golemcloud/golem/blob/v1.0.26/Makefile.toml#L399
|
||||
@@ -53,13 +53,13 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# Required for golem-wasm-rpc's build.rs to find the required protobuf files
|
||||
# https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7
|
||||
GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.0.1";
|
||||
GOLEM_WASM_AST_ROOT = "../golem-wasm-ast-1.1.0";
|
||||
# Required for golem-examples's build.rs to find the required Wasm Interface Type (WIT) files
|
||||
# https://github.com/golemcloud/golem-examples/blob/v1.0.6/build.rs#L9
|
||||
GOLEM_WIT_ROOT = "../golem-wit-1.0.3";
|
||||
GOLEM_WIT_ROOT = "../golem-wit-1.1.0";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-GrZhWcm7id8pRrwHRDt5k1tcVnoePO8eCWCHzkhCsZk=";
|
||||
cargoHash = "sha256-zf/L7aNsfQXCdGpzvBZxgoatAGB92bvIuj59jANrXIc=";
|
||||
|
||||
# Tests are failing in the sandbox because of some redis integration tests
|
||||
doCheck = false;
|
||||
@@ -78,9 +78,10 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Open source durable computing platform that makes it easy to build and deploy highly reliable distributed systems";
|
||||
changelog = "https://github.com/golemcloud/golem/releases/tag/v${version}";
|
||||
changelog = "https://github.com/golemcloud/golem/releases/tag/${src.tag}";
|
||||
homepage = "https://www.golem.cloud/";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ kmatasfp ];
|
||||
mainProgram = "golem-cli";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "kanboard";
|
||||
version = "1.2.42";
|
||||
version = "1.2.43";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-/Unxl9Vh9pEWjO89sSviGGPFzUwxdb1mbOfpTFTyRL0=";
|
||||
hash = "sha256-/PFE5h4elHFNbbIssoGMDkhGkEIec2uEMz+vU+DN5D0=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildGoModule,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "opener";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "superbrothers";
|
||||
repo = "opener";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-pp2jn4J6gYyZky5rVBaai9sVVqvPgM+fGryseM58WEI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-xwMRWEwrG12QevVVTMC9OTdjIBoxR1AHkoa6OErPpF4=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace opener.go \
|
||||
--replace-fail \
|
||||
'var version string' \
|
||||
'var version string = "${version}"'
|
||||
'';
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Open URL in your local web browser from the SSH-connected remote environment";
|
||||
homepage = "https://github.com/superbrothers/opener";
|
||||
changelog = "https://github.com/superbrothers/opener/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ genga898 ];
|
||||
mainProgram = "opener";
|
||||
};
|
||||
}
|
||||
@@ -10,13 +10,13 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "process-compose";
|
||||
version = "1.40.1";
|
||||
version = "1.46.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "F1bonacc1";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/A/5tdALlb1ultEPTj6+EztjGc7PT9O7VyWey/EyLbQ=";
|
||||
hash = "sha256-E7ovd/dNSMxVld7CS4ZjxZxUVDXLuoQR7W4ZZ1cPMP0=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -45,7 +45,7 @@ buildGoModule rec {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
vendorHash = "sha256-ekNISmU9TVi+YA2f3uJVyMsv8xkT8DmDUBw1ASqIfcY=";
|
||||
vendorHash = "sha256-pztub6PsHhF56ks4UFG9u/mGrvKFUZi+7EudpP9DVYE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raider";
|
||||
version = "3.0.1";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ADBeveridge";
|
||||
repo = "raider";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LkGSEUoruWfEq/ttM3LkA/UjHc3ZrlvGF44HsJLntAo=";
|
||||
hash = "sha256-fOv4Y5kBbZazFNkPrLS3D7LMLLvT/kIYmsCezsl/fxQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@@ -19,14 +19,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s7";
|
||||
version = "11.2-unstable-2024-12-10";
|
||||
version = "11.2-unstable-2024-12-19";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cm-gitlab.stanford.edu";
|
||||
owner = "bil";
|
||||
repo = "s7";
|
||||
rev = "9228fbb69835a8b414cba028d56ee7ddf4479e14";
|
||||
hash = "sha256-qvkkRc3UivsAAu9b48K+6dpl91MDnTsU/zyN4hfKUCo=";
|
||||
rev = "a5515d455f5aca49d5275a5a35ac88935f3ad401";
|
||||
hash = "sha256-Ik3edzpO9hIhJBZHyzL/CsTVKGbDdGVfE9pNrBeSjp8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "typstyle";
|
||||
version = "0.12.12";
|
||||
version = "0.12.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Enter-tainer";
|
||||
repo = "typstyle";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-oQnZm+BkccHN3xXSe1yBus3m4JKyCBKM9kkJz+QryR0=";
|
||||
hash = "sha256-mEpMKXN07qjQ+qQSSTKVKss0c/x4bm0K5WcwLTjdejs=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-pbsB9mQafgI6PudjeCzOSpk3+iZkkdp/V1zgH8pP7us=";
|
||||
cargoHash = "sha256-1NZmLH845oXb/IVQzwSv9hqoUGR5ZuGtsk4SCn/s2kk=";
|
||||
|
||||
# Disabling tests requiring network access
|
||||
checkFlags = [
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchzip,
|
||||
autoPatchelfHook,
|
||||
}:
|
||||
|
||||
let
|
||||
platformInfoTable = {
|
||||
"x86_64-linux" = {
|
||||
id = "linux-x64";
|
||||
hash = "sha256-/PD5e0bWgnIsIrvyOypoJw30VkgbOFWV1NJpPS2G0WM=";
|
||||
};
|
||||
"aarch64-linux" = {
|
||||
id = "linux-arm64";
|
||||
hash = "sha256-zfiorXZyIISZPXPwmcdYeHceDmQXkUhsvTkNZScg648=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
id = "osx-x64";
|
||||
hash = "sha256-cdNdV1fVPkz6B7vtKZiPsLQGqnIiDtYa9KTcwSkjdJg=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
id = "osx-arm64";
|
||||
hash = "sha256-Z1dq2t/HBQulbPF23ZCihOrcZHMpTXEQ6yXKORZaFPk=";
|
||||
};
|
||||
};
|
||||
|
||||
platformInfo =
|
||||
platformInfoTable.${stdenv.hostPlatform.system}
|
||||
or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "voicevox-core";
|
||||
version = "0.15.4";
|
||||
|
||||
# Note: Only the prebuilt binaries are able to decrypt the encrypted voice models
|
||||
src = fetchzip {
|
||||
url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${platformInfo.id}-cpu-${finalAttrs.version}.zip";
|
||||
inherit (platformInfo) hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 libonnxruntime.* libvoicevox_core.* -t $out/lib
|
||||
install -Dm644 model/* -t $out/lib/model
|
||||
install -Dm644 *.h -t $out/include
|
||||
install -Dm644 README.txt -t $out/share/doc/voicevox-core
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}";
|
||||
description = "Core library for the VOICEVOX speech synthesis software";
|
||||
homepage = "https://github.com/VOICEVOX/voicevox_core";
|
||||
license = with lib.licenses; [
|
||||
mit
|
||||
({
|
||||
name = "VOICEVOX Core Library Terms of Use";
|
||||
url = "https://github.com/VOICEVOX/voicevox_resource/blob/main/core/README.md";
|
||||
free = false;
|
||||
redistributable = true;
|
||||
})
|
||||
];
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.attrNames platformInfoTable;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
})
|
||||
@@ -0,0 +1,21 @@
|
||||
diff --git a/pyproject.toml b/pyproject.toml
|
||||
index fa23446..6a7705c 100644
|
||||
--- a/pyproject.toml
|
||||
+++ b/pyproject.toml
|
||||
@@ -40,7 +40,15 @@ use_parentheses = true
|
||||
datas = "datas" # PyInstaller's argument
|
||||
|
||||
[tool.poetry]
|
||||
-package-mode = false
|
||||
+name = "voicevox-engine"
|
||||
+version = "@version@"
|
||||
+authors = []
|
||||
+description = ""
|
||||
+packages = [ { include = "voicevox_engine" } ]
|
||||
+include = [ "resources/**/*", "run.py", "engine_manifest.json", "presets.yaml"]
|
||||
+
|
||||
+[tool.poetry.scripts]
|
||||
+voicevox-engine = "run:main"
|
||||
|
||||
[tool.poetry.dependencies]
|
||||
python = "~3.11"
|
||||
@@ -0,0 +1,92 @@
|
||||
diff --git a/lib/open_jtalk/src/mecab/src/char_property.h b/lib/open_jtalk/src/mecab/src/char_property.h
|
||||
index 35f4b05..9c904ba 100644
|
||||
--- a/lib/open_jtalk/src/mecab/src/char_property.h
|
||||
+++ b/lib/open_jtalk/src/mecab/src/char_property.h
|
||||
@@ -37,7 +37,7 @@ class CharProperty {
|
||||
inline const char *seekToOtherType(const char *begin, const char *end,
|
||||
CharInfo c, CharInfo *fail,
|
||||
size_t *mblen, size_t *clen) const {
|
||||
- register const char *p = begin;
|
||||
+ const char *p = begin;
|
||||
*clen = 0;
|
||||
while (p != end && c.isKindOf(*fail = getCharInfo(p, end, mblen))) {
|
||||
p += *mblen;
|
||||
diff --git a/lib/open_jtalk/src/mecab/src/darts.h b/lib/open_jtalk/src/mecab/src/darts.h
|
||||
index 91b2eae..d6736cf 100644
|
||||
--- a/lib/open_jtalk/src/mecab/src/darts.h
|
||||
+++ b/lib/open_jtalk/src/mecab/src/darts.h
|
||||
@@ -404,10 +404,10 @@ class DoubleArrayImpl {
|
||||
T result;
|
||||
set_result(result, -1, 0);
|
||||
|
||||
- register array_type_ b = array_[node_pos].base;
|
||||
- register array_u_type_ p;
|
||||
+ array_type_ b = array_[node_pos].base;
|
||||
+ array_u_type_ p;
|
||||
|
||||
- for (register size_t i = 0; i < len; ++i) {
|
||||
+ for (size_t i = 0; i < len; ++i) {
|
||||
p = b +(node_u_type_)(key[i]) + 1;
|
||||
if (static_cast<array_u_type_>(b) == array_[p].check)
|
||||
b = array_[p].base;
|
||||
@@ -431,12 +431,12 @@ class DoubleArrayImpl {
|
||||
size_t node_pos = 0) const {
|
||||
if (!len) len = length_func_()(key);
|
||||
|
||||
- register array_type_ b = array_[node_pos].base;
|
||||
- register size_t num = 0;
|
||||
- register array_type_ n;
|
||||
- register array_u_type_ p;
|
||||
+ array_type_ b = array_[node_pos].base;
|
||||
+ size_t num = 0;
|
||||
+ array_type_ n;
|
||||
+ array_u_type_ p;
|
||||
|
||||
- for (register size_t i = 0; i < len; ++i) {
|
||||
+ for (size_t i = 0; i < len; ++i) {
|
||||
p = b; // + 0;
|
||||
n = array_[p].base;
|
||||
if ((array_u_type_) b == array_[p].check && n < 0) {
|
||||
@@ -469,8 +469,8 @@ class DoubleArrayImpl {
|
||||
size_t len = 0) const {
|
||||
if (!len) len = length_func_()(key);
|
||||
|
||||
- register array_type_ b = array_[node_pos].base;
|
||||
- register array_u_type_ p;
|
||||
+ array_type_ b = array_[node_pos].base;
|
||||
+ array_u_type_ p;
|
||||
|
||||
for (; key_pos < len; ++key_pos) {
|
||||
p = b +(node_u_type_)(key[key_pos]) + 1;
|
||||
diff --git a/lib/open_jtalk/src/mecab/src/dictionary.cpp b/lib/open_jtalk/src/mecab/src/dictionary.cpp
|
||||
index 5717d4d..3ab6e1f 100644
|
||||
--- a/lib/open_jtalk/src/mecab/src/dictionary.cpp
|
||||
+++ b/lib/open_jtalk/src/mecab/src/dictionary.cpp
|
||||
@@ -66,7 +66,7 @@ int progress_bar_darts(size_t current, size_t total) {
|
||||
}
|
||||
|
||||
template <typename T1, typename T2>
|
||||
-struct pair_1st_cmp: public std::binary_function<bool, T1, T2> {
|
||||
+struct pair_1st_cmp {
|
||||
bool operator()(const std::pair<T1, T2> &x1,
|
||||
const std::pair<T1, T2> &x2) {
|
||||
return x1.first < x2.first;
|
||||
diff --git a/lib/open_jtalk/src/mecab/src/viterbi.cpp b/lib/open_jtalk/src/mecab/src/viterbi.cpp
|
||||
index 6277fe9..5ccefb7 100644
|
||||
--- a/lib/open_jtalk/src/mecab/src/viterbi.cpp
|
||||
+++ b/lib/open_jtalk/src/mecab/src/viterbi.cpp
|
||||
@@ -318,11 +318,11 @@ template <bool IsAllPath> bool connect(size_t pos, Node *rnode,
|
||||
const Connector *connector,
|
||||
Allocator<Node, Path> *allocator) {
|
||||
for (;rnode; rnode = rnode->bnext) {
|
||||
- register long best_cost = 2147483647;
|
||||
+ long best_cost = 2147483647;
|
||||
Node* best_node = 0;
|
||||
for (Node *lnode = end_node_list[pos]; lnode; lnode = lnode->enext) {
|
||||
- register int lcost = connector->cost(lnode, rnode); // local cost
|
||||
- register long cost = lnode->cost + lcost;
|
||||
+ int lcost = connector->cost(lnode, rnode); // local cost
|
||||
+ long cost = lnode->cost + lcost;
|
||||
|
||||
if (cost < best_cost) {
|
||||
best_node = lnode;
|
||||
@@ -0,0 +1,126 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3Packages,
|
||||
replaceVars,
|
||||
voicevox-core,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "voicevox-engine";
|
||||
version = "0.20.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VOICEVOX";
|
||||
repo = "voicevox_engine";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Gib5R7oleg+XXyu2V65EqrflQ1oiAR7a09a0MFhSITc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# the upstream package only uses poetry for dependency management, not for package definition
|
||||
# this patch makes the package installable via poetry-core
|
||||
(replaceVars ./make-installable.patch {
|
||||
inherit version;
|
||||
})
|
||||
];
|
||||
|
||||
build-system = with python3Packages; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies =
|
||||
[
|
||||
passthru.pyopenjtalk
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
numpy
|
||||
fastapi
|
||||
jinja2
|
||||
python-multipart
|
||||
uvicorn
|
||||
soundfile
|
||||
pyyaml
|
||||
pyworld
|
||||
semver
|
||||
platformdirs
|
||||
soxr
|
||||
pydantic
|
||||
starlette
|
||||
]);
|
||||
|
||||
pythonRemoveDeps = [
|
||||
# upstream wants fastapi-slim, but we provide fastapi instead
|
||||
"fastapi-slim"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
# copy demo metadata to temporary directory
|
||||
mv resources/character_info test_character_info
|
||||
|
||||
# populate the `character_info` directory with the actual model metadata instead of the demo metadata
|
||||
cp -r --no-preserve=all ${passthru.resources}/character_info resources/character_info
|
||||
|
||||
# the `character_info` directory copied from `resources` doesn't exactly have the expected format,
|
||||
# so we transform them to be acceptable by `voicevox-engine`
|
||||
pushd resources/character_info
|
||||
for dir in *; do
|
||||
# remove unused large files
|
||||
rm $dir/*/*.png_large
|
||||
|
||||
# rename directory from "$name_$uuid" to "$uuid"
|
||||
mv $dir ''${dir#*"_"}
|
||||
done
|
||||
popd
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
''--add-flags "--voicelib_dir=${voicevox-core}/lib"''
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# some tests assume $HOME actually exists
|
||||
export HOME=$(mktemp -d)
|
||||
|
||||
# since the actual metadata files have been installed to `$out` by this point,
|
||||
# we can move the demo metadata back to its place for the tests to succeed
|
||||
rm -r resources/character_info
|
||||
mv test_character_info resources/character_info
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# this test checks the behaviour of openapi
|
||||
# one of the functions returns a slightly different output due to openapi version differences
|
||||
"test_OpenAPIの形が変わっていないことを確認"
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3Packages; [
|
||||
pytestCheckHook
|
||||
syrupy
|
||||
httpx
|
||||
];
|
||||
|
||||
passthru = {
|
||||
resources = fetchFromGitHub {
|
||||
owner = "VOICEVOX";
|
||||
repo = "voicevox_resource";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-m888DF9qgGbK30RSwNnAoT9D0tRJk6cD5QY72FRkatM=";
|
||||
};
|
||||
|
||||
pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${version}";
|
||||
description = "Engine for the VOICEVOX speech synthesis software";
|
||||
homepage = "https://github.com/VOICEVOX/voicevox_engine";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
mainProgram = "voicevox-engine";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
{
|
||||
lib,
|
||||
python,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
setuptools,
|
||||
cython_0,
|
||||
cmake,
|
||||
numpy,
|
||||
oldest-supported-numpy,
|
||||
six,
|
||||
tqdm,
|
||||
}:
|
||||
|
||||
let
|
||||
dic-dirname = "open_jtalk_dic_utf_8-1.11";
|
||||
dic-src = fetchzip {
|
||||
url = "https://github.com/r9y9/open_jtalk/releases/download/v1.11.1/${dic-dirname}.tar.gz";
|
||||
hash = "sha256-+6cHKujNEzmJbpN9Uan6kZKsPdwxRRzT3ZazDnCNi3s=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
pname = "pyopenjtalk";
|
||||
version = "0-unstable-2023-09-08";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VOICEVOX";
|
||||
repo = "pyopenjtalk";
|
||||
rev = "b35fc89fe42948a28e33aed886ea145a51113f88";
|
||||
hash = "sha256-DbZkCMdirI6wSRUQSJrkojyjGmViqGeQPO0kSKiw2gE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# this patch fixes the darwin build
|
||||
# open_jtalk uses mecab, which uses the register keyword and std::binary_function, which are not allowed in c++17
|
||||
# this patch removes them
|
||||
./mecab-remove-deprecated.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'setuptools<v60.0' 'setuptools'
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
cython_0
|
||||
cmake
|
||||
numpy
|
||||
oldest-supported-numpy
|
||||
];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
dependencies = [
|
||||
setuptools # imports pkg_resources at runtime
|
||||
numpy
|
||||
six
|
||||
tqdm
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
ln -s ${dic-src} $out/${python.sitePackages}/pyopenjtalk/${dic-dirname}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "VOICEVOX's fork of the pyopenjtalk text-to-speech library";
|
||||
homepage = "https://github.com/VOICEVOX/pyopenjtalk";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
diff --git a/.env.production b/.env.production
|
||||
index 5b0dcb0..5848ccd 100644
|
||||
--- a/.env.production
|
||||
+++ b/.env.production
|
||||
@@ -4,7 +4,7 @@ VITE_DEFAULT_ENGINE_INFOS=`[
|
||||
"uuid": "074fc39e-678b-4c13-8916-ffca8d505d1d",
|
||||
"name": "VOICEVOX Engine",
|
||||
"executionEnabled": true,
|
||||
- "executionFilePath": "vv-engine/run.exe",
|
||||
+ "executionFilePath": "@voicevox_engine_path@",
|
||||
"executionArgs": [],
|
||||
"host": "http://127.0.0.1:50021"
|
||||
}
|
||||
diff --git a/electron-builder.config.js b/electron-builder.config.js
|
||||
index 462e6f2..10a9bff 100644
|
||||
--- a/electron-builder.config.js
|
||||
+++ b/electron-builder.config.js
|
||||
@@ -35,19 +35,6 @@ const isMac = process.platform === "darwin";
|
||||
// cf: https://k-hyoda.hatenablog.com/entry/2021/10/23/000349#%E8%BF%BD%E5%8A%A0%E5%B1%95%E9%96%8B%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E5%85%88%E3%81%AE%E8%A8%AD%E5%AE%9A
|
||||
const extraFilePrefix = isMac ? "MacOS/" : "";
|
||||
|
||||
-const sevenZipFile = fs
|
||||
- .readdirSync(path.resolve(__dirname, "build", "vendored", "7z"))
|
||||
- .find(
|
||||
- // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz
|
||||
- (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),
|
||||
- );
|
||||
-
|
||||
-if (!sevenZipFile) {
|
||||
- throw new Error(
|
||||
- "7z binary file not found. Run `node ./build/download7z.js` first.",
|
||||
- );
|
||||
-}
|
||||
-
|
||||
/** @type {import("electron-builder").Configuration} */
|
||||
const builderOptions = {
|
||||
beforeBuild: async () => {
|
||||
@@ -88,14 +75,6 @@ const builderOptions = {
|
||||
from: "build/README.txt",
|
||||
to: extraFilePrefix + "README.txt",
|
||||
},
|
||||
- {
|
||||
- from: VOICEVOX_ENGINE_DIR,
|
||||
- to: path.join(extraFilePrefix, "vv-engine"),
|
||||
- },
|
||||
- {
|
||||
- from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile),
|
||||
- to: extraFilePrefix + sevenZipFile,
|
||||
- },
|
||||
],
|
||||
// electron-builder installer
|
||||
productName: "VOICEVOX",
|
||||
diff --git a/src/backend/electron/manager/vvppManager.ts b/src/backend/electron/manager/vvppManager.ts
|
||||
index 6aa17b6..b8b52b7 100644
|
||||
--- a/src/backend/electron/manager/vvppManager.ts
|
||||
+++ b/src/backend/electron/manager/vvppManager.ts
|
||||
@@ -196,16 +196,8 @@ export class VvppManager {
|
||||
|
||||
const args = ["x", "-o" + outputDir, archiveFile, "-t" + format];
|
||||
|
||||
- let sevenZipPath = import.meta.env.VITE_7Z_BIN_NAME;
|
||||
- if (!sevenZipPath) {
|
||||
- throw new Error("7z path is not defined");
|
||||
- }
|
||||
- if (import.meta.env.PROD) {
|
||||
- sevenZipPath = path.join(
|
||||
- path.dirname(app.getPath("exe")),
|
||||
- sevenZipPath,
|
||||
- );
|
||||
- }
|
||||
+ const sevenZipPath = `@sevenzip_path@`;
|
||||
+
|
||||
log.log(
|
||||
"Spawning 7z:",
|
||||
sevenZipPath,
|
||||
@@ -0,0 +1,116 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
replaceVars,
|
||||
makeDesktopItem,
|
||||
copyDesktopItems,
|
||||
makeWrapper,
|
||||
electron,
|
||||
_7zz,
|
||||
voicevox-engine,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "voicevox";
|
||||
version = "0.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VOICEVOX";
|
||||
repo = "voicevox";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-05WTecNc1xxe7SGDPZbLtRELNghFkMTqI4pkX4PsVWI=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(replaceVars ./hardcode-paths.patch {
|
||||
sevenzip_path = lib.getExe _7zz;
|
||||
voicevox_engine_path = lib.getExe voicevox-engine;
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace package.json \
|
||||
--replace-fail "999.999.999" "${version}" \
|
||||
--replace-fail "postinstall" "_postinstall"
|
||||
'';
|
||||
|
||||
npmDepsHash = "sha256-g3avCj3S96qYPAyGXn4yvrZ4gteJld+g4eV4aRtv/3g=";
|
||||
|
||||
nativeBuildInputs =
|
||||
[
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
|
||||
# disable code signing on Darwin
|
||||
env.CSC_IDENTITY_AUTO_DISCOVERY = "false";
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# build command taken from the definition of the `electron:build` npm script
|
||||
VITE_TARGET=electron npm exec vite build
|
||||
|
||||
cp -r ${electron.dist} electron-dist
|
||||
chmod -R u+w electron-dist
|
||||
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
--config electron-builder.config.js \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
install -Dm644 public/icon.png $out/share/icons/hicolor/256x256/apps/voicevox.png
|
||||
|
||||
mkdir -p $out/share/voicevox
|
||||
cp -r dist_electron/*-unpacked/{locales,resources{,.pak}} $out/share/voicevox
|
||||
|
||||
makeWrapper ${lib.getExe electron} $out/bin/voicevox \
|
||||
--add-flags $out/share/voicevox/resources/app.asar \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
|
||||
--inherit-argv0
|
||||
''}
|
||||
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
mkdir -p $out/Applications
|
||||
cp -r dist_electron/mac*/VOICEVOX.app $out/Applications
|
||||
makeWrapper $out/Applications/VOICEVOX.app/Contents/MacOS/VOICEVOX $out/bin/voicevox
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "voicevox";
|
||||
exec = "voicevox";
|
||||
icon = "voicevox";
|
||||
desktopName = "VOICEVOX";
|
||||
categories = [ "AudioVideo" ];
|
||||
mimeTypes = [ "application/x-voicevox" ];
|
||||
})
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${version}";
|
||||
description = "Editor for the VOICEVOX speech synthesis software";
|
||||
homepage = "https://github.com/VOICEVOX/voicevox";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
mainProgram = "voicevox";
|
||||
maintainers = with lib.maintainers; [ tomasajt ];
|
||||
platforms = electron.meta.platforms;
|
||||
};
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
autoPatchelfHook,
|
||||
undmg,
|
||||
zstd,
|
||||
alsa-lib,
|
||||
curl,
|
||||
fontconfig,
|
||||
libglvnd,
|
||||
@@ -48,6 +49,7 @@ let
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib # libasound.so.2
|
||||
curl
|
||||
fontconfig
|
||||
(lib.getLib stdenv.cc.cc) # libstdc++.so libgcc_s.so
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"darwin": {
|
||||
"hash": "sha256-NK9/YhnEWdoxF8fkGJvYVFCsNh0XPSheXbw89wNkaio=",
|
||||
"version": "0.2024.12.10.15.55.stable_04"
|
||||
"hash": "sha256-CrRt7fLoZ9LR3fD7xXBzlRFf4CAjQjokU5UaHNJnVNA=",
|
||||
"version": "0.2024.12.18.08.02.stable_03"
|
||||
},
|
||||
"linux_x86_64": {
|
||||
"hash": "sha256-wAzPAaigjaHl5JhuS92rkHXLZRAQtq7p8IB67sqPDlY=",
|
||||
"version": "0.2024.12.10.15.55.stable_04"
|
||||
"hash": "sha256-0A9EPkDp77tpfrRuXV2rVPaXMYbY7erbKBd6IT9CTFQ=",
|
||||
"version": "0.2024.12.18.08.02.stable_03"
|
||||
},
|
||||
"linux_aarch64": {
|
||||
"hash": "sha256-GbirEK2Jhfunj9ORWp5uW/QHUzSnJRQRh1ezApr1p00=",
|
||||
"version": "0.2024.12.10.15.55.stable_04"
|
||||
"hash": "sha256-IlqpK8IbtSMKGNspKj2Rq2Jzlyc7RYcfRaoYY9Akhdk=",
|
||||
"version": "0.2024.12.18.08.02.stable_03"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wireguard-vanity-keygen";
|
||||
version = "0.1.0";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axllent";
|
||||
repo = "wireguard-vanity-keygen";
|
||||
rev = version;
|
||||
hash = "sha256-L+YssChpGNQs2MLGXul1sxVmROOWfT0aaZMepGuKmEQ=";
|
||||
hash = "sha256-LibNWnjm52iPwrPKAA5v3krADvHcewKuLe9k5HhJgzg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kAPw5M9o99NijCC9BzYhIpzHK/8fSAJxvckaj8iRby0=";
|
||||
vendorHash = "sha256-sHVdR1zuewT9B4UlPrEWU5V9MjgkwPBh/hkSsn2PQKw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tt-rss";
|
||||
version = "0-unstable-2024-11-04";
|
||||
version = "0-unstable-2024-12-20";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.tt-rss.org/fox/tt-rss.git";
|
||||
rev = "42ebdb027ec249fb8e693c41d7ee80ecdc68d6ec";
|
||||
hash = "sha256-QN7CwUufQSFlFde0NebO/kOYtEZCyL0ut+CNEpJMIMA=";
|
||||
rev = "7b727156780236cb639c52e45d07cc80c1f2b0d3";
|
||||
hash = "sha256-b3z1cfM0El6yW7sCq8FSoN0sNa07HA4zLSUrEFX8ICM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -7,13 +7,13 @@ buildGoModule rec {
|
||||
pname = "ocb";
|
||||
# Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix`
|
||||
# whenever that version changes.
|
||||
version = "0.115.0";
|
||||
version = "0.116.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-collector";
|
||||
rev = "cmd/builder/v${version}";
|
||||
hash = "sha256-wl0ThYbDTVLuN9FkrsHF1prydrPMIaiK/9s2Ipeqfik=";
|
||||
hash = "sha256-1wFLeRbiNytPEe262TEhBrAOLUkbsdLzKYngN2S3O4E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cmd/builder";
|
||||
|
||||
Reference in New Issue
Block a user