commit e238f8a86b5d75a8f5ca16084cc0e70b129bd8a7 · pyrox.dev/nixpkgs

+41 -34

pkgs/by-name/vo/voicevox-core/package.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
       -
         fetchzip,

     

       4
       4
       +
         fetchurl,

     

       5
       5
       +
         unzip,

     

       5
       6
        
         autoPatchelfHook,

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       8
       -
       let

     

       9
       9
       -
         platformInfoTable = {

     

       10
       10
       -
           "x86_64-linux" = {

     

       11
       11
       -
             id = "linux-x64";

     

       12
       12
       -
             hash = "sha256-/PD5e0bWgnIsIrvyOypoJw30VkgbOFWV1NJpPS2G0WM=";

     

       13
       13
       -
           };

     

       14
       14
       -
           "aarch64-linux" = {

     

       15
       15
       -
             id = "linux-arm64";

     

       16
       16
       -
             hash = "sha256-zfiorXZyIISZPXPwmcdYeHceDmQXkUhsvTkNZScg648=";

     

       17
       17
       -
           };

     

       18
       18
       -
           "x86_64-darwin" = {

     

       19
       19
       -
             id = "osx-x64";

     

       20
       20
       -
             hash = "sha256-cdNdV1fVPkz6B7vtKZiPsLQGqnIiDtYa9KTcwSkjdJg=";

     

       21
       21
       -
           };

     

       22
       22
       -
           "aarch64-darwin" = {

     

       23
       23
       -
             id = "osx-arm64";

     

       24
       24
       -
             hash = "sha256-Z1dq2t/HBQulbPF23ZCihOrcZHMpTXEQ6yXKORZaFPk=";

     

       25
       25
       -
           };

     

       26
       26
       -
         };

     

       27
       27
       -
       

     

       28
       28
       -
         platformInfo =

     

       29
       29
       -
           platformInfoTable.${stdenv.hostPlatform.system}

     

       30
       30
       -
             or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

       31
       31
       -
       in

     

       32
       9
        
       stdenv.mkDerivation (finalAttrs: {

     

       33
       10
        
         pname = "voicevox-core";

     

       34
       34
       -
         version = "0.15.4";

     

       11
       11
       +
         version = "0.15.7";

     

       35
       12
        
       

     

       36
       36
       -
         # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models

     

       37
       37
       -
         src = fetchzip {

     

       38
       38
       -
           url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${platformInfo.id}-cpu-${finalAttrs.version}.zip";

     

       39
       39
       -
           inherit (platformInfo) hash;

     

       40
       40
       -
         };

     

       13
       13
       +
         src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system};

     

       41
       14
        
       

     

       42
       42
       -
         nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

     

       15
       15
       +
         nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

     

       43
       16
        
       

     

       44
       17
        
         buildInputs = [ stdenv.cc.cc.lib ];

     

       45
       18
        
       

     
···

       54
       27
        
           runHook postInstall

     

       55
       28
        
         '';

     

       56
       29
        
       

     

       30
       30
       +
         # When updating, run the following command to fetch all FODs:

     

       31
       31
       +
         # nix-build -A voicevox-core.sources --keep-going

     

       32
       32
       +
         passthru.sources =

     

       33
       33
       +
           let

     

       34
       34
       +
             # Note: Only the prebuilt binaries are able to decrypt the encrypted voice models

     

       35
       35
       +
             fetchCoreArtifact =

     

       36
       36
       +
               { id, hash }:

     

       37
       37
       +
               fetchurl {

     

       38
       38
       +
                 url = "https://github.com/VOICEVOX/voicevox_core/releases/download/${finalAttrs.version}/voicevox_core-${id}-cpu-${finalAttrs.version}.zip";

     

       39
       39
       +
                 inherit hash;

     

       40
       40
       +
               };

     

       41
       41
       +
           in

     

       42
       42
       +
           {

     

       43
       43
       +
             "x86_64-linux" = fetchCoreArtifact {

     

       44
       44
       +
               id = "linux-x64";

     

       45
       45
       +
               hash = "sha256-7FgrJ1HlB8l5MHd2KM4lYRx2bYdxrD2+su1G33/ugUA=";

     

       46
       46
       +
             };

     

       47
       47
       +
             "aarch64-linux" = fetchCoreArtifact {

     

       48
       48
       +
               id = "linux-arm64";

     

       49
       49
       +
               hash = "sha256-fD7YMTo9jeB4vJibnVwX8VrukCUeAwS6VXGOr3VXG+c=";

     

       50
       50
       +
             };

     

       51
       51
       +
             "x86_64-darwin" = fetchCoreArtifact {

     

       52
       52
       +
               id = "osx-x64";

     

       53
       53
       +
               hash = "sha256-5h9qEKbdcvip50TLs3vf6lXkSv24VEjOrx6CTUo7Q4Q=";

     

       54
       54
       +
             };

     

       55
       55
       +
             "aarch64-darwin" = fetchCoreArtifact {

     

       56
       56
       +
               id = "osx-arm64";

     

       57
       57
       +
               hash = "sha256-0bFLhvP7LqDzuk3pyM9QZfc8eLMW0IgqVkaXsuS3qlY=";

     

       58
       58
       +
             };

     

       59
       59
       +
           };

     

       60
       60
       +
       

     

       57
       61
        
         meta = {

     

       58
       62
        
           changelog = "https://github.com/VOICEVOX/voicevox_core/releases/tag/${finalAttrs.version}";

     

       59
       63
        
           description = "Core library for the VOICEVOX speech synthesis software";

     
···

       67
       71
        
               redistributable = true;

     

       68
       72
        
             })

     

       69
       73
        
           ];

     

       70
       70
       -
           maintainers = with lib.maintainers; [ tomasajt ];

     

       71
       71
       -
           platforms = lib.attrNames platformInfoTable;

     

       74
       74
       +
           maintainers = with lib.maintainers; [

     

       75
       75
       +
             tomasajt

     

       76
       76
       +
             eljamm

     

       77
       77
       +
           ];

     

       78
       78
       +
           platforms = lib.attrNames finalAttrs.passthru.sources;

     

       72
       79
        
           sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       73
       80
        
         };

     

       74
       81
        
       })

