mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
paperwork: 1.0.6.1 -> 1.2
This commit is contained in:
parent
d30fc3be98
commit
78fc7269be
2 changed files with 10 additions and 15 deletions
|
@ -1,19 +1,19 @@
|
|||
{ lib, python3Packages, fetchFromGitHub, gtk3, cairo
|
||||
, aspellDicts, buildEnv
|
||||
, gnome3, hicolor_icon_theme
|
||||
, xvfb_run, dbus
|
||||
, xvfb_run, dbus, libnotify
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "paperwork-${version}";
|
||||
# Don't forget to also update paperwork-backend when updating this!
|
||||
version = "1.0.6.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "paperwork";
|
||||
owner = "jflesch";
|
||||
rev = version;
|
||||
sha256 = "1v1lxyi4crdik4jlwjds9n6lzw4m4l4f9n5azlinv8wb477qpv6h";
|
||||
sha256 = "1cb9wnhhpm3dyxjrkyl9bbva56xx85vlwlb7z07m1icflcln14x5";
|
||||
};
|
||||
|
||||
# Patch out a few paths that assume that we're using the FHS:
|
||||
|
@ -47,7 +47,7 @@ python3Packages.buildPythonApplication rec {
|
|||
}}/lib/aspell";
|
||||
|
||||
checkInputs = [ xvfb_run dbus.daemon ];
|
||||
buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme ];
|
||||
buildInputs = [ gnome3.defaultIconTheme hicolor_icon_theme libnotify ];
|
||||
|
||||
# A few parts of chkdeps need to have a display and a dbus session, so we not
|
||||
# only need to run a virtual X server + dbus but also have a large enough
|
||||
|
@ -59,7 +59,7 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
paperwork-backend pypillowfight gtk3 cairo
|
||||
paperwork-backend pypillowfight gtk3 cairo pyxdg dateutil
|
||||
];
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
@ -8192,30 +8192,25 @@ in {
|
|||
|
||||
paperwork-backend = buildPythonPackage rec {
|
||||
name = "paperwork-backend-${version}";
|
||||
version = "1.0.6";
|
||||
version = "1.2.0";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jflesch";
|
||||
repo = "paperwork-backend";
|
||||
rev = version;
|
||||
sha256 = "11jbhv9xcpimp9iq2b1hlpljzij73s86rb5lpgzhslqc7zmm5bxn";
|
||||
sha256 = "1pzyy14f9wzh9vwn855k1z48a8mbs73j1dk8730kdlcdkmn3l1ms";
|
||||
};
|
||||
|
||||
# Python 2.x is not supported.
|
||||
disabled = !isPy3k && !isPyPy;
|
||||
|
||||
# Make sure that chkdeps exits with status 1 if a dependency is not found.
|
||||
postPatch = ''
|
||||
sed -i -e '/print.*Missing dependencies/,/^ *$/ {
|
||||
/^ *$/ a \ sys.exit(1)
|
||||
}' scripts/paperwork-shell
|
||||
'';
|
||||
|
||||
preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
|
||||
|
||||
propagatedBuildInputs = with self; [
|
||||
pyenchant simplebayes pillow pycountry whoosh termcolor
|
||||
python-Levenshtein pyinsane2 pygobject3 pyocr pkgs.poppler_gi
|
||||
python-Levenshtein pyinsane2 pygobject3 pyocr
|
||||
pkgs.poppler_gi pkgs.gtk3
|
||||
natsort
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
|
Loading…
Reference in a new issue