Skip to content

libreoffice-fresh: 6.0.3.2 -> 6.0.4.2 and don't use system xmlsec #42156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
7c6f434c merged 2 commits into from
Jun 18, 2018
Merged

libreoffice-fresh: 6.0.3.2 -> 6.0.4.2 and don't use system xmlsec #42156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa9674d
libreoffice-fresh: 6.0.3.2 -> 6.0.4.2
jokogr Jun 3, 2018
6e9808e
libreoffice: disable system xmlsec
jokogr Jun 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/office/libreoffice/default-primary-src.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
rec {
major = "6";
minor = "0";
patch = "3";
patch = "4";
tweak = "2";

subdir = "${major}.${minor}.${patch}";
Expand All @@ -12,6 +12,6 @@ rec {

src = fetchurl {
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j";
sha256 = "1xqh4l1nrvgara4ni9zk8pqywz3gbq4a8sw9v0ggxsch409zp0ch";
};
}
9 changes: 5 additions & 4 deletions pkgs/applications/office/libreoffice/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -42,14 +42,14 @@ let

translations = fetchSrc {
name = "translations";
sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la";
sha256 = "0bjl3hdckd5bcgskh46xqna1hpxjjx0ycgpnilyk7j8l6407hpw6";
};

# TODO: dictionaries

help = fetchSrc {
name = "help";
sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686";
sha256 = "1z21bk5lwd5gxsyjdwh0fmgkys4lhnx7flbjd6dbn9d99paz1w6f";
};

};
Expand Down Expand Up @@ -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 = ''
Expand All @@ -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
]
Expand Down