diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-04-21 20:41:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 20:41:19 +0300 |
| commit | 89d59988a72a14e190280ef7f33c2c749bad37b0 (patch) | |
| tree | ea03894c771b1c4acb8f9fb9e4792149ba5bbdf1 | |
| parent | a7e41cdde3d7b9b5147393cec7953e5ed666a830 (diff) | |
| parent | 03e737930cf592de66e5c4ce0d436c17c4b12ed3 (diff) | |
Merge pull request #227445 from fgaz/ft2-clone/1.66
ft2-clone: 1.65 -> 1.66, fix nixos test
| -rw-r--r-- | nixos/tests/ft2-clone.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/ft2-clone/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/nixos/tests/ft2-clone.nix b/nixos/tests/ft2-clone.nix index 3c90b3d3fa201..a8395d4ebaa62 100644 --- a/nixos/tests/ft2-clone.nix +++ b/nixos/tests/ft2-clone.nix @@ -26,9 +26,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_window(r"Fasttracker") machine.sleep(5) - # One of the few words that actually get recognized - if "Songlen" not in machine.get_screen_text(): - raise Exception("Program did not start successfully") + machine.wait_for_text(r"(Songlen|Repstart|Time|About|Nibbles|Help)") machine.screenshot("screen") ''; }) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index e5d132ac6a69b..814dbed3d8a4d 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.65"; + version = "1.66"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-Jo1qs0d8/o9FWR7jboWCJ7ntawBGTlm7yPzxxUnZLsI="; + sha256 = "sha256-glLgjZFWvz/bJe9R8KTDu4+778dueC9tw3nVKF3xcps="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) |