pyrox.dev
paperwork: fix installing translations (#370379)
authored by Guillaume Girol and committed by GitHub 84ed163a eece9429
+2
-2
pkgs/applications/office/paperwork/openpaperwork-core.nix
+2
-2
pkgs/applications/office/paperwork/openpaperwork-core.nix
···
1
1
{
2
2
buildPythonPackage,
3
3
lib,
4
-
fetchFromGitLab,
4
+
callPackage,
5
5
6
6
isPy3k,
7
7
isPyPy,
···
17
17
18
18
buildPythonPackage rec {
19
19
pname = "openpaperwork-core";
20
-
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
20
+
inherit (callPackage ./src.nix { }) version src;
21
21
format = "pyproject";
22
22
23
23
sourceRoot = "${src.name}/openpaperwork-core";
+2
-2
pkgs/applications/office/paperwork/openpaperwork-gtk.nix
+2
-2
pkgs/applications/office/paperwork/openpaperwork-gtk.nix
···
1
1
{
2
2
buildPythonPackage,
3
3
lib,
4
-
fetchFromGitLab,
4
+
callPackage,
5
5
6
6
isPy3k,
7
7
isPyPy,
···
17
17
18
18
buildPythonPackage rec {
19
19
pname = "openpaperwork-gtk";
20
-
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
20
+
inherit (callPackage ./src.nix { }) version src;
21
21
format = "pyproject";
22
22
23
23
sourceRoot = "${src.name}/openpaperwork-gtk";
+2
-2
pkgs/applications/office/paperwork/paperwork-backend.nix
+2
-2
pkgs/applications/office/paperwork/paperwork-backend.nix
···
1
1
{
2
2
buildPythonPackage,
3
3
lib,
4
-
fetchFromGitLab,
4
+
callPackage,
5
5
pyenchant,
6
6
scikit-learn,
7
7
pypillowfight,
···
28
28
29
29
buildPythonPackage rec {
30
30
pname = "paperwork-backend";
31
-
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
31
+
inherit (callPackage ./src.nix { }) version src;
32
32
format = "pyproject";
33
33
34
34
sourceRoot = "${src.name}/paperwork-backend";
+2
-2
pkgs/applications/office/paperwork/paperwork-gtk.nix
+2
-2
pkgs/applications/office/paperwork/paperwork-gtk.nix
···
1
1
{
2
2
lib,
3
+
callPackage,
3
4
python3Packages,
4
5
gtk3,
5
6
cairo,
···
9
10
dbus,
10
11
libnotify,
11
12
wrapGAppsHook3,
12
-
fetchFromGitLab,
13
13
which,
14
14
gettext,
15
15
gobject-introspection,
···
32
32
imagemagick
33
33
perlPackages.Po4a
34
34
];
35
-
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src sample_documents;
35
+
inherit (callPackage ./src.nix { }) version src sample_documents;
36
36
in
37
37
38
38
python3Packages.buildPythonApplication rec {
+2
-2
pkgs/applications/office/paperwork/paperwork-shell.nix
+2
-2
pkgs/applications/office/paperwork/paperwork-shell.nix
···
1
1
{
2
2
buildPythonPackage,
3
3
lib,
4
-
fetchFromGitLab,
4
+
callPackage,
5
5
6
6
isPy3k,
7
7
isPyPy,
···
21
21
22
22
buildPythonPackage rec {
23
23
pname = "paperwork-shell";
24
-
inherit (import ./src.nix { inherit fetchFromGitLab; }) version src;
24
+
inherit (callPackage ./src.nix { }) version src;
25
25
format = "pyproject";
26
26
27
27
sourceRoot = "${src.name}/paperwork-shell";
+28
-8
pkgs/applications/office/paperwork/src.nix
+28
-8
pkgs/applications/office/paperwork/src.nix
···
1
-
{ fetchFromGitLab }:
1
+
{
2
+
fetchFromGitLab,
3
+
srcOnly,
4
+
fetchpatch,
5
+
}:
2
6
rec {
3
7
version = "2.2.5";
4
-
src = fetchFromGitLab {
5
-
domain = "gitlab.gnome.org";
6
-
repo = "paperwork";
7
-
group = "World";
8
-
owner = "OpenPaperwork";
9
-
rev = version;
10
-
sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY=";
8
+
src = srcOnly {
9
+
pname = "paperwork-patched-src";
10
+
inherit version;
11
+
src = fetchFromGitLab {
12
+
domain = "gitlab.gnome.org";
13
+
repo = "paperwork";
14
+
group = "World";
15
+
owner = "OpenPaperwork";
16
+
rev = version;
17
+
sha256 = "sha256-PRh0ohmPLwpM76qYfbExFqq4OK6Hm0fbdzrjXungSoY=";
18
+
};
19
+
patches = [
20
+
# fix installing translations
21
+
# remove on next release
22
+
(
23
+
assert version == "2.2.5";
24
+
fetchpatch {
25
+
url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/b8e2633ace0f3d9d57e68c27db8f594b8a5ddd7e.patch";
26
+
hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8=";
27
+
}
28
+
)
29
+
];
11
30
};
31
+
12
32
sample_documents = fetchFromGitLab {
13
33
domain = "gitlab.gnome.org";
14
34
repo = "paperwork-test-documents";