git.iko.soy/typeable/nixpkgs
on master help sign in
scribusUnstable: 1.5.5 -> 1.5.6.1
commitb605b989c5fa327625eb1027b06368bd26f08dd1 authorJustin Humm <justin.humm@posteo.de> dateWed 11 Nov 2020, 11:39 (6 years ago) parent0a5ed77
1 file changed+4−41
pkgs/applications/office/scribus/unstable.nix+4−41
pkgs/applications/office/scribus/unstable.nix+4−41
@@ -18,7 +18,7 @@
1818, podofo
1919, poppler
2020, poppler_data
21−, python2
21+, python3
2222, qtbase
2323, qtimageformats
2424, qttools
@@ -26,7 +26,7 @@
2626}:
2727
2828let
29− pythonEnv = python2.withPackages (
29+ pythonEnv = python3.withPackages (
3030 ps: [
3131 ps.pillow
3232 ps.tkinter
@@ -36,50 +36,13 @@ in
3636mkDerivation rec {
3737 pname = "scribus";
3838
39− version = "1.5.5";
39+ version = "1.5.6.1";
4040
4141 src = fetchurl {
4242 url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz";
43− sha256 = "0w9zzsiaq3f7vpxybk01c9z2b4qqg67mzpyfb2gjchz8dhdb423r";
43+ sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s=";
4444 };
4545
46− patches = [
47− # Poppler patches from
48− # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf
49−
50− # fix build with Poppler 0.82
51− (fetchpatch {
52− url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch";
53− sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939";
54− })
55− # fix build with Poppler 0.83
56− (fetchpatch {
57− url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch";
58− sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx";
59− })
60− # fix build with Poppler 0.84
61− # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version
62− (fetchpatch {
63− url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch";
64− sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y";
65− })
66− # Formating changes needed for the Poppler 0.86 patch to apply
67− (fetchpatch {
68− url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch";
69− sha256 = "16n3wch2mkabgkb06iywggdkckr4idrw4in56k5jh2jqjl0ra2db";
70− })
71− (fetchpatch {
72− url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch";
73− sha256 = "0g6l3qc75wiykh59059ajraxjczh11wkm68942d0skl144i893rr";
74− includes = [ "scribus/plugins/import/pdf/*" ];
75− })
76− # fix build with Poppler 0.86
77− (fetchpatch {
78− url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch";
79− sha256 = "1lszpzlpgdhm79nywvqji25aklfhzb2qfsfiyld7yv51h82zwp77";
80− })
81− ];
82−
8346 enableParallelBuilding = true;
8447
8548 nativeBuildInputs = [