+15 -7

pkgs/by-name/vo/voicevox-engine/package.nix

···

       8
       8
        
       

     

       9
       9
        
       python3Packages.buildPythonApplication rec {

     

       10
       10
        
         pname = "voicevox-engine";

     

       11
       11
       -
         version = "0.20.0";

     

       11
       11
       +
         version = "0.22.2";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "VOICEVOX";

     

       16
       16
        
           repo = "voicevox_engine";

     

       17
       17
       -
           rev = "refs/tags/${version}";

     

       18
       18
       -
           hash = "sha256-Gib5R7oleg+XXyu2V65EqrflQ1oiAR7a09a0MFhSITc=";

     

       17
       17
       +
           tag = version;

     

       18
       18
       +
           hash = "sha256-TZycd3xX5d4dNk4ze2JozyO7zDpGAuO+O7xHAx7QXUI=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         patches = [

     
···

       95
       95
        
           # this test checks the behaviour of openapi

     

       96
       96
        
           # one of the functions returns a slightly different output due to openapi version differences

     

       97
       97
        
           "test_OpenAPIの形が変わっていないことを確認"

     

       98
       98
       +
       

     

       99
       99
       +
           # these tests fail due to some tiny floating point discrepancies

     

       100
       100
       +
           "test_upspeak_voiced_last_mora"

     

       101
       101
       +
           "test_upspeak_voiced_N_last_mora"

     

       98
       102
        
         ];

     

       99
       103
        
       

     

       100
       104
        
         nativeCheckInputs = with python3Packages; [

     
···

       105
       109
        
       

     

       106
       110
        
         passthru = {

     

       107
       111
        
           resources = fetchFromGitHub {

     

       112
       112
       +
             name = "voicevox-resource-${version}"; # this contains ${version} to invalidate the hash upon updating the package

     

       108
       113
        
             owner = "VOICEVOX";

     

       109
       114
        
             repo = "voicevox_resource";

     

       110
       110
       -
             rev = "refs/tags/${version}";

     

       111
       111
       -
             hash = "sha256-m888DF9qgGbK30RSwNnAoT9D0tRJk6cD5QY72FRkatM=";

     

       115
       115
       +
             tag = version;

     

       116
       116
       +
             hash = "sha256-oeWJESm1v0wicAXXFAyZT8z4QRVv9c+3vsWksmuY5wY=";

     

       112
       117
        
           };

     

       113
       118
        
       

     

       114
       119
        
           pyopenjtalk = python3Packages.callPackage ./pyopenjtalk.nix { };

     

       115
       120
        
         };

     

       116
       121
        
       

     

       117
       122
        
         meta = {

     

       118
       118
       -
           changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${version}";

     

       123
       123
       +
           changelog = "https://github.com/VOICEVOX/voicevox_engine/releases/tag/${src.tag}";

     

       119
       124
        
           description = "Engine for the VOICEVOX speech synthesis software";

     

       120
       125
        
           homepage = "https://github.com/VOICEVOX/voicevox_engine";

     

       121
       126
        
           license = lib.licenses.lgpl3Only;

     

       122
       127
        
           mainProgram = "voicevox-engine";

     

       123
       123
       -
           maintainers = with lib.maintainers; [ tomasajt ];

     

       128
       128
       +
           maintainers = with lib.maintainers; [

     

       129
       129
       +
             tomasajt

     

       130
       130
       +
             eljamm

     

       131
       131
       +
           ];

     

       124
       132
        
           platforms = lib.platforms.linux ++ lib.platforms.darwin;

     

       125
       133
        
         };

     

       126
       134
        
       }

