diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/office/libreoffice/src-fresh')
3 files changed, 13 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix index 98070994fa33..bbabd4e70be5 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -161,11 +161,11 @@ md5name = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a-libetonyek-0.1.9.tar.xz"; } { - name = "expat-2.2.8.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/expat-2.2.8.tar.bz2"; - sha256 = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102"; + name = "expat-2.4.1.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/expat-2.4.1.tar.bz2"; + sha256 = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40"; md5 = ""; - md5name = "9a130948b05a82da34e4171d5f5ae5d321d9630277af02c8fa51e431f6475102-expat-2.2.8.tar.bz2"; + md5name = "2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40-expat-2.4.1.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; @@ -567,11 +567,11 @@ md5name = "2d84360b03042178def1d9ff538acacaed2b3a27411db7b2874f1612ed71abc8-xmlsec1-1.2.30.tar.gz"; } { - name = "libxml2-2.9.10.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.9.10.tar.gz"; - sha256 = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"; + name = "libxml2-2.9.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.9.12.tar.gz"; + sha256 = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"; md5 = ""; - md5name = "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f-libxml2-2.9.10.tar.gz"; + md5name = "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92-libxml2-2.9.12.tar.gz"; } { name = "libxslt-1.1.34.tar.gz"; diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix index 0141b74c3890..193b2cd76398 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix @@ -7,4 +7,5 @@ attrs: configureFlags = attrs.configureFlags ++ [ (lib.enableFeature kdeIntegration "kf5") ]; + patches = [ ../xdg-open-brief.patch ]; # drop this when switching fresh to 7.2.0 } diff --git a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 2e1a4b1d78dc..dfc680e3439b 100644 --- a/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "4"; + patch = "5"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"; + sha256 = "1kl54ddpvmrcs4r1vd4dfzg5a8im0kijhaqdg37zvgb5fqv31bxf"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7"; + sha256 = "0nf5s012l7mkpd1srvijl9q6x8f7svm6i84bj75dwyvipkg40rxq"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q"; + sha256 = "1m1hxbhrkaynpcps77rym1d0kwl380jv1p7b6ibfl4by0ii2j16a"; }; } |