diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2018-09-14 14:32:02 +0200 |
|---|---|---|
| committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2018-09-14 14:32:02 +0200 |
| commit | f4039397f634679afaf3b1ae1671e58ca52d90e9 (patch) | |
| tree | d4dc25b57a8ebe4374bf6c41b361788cf7330071 | |
| parent | c3612b97e625ad0d70c6ba56d191bcb9a403f44c (diff) | |
| download | nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.tar nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.tar.gz nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.tar.bz2 nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.tar.lz nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.tar.xz nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.tar.zst nixpkgs-f4039397f634679afaf3b1ae1671e58ca52d90e9.zip | |
paperwork: 1.2.2 -> 1.2.4
| -rw-r--r-- | pkgs/applications/office/paperwork/backend.nix | 20 | ||||
| -rw-r--r-- | pkgs/applications/office/paperwork/default.nix | 18 |
2 files changed, 23 insertions, 15 deletions
diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index 9e17d807fb1..7f82780fbe9 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, fetchFromGitHub +{ buildPythonPackage, lib, fetchFromGitLab , isPy3k, isPyPy @@ -10,18 +10,26 @@ buildPythonPackage rec { pname = "paperwork-backend"; - version = "1.2.2"; + version = "1.2.4"; - src = fetchFromGitHub { - owner = "openpaperwork"; - repo = "paperwork-backend"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + repo = "paperwork"; + group = "World"; + owner = "OpenPaperwork"; rev = version; - sha256 = "1rvf06vphm32601ja1bfkfkfpgjxiv0lh4yxjy31jll0bfnsf7pf"; + sha256 = "0wjjiw99aswmppnhzq3jir0p5p78r3m8hjinhdirkgm6h7skq5p4"; }; + sourceRoot = "source/paperwork-backend"; + # Python 2.x is not supported. disabled = !isPy3k && !isPyPy; + patchPhase = '' + echo 'version = "${version}"' > paperwork_backend/_version.py + ''; + preCheck = "\"$out/bin/paperwork-shell\" chkdeps paperwork_backend"; propagatedBuildInputs = [ diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index 14cde8415fd..a48b6e1e116 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -1,20 +1,14 @@ -{ lib, python3Packages, fetchFromGitHub, gtk3, cairo +{ lib, python3Packages, fetchFromGitLab, gtk3, cairo , aspellDicts, buildEnv , gnome3, hicolor-icon-theme, librsvg , xvfb_run, dbus, libnotify }: python3Packages.buildPythonApplication rec { + inherit (python3Packages.paperwork-backend) version src; name = "paperwork-${version}"; - # Don't forget to also update paperwork-backend when updating this! - version = "1.2.2"; - src = fetchFromGitHub { - repo = "paperwork"; - owner = "openpaperwork"; - rev = version; - sha256 = "1nb5sna2s952xb7c89qccg9qp693pyqj8g7xz16ll16ydfqnzsdk"; - }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: postPatch = '' @@ -39,6 +33,12 @@ python3Packages.buildPythonApplication rec { sed -i -e 's/"logo"/"logo-icon-name"/g' \ 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 { |