From c39818d3dcaf326839150f736e445675da3357b8 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 9 Aug 2019 17:28:49 +0200 Subject: [PATCH] scribusUnstable: 2019-01-16 -> 1.5.5 changelog: https://bugs.scribus.net/changelog_page.php?version_id=106 Co-Authored-By: worldofpeace --- pkgs/applications/office/scribus/unstable.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index eb2bebb39934..2cd441794a46 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchsvn, wrapQtAppsHook, pkgconfig, cmake, qtbase, cairo, pixman, +{ stdenv, fetchurl, mkDerivation, pkgconfig, cmake, qtbase, cairo, pixman, boost, cups, fontconfig, freetype, hunspell, libjpeg, libtiff, libxml2, lcms2, podofo, poppler, poppler_data, python2, harfbuzz, qtimageformats, qttools }: let pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); - revision = "22806"; in -stdenv.mkDerivation rec { - name = "scribus-unstable-${version}"; - version = "2019-01-16"; +mkDerivation rec { + pname = "scribus"; + version = "1.5.5"; - src = fetchsvn { - url = "svn://scribus.net/trunk/Scribus"; - rev = revision; - sha256 = "16xpsbp6kca78jf48n6zdmyjras38xr11paan839hgy4ik83ncn0"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; + sha256 = "eQiyGmzoQyafWM7fX495GJMlfmIBzOX73ccNrKL+P3E="; }; enableParallelBuilding = true; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ pkgconfig cmake ]; buildInputs = [ - pkgconfig cmake qtbase cairo pixman boost cups fontconfig + qtbase cairo pixman boost cups fontconfig freetype hunspell libjpeg libtiff libxml2 lcms2 podofo poppler poppler_data pythonEnv harfbuzz qtimageformats qttools ];