public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

paperwork: 1.2.2 -> 1.2.4

Browse Source
This commit is contained in:
Symphorien Gibol 2018-09-14 14:32:02 +02:00
parent c3612b97e6
commit f4039397f6
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/office/paperwork/backend.nix
View File

@ -1,4 +1,4 @@
{ buildPythonPackage, lib, fetchFromGitHub { buildPythonPackage, lib, fetchFromGitLab
, isPy3k, isPyPy , isPy3k, isPyPy
@ -10,18 +10,26 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "paperwork-backend"; pname = "paperwork-backend";
version = "1.2.2"; version = "1.2.4";
src = fetchFromGitHub { src = fetchFromGitLab {
owner = "openpaperwork"; domain = "gitlab.gnome.org";
repo = "paperwork-backend"; repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version; rev = version;
sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf"; sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4";
}; };
sourceRoot = "source/paperwork-backend";
# Python 2.x is not supported. # Python 2.x is not supported.
disabled = !isPy3k && !isPyPy; disabled = !isPy3k && !isPyPy;
patchPhase = ''
echo 'version = "${version}"' > paperwork_backend/_version.py
'';
preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend";
propagatedBuildInputs = [ propagatedBuildInputs = [

18
pkgs/applications/office/paperwork/default.nix
View File

@ -1,20 +1,14 @@
{ lib, python3Packages, fetchFromGitHub, gtk3, cairo { lib, python3Packages, fetchFromGitLab, gtk3, cairo
, aspellDicts, buildEnv , aspellDicts, buildEnv
, gnome3, hicolor-icon-theme, librsvg , gnome3, hicolor-icon-theme, librsvg
, xvfb_run, dbus, libnotify , xvfb_run, dbus, libnotify
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
inherit (python3Packages.paperwork-backend) version src;
name = "paperwork-${version}"; name = "paperwork-${version}";
# Don't forget to also update paperwork-backend when updating this!
version = "1.2.2";
src = fetchFromGitHub { sourceRoot = "source/paperwork-gtk";
repo = "paperwork";
owner = "openpaperwork";
rev = version;
sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk";
};
# Patch out a few paths that assume that we're using the FHS: # Patch out a few paths that assume that we're using the FHS:
postPatch = '' postPatch = ''
@ -39,6 +33,12 @@ python3Packages.buildPythonApplication rec {
sed -i -e 's/"logo"/"logo-icon-name"/g' \ sed -i -e 's/"logo"/"logo-icon-name"/g' \
src/paperwork/frontend/aboutdialog/aboutdialog.glade src/paperwork/frontend/aboutdialog/aboutdialog.glade
cat - ../AUTHORS.py > src/paperwork/_version.py <<EOF
# -*- coding: utf-8 -*-
version = "${version}"
authors_code=""
EOF
''; '';
ASPELL_CONF = "dict-dir ${buildEnv { ASPELL_CONF = "dict-dir ${buildEnv {