Skip to content

Commit ec22093

Browse files
Merge master into staging-next
2 parents 82a2944 + 199c3ea commit ec22093

2 files changed

Lines changed: 25 additions & 23 deletions

File tree

nixos/tests/repath-studio.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@
2525
repath-studio
2626
];
2727

28-
# electron application, give more memory
28+
# electron application, give more memory and cpu
2929
virtualisation.memorySize = 4096;
30+
virtualisation.cores = 4;
31+
virtualisation.qemu.options = [
32+
# Force qemu at 1020x768 resolution for the Save button click
33+
"-vga none -device virtio-gpu-pci,xres=1020,yres=768"
34+
];
3035
};
3136
};
3237

@@ -52,7 +57,9 @@
5257
machine.sleep(2)
5358
machine.send_key("ctrl-shift-s")
5459
machine.sleep(2)
55-
machine.send_chars("/tmp/saved.rps\n")
60+
machine.send_chars("/tmp/saved.rps")
61+
machine.sleep(2)
62+
machine.succeed("su - alice -c 'DISPLAY=:0 xdotool mousemove --sync 975 745 click 1'") # Save file dialog
5663
machine.sleep(2)
5764
print(machine.succeed("cat /tmp/saved.rps"))
5865
assert "${pkgs.repath-studio.version}" in machine.succeed("cat /tmp/saved.rps")

pkgs/by-name/sh/sherpa-onnx/package.nix

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
alsa-lib,
1313
eigen,
1414
gtest,
15+
kissfft,
1516
nlohmann_json,
1617
onnxruntime,
1718

@@ -49,17 +50,17 @@ let
4950
};
5051
}
5152
{
52-
name = "kaldifst-1.7.17.tar.gz";
53+
name = "kaldifst-1.8.0.tar.gz";
5354
src = fetchurl {
54-
url = "https://github.com/k2-fsa/kaldifst/archive/refs/tags/v1.7.17.tar.gz";
55-
hash = "sha256-xLcBojpAC9qAMlhrAsfg1egTp2WDLfYMI+bfnmKwEPQ=";
55+
url = "https://github.com/k2-fsa/kaldifst/archive/refs/tags/v1.8.0.tar.gz";
56+
hash = "sha256-PyR7flokCQcSAvXivGIABg9mcowKNEPAOSOtJyPgQLM=";
5657
};
5758
}
5859
{
59-
name = "kaldi-decoder-0.2.11.tar.gz";
60+
name = "kaldi-decoder-0.3.0.tar.gz";
6061
src = fetchurl {
61-
url = "https://github.com/k2-fsa/kaldi-decoder/archive/refs/tags/v0.2.11.tar.gz";
62-
hash = "sha256-hcpGJTVZJUHrW6bSGEMAnPNHOPUbKLcfhIgqNpS1KL8=";
62+
url = "https://github.com/k2-fsa/kaldi-decoder/archive/refs/tags/v0.3.0.tar.gz";
63+
hash = "sha256-ufNM+0/TsTRBAO6tee9NN6oVliJ0ueMFbeNFAh92obA=";
6364
};
6465
}
6566
{
@@ -77,24 +78,17 @@ let
7778
};
7879
}
7980
{
80-
name = "openfst-sherpa-onnx-2024-06-19.tar.gz";
81+
name = "openfst-1.8.5-2026-04-11.tar.gz";
8182
src = fetchurl {
82-
url = "https://github.com/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-06-19.tar.gz";
83-
hash = "sha256-XJjoLMUJxWGFAt3khguOoE2EOFDtV+bWtZC2RLJohT0=";
83+
url = "https://github.com/csukuangfj/openfst/archive/refs/tags/v1.8.5-2026-04-11.tar.gz";
84+
hash = "sha256-V/vEuVCugbGg4eKYrxVlLalopnI6WSt4dOm0AnqApbQ=";
8485
};
8586
}
8687
{
87-
name = "hclust-cpp-2024-09-29.tar.gz";
88+
name = "hclust-cpp-2026-02-25.tar.gz";
8889
src = fetchurl {
89-
url = "https://github.com/csukuangfj/hclust-cpp/archive/refs/tags/2024-09-29.tar.gz";
90-
hash = "sha256-q6tRRIo8tUJyquB1IpcDBuCyzGR51Z17Geeu5NbO3TM=";
91-
};
92-
}
93-
{
94-
name = "kissfft-febd4caeed32e33ad8b2e0bb5ea77542c40f18ec.zip";
95-
src = fetchurl {
96-
url = "https://github.com/mborgerding/kissfft/archive/febd4caeed32e33ad8b2e0bb5ea77542c40f18ec.zip";
97-
hash = "sha256-SXED5mQWjr45WAt1etvmFvbPhaFlcq9YHKe8QtCrE/0=";
90+
url = "https://github.com/csukuangfj/hclust-cpp/archive/refs/tags/2026-02-25.tar.gz";
91+
hash = "sha256-jxTgJMcJ1zr7QK5pyyLeS3Pbpny85A8uUYgT2oE5q1Y=";
9892
};
9993
}
10094
]
@@ -117,13 +111,13 @@ let
117111
in
118112
stdenv.mkDerivation (finalAttrs: {
119113
pname = "sherpa-onnx";
120-
version = "1.12.25";
114+
version = "1.12.38";
121115

122116
src = fetchFromGitHub {
123117
owner = "k2-fsa";
124118
repo = "sherpa-onnx";
125119
tag = "v${finalAttrs.version}";
126-
hash = "sha256-NRiqk/YMk3vhlBRrmeMsJ544Xv1b7GCSMQD2ec+xi+k=";
120+
hash = "sha256-lzcquKwP68KOem50b4X0+nZ3s2IthiYB76IxfvmJo54=";
127121
};
128122

129123
outputs = [ "out" ] ++ lib.optionals pythonSupport [ "python" ];
@@ -179,6 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
179173
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_JSON" "${nlohmann_json.src}")
180174
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_EIGEN" "${eigen.src}")
181175
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
176+
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_KISSFFT" "${kissfft.src}")
182177
"-Wno-dev"
183178
]
184179
++ lib.optionals pythonSupport [

0 commit comments

Comments
 (0)