Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] paperwork: fix installing translations #375040

Merged
merged 1 commit into from
Jan 19, 2025
Merged

[Backport release-24.11] paperwork: fix installing translations #375040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/office/paperwork/openpaperwork-core.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
buildPythonPackage,
lib,
fetchFromGitLab,
callPackage,

isPy3k,
isPyPy,
Expand All @@ -17,7 +17,7 @@

buildPythonPackage rec {
pname = "openpaperwork-core";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
inherit (callPackage ./src.nix { }) version src;
format = "pyproject";

sourceRoot = "${src.name}/openpaperwork-core";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/office/paperwork/openpaperwork-gtk.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
buildPythonPackage,
lib,
fetchFromGitLab,
callPackage,

isPy3k,
isPyPy,
Expand All @@ -17,7 +17,7 @@

buildPythonPackage rec {
pname = "openpaperwork-gtk";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
inherit (callPackage ./src.nix { }) version src;
format = "pyproject";

sourceRoot = "${src.name}/openpaperwork-gtk";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/office/paperwork/paperwork-backend.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
buildPythonPackage,
lib,
fetchFromGitLab,
callPackage,
pyenchant,
scikit-learn,
pypillowfight,
Expand All @@ -28,7 +28,7 @@

buildPythonPackage rec {
pname = "paperwork-backend";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
inherit (callPackage ./src.nix { }) version src;
format = "pyproject";

sourceRoot = "${src.name}/paperwork-backend";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/office/paperwork/paperwork-gtk.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
lib,
callPackage,
python3Packages,
gtk3,
cairo,
Expand All @@ -9,7 +10,6 @@
dbus,
libnotify,
wrapGAppsHook3,
fetchFromGitLab,
which,
gettext,
gobject-introspection,
Expand All @@ -32,7 +32,7 @@ let
imagemagick
perlPackages.Po4a
];
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents;
inherit (callPackage ./src.nix { }) version src sample_documents;
in

python3Packages.buildPythonApplication rec {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/office/paperwork/paperwork-shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
buildPythonPackage,
lib,
fetchFromGitLab,
callPackage,

isPy3k,
isPyPy,
Expand All @@ -21,7 +21,7 @@

buildPythonPackage rec {
pname = "paperwork-shell";
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
inherit (callPackage ./src.nix { }) version src;
format = "pyproject";

sourceRoot = "${src.name}/paperwork-shell";
Expand Down
36 changes: 28 additions & 8 deletions pkgs/applications/office/paperwork/src.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,34 @@
{ fetchFromGitLab }:
{
fetchFromGitLab,
srcOnly,
fetchpatch,
}:
rec {
version = "2.2.5";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY=";
src = srcOnly {
pname = "paperwork-patched-src";
inherit version;
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork";
group = "World";
owner = "OpenPaperwork";
rev = version;
sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY=";
};
patches = [
# fix installing translations
# remove on next release
(
assert version == "2.2.5";
fetchpatch {
url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/b8e2633ace0f3d9d57e68c27db8f594b8a5ddd7e.patch";
hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8=";
}
)
];
};

sample_documents = fetchFromGitLab {
domain = "gitlab.gnome.org";
repo = "paperwork-test-documents";
Expand Down