libreoffice-still: 5.4.5.1 -> 5.4.6.2; use poppler_0_61

This commit is contained in:
Michael Raskin 2018-03-23 10:22:53 +01:00
parent e9817b2a76
commit ca4d81d2c7
3 changed files with 6 additions and 5 deletions

View file

@ -3,8 +3,8 @@
rec { rec {
major = "5"; major = "5";
minor = "4"; minor = "4";
patch = "5"; patch = "6";
tweak = "1"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
@ -12,6 +12,6 @@ rec {
src = fetchurl { src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "167bh6jgyhfcvn3g7xghkg4nb99h91diypdlry5df21xs8bis5gb"; sha256 = "0icd8h221gp2dsbn6d35flwhqhcfpx66cjc5dg8yifhhvrfam74i";
}; };
} }

View file

@ -42,14 +42,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0max423hdlr4j6y6ymng15awilh2aq8gly1hsf16lnk1pxihgr54"; sha256 = "16g85bn6qkql81a0k9iv3nwrpg2kpvz5nk4r7lab5jzlcl20qplc";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "14ziy02qq092x8h29f9dlwvvk2scd5v385zhln4848lf3q5cnifl"; sha256 = "02382d09svcgmp5q2xglhbx1na9ycd77f5cbcj9jgs8lpkgwbxxc";
}; };
}; };

View file

@ -16451,6 +16451,7 @@ with pkgs;
inherit (gnome3) defaultIconTheme; inherit (gnome3) defaultIconTheme;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
bluez5 = bluez5_28; bluez5 = bluez5_28;
poppler = poppler_0_61;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [
freefont_ttf xorg.fontmiscmisc freefont_ttf xorg.fontmiscmisc