libreoffice-fresh: 6.0.2.1 -> 6.0.3.2

wip/yesman
Michael Raskin 6 years ago
parent 3228dcdd3d
commit 1cb0cfba01
  1. 6
      pkgs/applications/office/libreoffice/default-primary-src.nix
  2. 6
      pkgs/applications/office/libreoffice/default.nix
  3. 16
      pkgs/applications/office/libreoffice/libreoffice-srcs.nix

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

@ -42,14 +42,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl";
sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a";
sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686";
};
};
@ -184,7 +184,7 @@ in stdenv.mkDerivation rec {
done
cp -r sysui/desktop/icons "$out/share"
sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
'';
configureFlags = [

@ -532,11 +532,11 @@
md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz";
}
{
name = "libxml2-2.9.7.tar.gz";
url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz";
sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c";
name = "libxml2-2.9.8.tar.gz";
url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz";
sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732";
md5 = "";
md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz";
md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz";
}
{
name = "libxslt-1.1.32.tar.gz";
@ -651,11 +651,11 @@
md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
}
{
name = "liborcus-0.13.1.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz";
sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937";
name = "liborcus-0.13.3.tar.gz";
url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz";
sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9";
md5 = "";
md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz";
md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz";
}
{
name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";

Loading…
Cancel
Save