diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-06-18 15:03:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 15:03:38 +0000 |
| commit | 934650efe3ecdc1373366c25a5f34b0ec508a6ab (patch) | |
| tree | 5ef1633422f070b924068f0e4a5c4166544f9664 /pkgs/applications | |
| parent | b5d6a4908537a10388257c3449b826f16dc0eef2 (diff) | |
| parent | 6e9808e4f172f6620f5c3f4604c073b6c21cfff3 (diff) | |
| download | nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.tar nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.tar.gz nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.tar.bz2 nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.tar.lz nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.tar.xz nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.tar.zst nixlib-934650efe3ecdc1373366c25a5f34b0ec508a6ab.zip | |
Merge pull request #42156 from jokogr/u/libreoffice-fresh-6.0.4.2
libreoffice-fresh: 6.0.3.2 -> 6.0.4.2 and don't use system xmlsec
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/office/libreoffice/default-primary-src.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 436558283e05..ded099632460 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "0"; - patch = "3"; + patch = "4"; 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 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j"; + sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8897c87bd3c..1d309fae9af7 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, defaultIconTheme, glib, ncurses, xmlsec, epoxy, gpgme +, defaultIconTheme, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" ] , withHelp ? true , kdeIntegration ? false @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la"; + sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686"; + sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f"; }; }; @@ -241,6 +241,7 @@ in stdenv.mkDerivation rec { "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" + "--without-system-xmlsec" ]; checkPhase = '' @@ -261,7 +262,7 @@ in stdenv.mkDerivation rec { python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux - librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy + librevenge libe-book libmwaw glm glew ncurses epoxy libodfgen CoinMP librdf_rasqal defaultIconTheme gettext gdb ] |