paperwork: 2.0.2 -> 2.0.3 and compile user manual

+49 -9
+37 -7
pkgs/applications/office/paperwork/paperwork-gtk.nix
··· 13 13 , gettext 14 14 , gobject-introspection 15 15 , gdk-pixbuf 16 + , texlive 17 + , imagemagick 18 + , perlPackages 16 19 }: 17 20 21 + let 22 + documentation_deps = [ 23 + (texlive.combine { 24 + inherit (texlive) scheme-small wrapfig was; 25 + }) 26 + xvfb-run 27 + imagemagick 28 + perlPackages.Po4a 29 + ]; 30 + in 31 + 18 32 python3Packages.buildPythonApplication rec { 19 - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src; 33 + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; 20 34 pname = "paperwork"; 21 35 22 36 sourceRoot = "source/paperwork-gtk"; ··· 52 66 for i in $site/data/paperwork_*.png; do 53 67 ln -s $i $site/icon/out; 54 68 done 69 + 70 + export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share 71 + # build the user manual 72 + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data 73 + for i in src/paperwork_gtk/model/help/out/*.pdf; do 74 + install -Dt $site/model/help/out $i 75 + done 55 76 ''; 56 77 57 - checkInputs = [ xvfb-run dbus.daemon ]; 78 + checkInputs = [ dbus.daemon ]; 58 79 59 80 nativeBuildInputs = [ 60 81 wrapGAppsHook ··· 62 83 (lib.getBin gettext) 63 84 which 64 85 gdk-pixbuf # for the setup hook 65 - ]; 86 + ] ++ documentation_deps; 66 87 67 88 buildInputs = [ 68 89 gnome.adwaita-icon-theme ··· 78 99 makeWrapperArgs+=("''${gappsWrapperArgs[@]}") 79 100 ''; 80 101 81 - # A few parts of chkdeps need to have a display and a dbus session, so we not 82 - # only need to run a virtual X server + dbus but also have a large enough 83 - # resolution, because the Cairo test tries to draw a 200x200 window. 84 - preCheck = '' 102 + checkPhase = '' 103 + runHook preCheck 104 + 105 + # A few parts of chkdeps need to have a display and a dbus session, so we not 106 + # only need to run a virtual X server + dbus but also have a large enough 107 + # resolution, because the Cairo test tries to draw a 200x200 window. 85 108 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ 86 109 --config-file=${dbus.daemon}/share/dbus-1/session.conf \ 87 110 $out/bin/paperwork-gtk chkdeps 111 + 112 + # content of make test, without the dep on make install 113 + python -m unittest discover --verbose -s tests 114 + 115 + runHook postCheck 88 116 ''; 89 117 90 118 propagatedBuildInputs = with python3Packages; [ ··· 97 125 dateutil 98 126 setuptools 99 127 ]; 128 + 129 + disallowedRequisites = documentation_deps; 100 130 101 131 meta = { 102 132 description = "A personal document manager for scanned documents";
+12 -2
pkgs/applications/office/paperwork/src.nix
··· 1 1 {fetchFromGitLab}: 2 2 rec { 3 - version = "2.0.2"; 3 + version = "2.0.3"; 4 4 src = fetchFromGitLab { 5 5 domain = "gitlab.gnome.org"; 6 6 repo = "paperwork"; 7 7 group = "World"; 8 8 owner = "OpenPaperwork"; 9 9 rev = version; 10 - sha256 = "1di7nnl8ywyiwfpl5m1kvip1m0hvijbmqmkdpviwqw7ajizrr1ly"; 10 + sha256 = "02c2ysca75j59v87n1axqfncvs167kmdr40m0f05asdh2akwrbi9"; 11 11 }; 12 + sample_documents = fetchFromGitLab { 13 + domain = "gitlab.gnome.org"; 14 + repo = "paperwork-test-documents"; 15 + group = "World"; 16 + owner = "OpenPaperwork"; 17 + # https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/blob/master/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh see TEST_DOCS_TAG 18 + rev = "1.0"; 19 + sha256 = "155nhw2jmlgfi6c3wm241vrr3yma6lw85k9lxn844z96kyi7wbpr"; 20 + }; 21 + 12 22 }