diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-01-16 18:50:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 18:50:50 +0000 |
| commit | 872502aa56bd4d574fcfe9cfef9066c9e8ee2894 (patch) | |
| tree | 54bdcbcae977bdda13362e312598fc77852903ed | |
| parent | df16a945f179636362ccfb03ef52178856890407 (diff) | |
| parent | a542105dc9770718d9d1c3c66688ad86bf819cc3 (diff) | |
| download | nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.tar nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.tar.gz nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.tar.bz2 nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.tar.lz nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.tar.xz nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.tar.zst nixpkgs-872502aa56bd4d574fcfe9cfef9066c9e8ee2894.zip | |
Merge pull request #54055 from erictapen/scribusUnstable-2019-01-16
scribusUnstable: 2019-01-14 -> 2019-01-16
| -rw-r--r-- | pkgs/applications/office/scribus/poppler-0.73.0.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/office/scribus/unstable.nix | 8 |
2 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/applications/office/scribus/poppler-0.73.0.patch b/pkgs/applications/office/scribus/poppler-0.73.0.patch deleted file mode 100644 index d8cf14b48c2..00000000000 --- a/pkgs/applications/office/scribus/poppler-0.73.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -28,7 +28,7 @@ for which a new license (GPL+exception) is in place. - #include "selection.h" - #include "vgradient.h" - --#include <poppler/goo/gtypes.h> -+#include <poppler/goo/gfile.h> - #include <poppler/Object.h> - #include <poppler/OutputDev.h> - #include <poppler/Gfx.h> diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index f8bd244e039..32758b462f7 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -4,20 +4,18 @@ podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); - revision = "22805"; + revision = "22806"; in stdenv.mkDerivation rec { name = "scribus-unstable-${version}"; - version = "2019-01-14"; + version = "2019-01-16"; src = fetchsvn { url = "svn://scribus.net/trunk/Scribus"; rev = revision; - sha256 = "18xqhxjm8dl4w3izg7202i8vicfggkcvi0p9ii28k43b5ps1akg1"; + sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0"; }; - patches = [ ./poppler-0.73.0.patch ]; - enableParallelBuilding = true; buildInputs = [ |