+10 -11

pkgs/by-name/vo/voicevox/hardcode-paths.patch

···

       12
       12
        
                "host": "http://127.0.0.1:50021"

     

       13
       13
        
            }

     

       14
       14
        
       diff --git a/electron-builder.config.js b/electron-builder.config.js

     

       15
       15
       -
       index 462e6f2..10a9bff 100644

     

       15
       15
       +
       index 196a0d7..7e313c2 100644

     

       16
       16
        
       --- a/electron-builder.config.js

     

       17
       17
        
       +++ b/electron-builder.config.js

     

       18
       18
       -
       @@ -35,19 +35,6 @@ const isMac = process.platform === "darwin";

     

       18
       18
       +
       @@ -37,18 +37,7 @@ const isArm64 = process.arch === "arm64";

     

       19
       19
        
        // 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

     

       20
       20
        
        const extraFilePrefix = isMac ? "MacOS/" : "";

     

       21
       21
        
        

     

       22
       22
        
       -const sevenZipFile = fs

     

       23
       23
       -
       -  .readdirSync(path.resolve(__dirname, "build", "vendored", "7z"))

     

       23
       23
       +
       -  .readdirSync(path.resolve(__dirname, "vendored", "7z"))

     

       24
       24
        
       -  .find(

     

       25
       25
        
       -    // Windows: 7za.exe, Linux: 7zzs, macOS: 7zz

     

       26
       26
        
       -    (fileName) => ["7za.exe", "7zzs", "7zz"].includes(fileName),

     

       27
       27
        
       -  );

     

       28
       28
       -
       -

     

       28
       28
       +
        

     

       29
       29
        
       -if (!sevenZipFile) {

     

       30
       30
        
       -  throw new Error(

     

       31
       31
       -
       -    "7z binary file not found. Run `node ./build/download7z.js` first.",

     

       31
       31
       +
       -    "7z binary file not found. Run `node ./tools/download7z.js` first.",

     

       32
       32
        
       -  );

     

       33
       33
        
       -}

     

       34
       34
       -
       -

     

       34
       34
       +
        

     

       35
       35
        
        /** @type {import("electron-builder").Configuration} */

     

       36
       36
        
        const builderOptions = {

     

       37
       37
       -
          beforeBuild: async () => {

     

       38
       38
       -
       @@ -88,14 +75,6 @@ const builderOptions = {

     

       37
       37
       +
       @@ -90,14 +79,6 @@ const builderOptions = {

     

       39
       38
        
              from: "build/README.txt",

     

       40
       39
        
              to: extraFilePrefix + "README.txt",

     

       41
       40
        
            },

     
···

       44
       43
        
       -      to: path.join(extraFilePrefix, "vv-engine"),

     

       45
       44
        
       -    },

     

       46
       45
        
       -    {

     

       47
       47
       -
       -      from: path.resolve(__dirname, "build", "vendored", "7z", sevenZipFile),

     

       46
       46
       +
       -      from: path.resolve(__dirname, "vendored", "7z", sevenZipFile),

     

       48
       47
        
       -      to: extraFilePrefix + sevenZipFile,

     

       49
       48
        
       -    },

     

       50
       49
        
          ],

     

       51
       50
        
          // electron-builder installer

     

       52
       51
        
          productName: "VOICEVOX",

     

       53
       52
        
       diff --git a/src/backend/electron/manager/vvppManager.ts b/src/backend/electron/manager/vvppManager.ts

     

       54
       54
       -
       index 6aa17b6..b8b52b7 100644

     

       53
       53
       +
       index edd3177..22d0114 100644

     

       55
       54
        
       --- a/src/backend/electron/manager/vvppManager.ts

     

       56
       55
        
       +++ b/src/backend/electron/manager/vvppManager.ts

     

       57
       57
       -
       @@ -196,16 +196,8 @@ export class VvppManager {

     

       56
       56
       +
       @@ -184,16 +184,8 @@ export class VvppManager {

     

       58
       57
        
        

     

       59
       58
        
                const args = ["x", "-o" + outputDir, archiveFile, "-t" + format];

     

       60
       59

+17 -6

pkgs/by-name/vo/voicevox/package.nix

···

       10
       10
        
         electron,

     

       11
       11
        
         _7zz,

     

       12
       12
        
         voicevox-engine,

     

       13
       13
       +
         dart-sass,

     

       13
       14
        
       }:

     

       14
       15
        
       

     

       15
       16
        
       buildNpmPackage rec {

     

       16
       17
        
         pname = "voicevox";

     

       17
       17
       -
         version = "0.20.0";

     

       18
       18
       +
         version = "0.22.3";

     

       18
       19
        
       

     

       19
       20
        
         src = fetchFromGitHub {

     

       20
       21
        
           owner = "VOICEVOX";

     

       21
       22
        
           repo = "voicevox";

     

       22
       22
       -
           rev = "refs/tags/${version}";

     

       23
       23
       -
           hash = "sha256-05WTecNc1xxe7SGDPZbLtRELNghFkMTqI4pkX4PsVWI=";

     

       23
       23
       +
           tag = version;

     

       24
       24
       +
           hash = "sha256-6z+A4bJIDfN/K8IjEdt2TqEa/EDt4uQpGh+zSWfP74I=";

     

       24
       25
        
         };

     

       25
       26
        
       

     

       26
       27
        
         patches = [

     
···

       36
       37
        
               --replace-fail "postinstall" "_postinstall"

     

       37
       38
        
         '';

     

       38
       39
        
       

     

       39
       39
       -
         npmDepsHash = "sha256-g3avCj3S96qYPAyGXn4yvrZ4gteJld+g4eV4aRtv/3g=";

     

       40
       40
       +
         npmDepsHash = "sha256-NuKFhDb/J6G3pFYHZedKnY2hDC5GCp70DpqrST4bJMA=";

     

       41
       41
       +
       

     

       42
       42
       +
         # unlock very specific node version bounds specified by upstream

     

       43
       43
       +
         npmInstallFlags = [ "--engine-strict=false" ];

     

       40
       44
        
       

     

       41
       45
        
         nativeBuildInputs =

     

       42
       46
        
           [

     
···

       54
       58
        
         buildPhase = ''

     

       55
       59
        
           runHook preBuild

     

       56
       60
        
       

     

       61
       61
       +
           # force sass-embedded to use our own sass instead of the bundled one

     

       62
       62
       +
           substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \

     

       63
       63
       +
               --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'

     

       64
       64
       +
       

     

       57
       65
        
           # build command taken from the definition of the `electron:build` npm script

     

       58
       66
        
           VITE_TARGET=electron npm exec vite build

     

       59
       67
        
       

     
···

       105
       113
        
         ];

     

       106
       114
        
       

     

       107
       115
        
         meta = {

     

       108
       108
       -
           changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${version}";

     

       116
       116
       +
           changelog = "https://github.com/VOICEVOX/voicevox/releases/tag/${src.tag}";

     

       109
       117
        
           description = "Editor for the VOICEVOX speech synthesis software";

     

       110
       118
        
           homepage = "https://github.com/VOICEVOX/voicevox";

     

       111
       119
        
           license = lib.licenses.lgpl3Only;

     

       112
       120
        
           mainProgram = "voicevox";

     

       113
       113
       -
           maintainers = with lib.maintainers; [ tomasajt ];

     

       121
       121
       +
           maintainers = with lib.maintainers; [

     

       122
       122
       +
             tomasajt

     

       123
       123
       +
             eljamm

     

       124
       124
       +
           ];

     

       114
       125
        
           platforms = electron.meta.platforms;

     

       115
       126
        
         };

     

       116
       127
        
       }