diff options
author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-03-05 14:06:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-05 14:06:23 +0000 |
commit | 7df33c6be9a872dede525d754ef755e93914b2ef (patch) | |
tree | 448dc8bb5ce94d6f27d7ce95105213e7b0ac7e6c /pkgs/applications/office | |
parent | 7c98689bab2f5ae695498b2324f46dfc4ccaff23 (diff) | |
parent | 486b613c7b833a1ec9626758d77df1df0a0d3476 (diff) | |
download | nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.tar nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.tar.gz nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.tar.bz2 nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.tar.lz nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.tar.xz nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.tar.zst nixpkgs-7df33c6be9a872dede525d754ef755e93914b2ef.zip |
Merge pull request #158048 from symphorien/paperwork-update-script
paperwork: 2.1.0 -> 2.1.1
Diffstat (limited to 'pkgs/applications/office')
4 files changed, 23 insertions, 5 deletions
diff --git a/pkgs/applications/office/paperwork/openpaperwork-core.nix b/pkgs/applications/office/paperwork/openpaperwork-core.nix index 9b6f352d97a..8f08b56d4d5 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-core.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-core.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix index 4ddc0b4e278..f1eb43dbdbc 100644 --- a/pkgs/applications/office/paperwork/openpaperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/openpaperwork-gtk.nix @@ -49,5 +49,6 @@ buildPythonPackage rec { homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 16ee7733ed2..f80f40929a1 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -16,6 +16,7 @@ , texlive , imagemagick , perlPackages +, writeScript }: let @@ -27,12 +28,19 @@ let imagemagick perlPackages.Po4a ]; + inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; in python3Packages.buildPythonApplication rec { - inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents; + inherit src version; pname = "paperwork"; + sample_docs = sample_documents // { + # a trick for the update script + name = "sample_documents"; + src = sample_documents; + }; + sourceRoot = "source/paperwork-gtk"; # Patch out a few paths that assume that we're using the FHS: @@ -69,7 +77,7 @@ python3Packages.buildPythonApplication rec { export XDG_DATA_DIRS=$XDG_DATA_DIRS:${gnome.adwaita-icon-theme}/share # build the user manual - PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_documents} make data + PATH=$out/bin:$PATH PAPERWORK_TEST_DOCUMENTS=${sample_docs} make data for i in src/paperwork_gtk/model/help/out/*.pdf; do install -Dt $site/model/help/out $i done @@ -122,12 +130,20 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - python-dateutil setuptools ]; disallowedRequisites = documentation_deps; + passthru.updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + version=$(list-git-tags https://gitlab.gnome.org/World/OpenPaperwork/paperwork.git | sed 's/^v//' | sort -V | tail -n1) + update-source-version paperwork "$version" --file=pkgs/applications/office/paperwork/src.nix + docs_version="$(curl https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/raw/$version/paperwork-gtk/src/paperwork_gtk/model/help/screenshot.sh | grep TEST_DOCS_TAG= | cut -d'"' -f2)" + update-source-version paperwork.sample_docs "$docs_version" --file=pkgs/applications/office/paperwork/src.nix --version-key=rev + ''; + meta = { description = "A personal document manager for scanned documents"; homepage = "https://openpaper.work/"; diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index a5141a43e50..980a4aabf7a 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -1,13 +1,13 @@ {fetchFromGitLab}: rec { - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; repo = "paperwork"; group = "World"; owner = "OpenPaperwork"; rev = version; - sha256 = "0d1cw6k1giqs8ji8h3h97ckb134s8pszgip0nac5hmw0mvqq84xa"; + sha256 = "2M2eMP54F3RRDMBuAZ1gBiBoMmTRJaHTUwtTjj4ZU+4="; }; sample_documents = fetchFromGitLab { domain = "gitlab.gnome.org"; |