cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #289264 from pbek/feature/qownnotes-update

Browse source 
qownnotes: 24.2.0 -> 24.2.3
This commit is contained in:
Nick Cao 2024-02-16 09:41:40 -05:00 committed by GitHub
commit 97f78162e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
nixos/tests/qownnotes.nix
View file

@ -21,6 +21,7 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
enableOCR = true; enableOCR = true;
# https://nixos.org/manual/nixos/stable/#ssec-machine-objects
testScript = { nodes, ... }: let testScript = { nodes, ... }: let
aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");''; aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");'';
in '' in ''
@ -52,8 +53,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
machine.wait_for_text("App metric") machine.wait_for_text("App metric")
machine.send_key("ret") machine.send_key("ret")
# Doesn't work for non-root
#machine.wait_for_window("QOwnNotes - ${pkgs.qownnotes.version}")
# OCR doesn't seem to be able any more to handle the main window
#machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}")
# The main window should now show up # The main window should now show up
machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}")
machine.wait_for_open_port(22222) machine.wait_for_open_port(22222)
machine.wait_for_console_text("QOwnNotes server listening on port 22222") machine.wait_for_console_text("QOwnNotes server listening on port 22222")
@ -63,7 +69,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
machine.send_key("ctrl-n") machine.send_key("ctrl-n")
machine.sleep(1) machine.sleep(1)
machine.send_chars("This is a NixOS test!\n") machine.send_chars("This is a NixOS test!\n")
machine.wait_for_text("This is a NixOS test!") machine.wait_until_succeeds("find /home/alice/Notes -type f | grep -qi 'Note 2'")
# OCR doesn't seem to be able any more to handle the main window
#machine.wait_for_text("This is a NixOS test!")
# Doesn't work for non-root
#machine.wait_for_window("- QOwnNotes - ${pkgs.qownnotes.version}")
machine.screenshot("QOwnNotes-NewNote") machine.screenshot("QOwnNotes-NewNote")
''; '';

4
pkgs/applications/office/qownnotes/default.nix
View file

@ -19,14 +19,14 @@
let let
pname = "qownnotes"; pname = "qownnotes";
appname = "QOwnNotes"; appname = "QOwnNotes";
version = "24.2.0"; version = "24.2.3";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
hash = "sha256-mk7yFlL+NiTZ0JtSY3y/Y1NrN1QYcBxveMImv1zB1l8="; hash = "sha256-US+RyjKpzIPpqvc19nInUW5/x/osLbc6xk4yKEdQYic=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [