forked from mirrors/nixpkgs
libreoffice: 5.1.0.3 -> 5.1.2.2; still building, but the previous version in master was broken anyway and these problems are now fixed
This commit is contained in:
parent
1e37217b80
commit
b338187e71
pkgs/applications/office/libreoffice
|
@ -12,7 +12,7 @@
|
||||||
, libatomic_ops, graphite2, harfbuzz, libodfgen
|
, libatomic_ops, graphite2, harfbuzz, libodfgen
|
||||||
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
|
||||||
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
|
, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
|
||||||
, defaultIconTheme, glib
|
, defaultIconTheme, glib, ncurses
|
||||||
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
|
, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
|
||||||
, withHelp ? true
|
, withHelp ? true
|
||||||
, kdeIntegration ? false
|
, kdeIntegration ? false
|
||||||
|
@ -23,8 +23,8 @@ let
|
||||||
langsSpaces = lib.concatStringsSep " " langs;
|
langsSpaces = lib.concatStringsSep " " langs;
|
||||||
major = "5";
|
major = "5";
|
||||||
minor = "1";
|
minor = "1";
|
||||||
patch = "0";
|
patch = "2";
|
||||||
tweak = "3";
|
tweak = "2";
|
||||||
subdir = "${major}.${minor}.${patch}";
|
subdir = "${major}.${minor}.${patch}";
|
||||||
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
|
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
|
||||||
|
|
||||||
|
@ -50,14 +50,14 @@ let
|
||||||
|
|
||||||
translations = fetchSrc {
|
translations = fetchSrc {
|
||||||
name = "translations";
|
name = "translations";
|
||||||
sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px";
|
sha256 = "1w2m4hfrxb706p8bjfgklqv0j5hnivbvif3vav7sbngp5ms0vgvz";
|
||||||
};
|
};
|
||||||
|
|
||||||
# TODO: dictionaries
|
# TODO: dictionaries
|
||||||
|
|
||||||
help = fetchSrc {
|
help = fetchSrc {
|
||||||
name = "help";
|
name = "help";
|
||||||
sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2";
|
sha256 = "0lr90z5fdg157lcid5w4p0zxi72c4xziiw51kh38kbbqrbb9ykfw";
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||||
sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl";
|
sha256 = "108p8jg22lg3g9wypqv5d71j4vkcpmg2x2w9l2v4z9h10agdrv2l";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Openoffice will open libcups dynamically, so we link it directly
|
# Openoffice will open libcups dynamically, so we link it directly
|
||||||
|
@ -240,7 +240,7 @@ in stdenv.mkDerivation rec {
|
||||||
python3 sablotron sane-backends tcsh unzip vigra which zip zlib
|
python3 sablotron sane-backends tcsh unzip vigra which zip zlib
|
||||||
mdds bluez5 glibc libcmis libwps libabw
|
mdds bluez5 glibc libcmis libwps libabw
|
||||||
libxshmfence libatomic_ops graphite2 harfbuzz
|
libxshmfence libatomic_ops graphite2 harfbuzz
|
||||||
librevenge libe-book libmwaw glm glew
|
librevenge libe-book libmwaw glm glew ncurses
|
||||||
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
|
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
|
||||||
]
|
]
|
||||||
++ lib.optional kdeIntegration kde4.kdelibs;
|
++ lib.optional kdeIntegration kde4.kdelibs;
|
||||||
|
|
|
@ -190,8 +190,8 @@
|
||||||
brief = false;
|
brief = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "graphite2-minimal-1.3.4.tgz";
|
name = "graphite-minimal-1.3.6.tgz";
|
||||||
md5 = "5c0c9ac0996fbb4a0e17780ff5441959";
|
md5 = "17df8301bcc459e83f8a8f3aca6183b2";
|
||||||
brief = false;
|
brief = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -285,8 +285,8 @@
|
||||||
brief = true;
|
brief = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "language-subtag-registry-2015-08-04.tar.bz2";
|
name = "language-subtag-registry-2016-02-10.tar.bz2";
|
||||||
md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
|
md5 = "d1e7c55a0383f7d720d3ead0b6117284";
|
||||||
brief = true;
|
brief = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -376,13 +376,13 @@
|
||||||
brief = false;
|
brief = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "neon-0.29.5.tar.gz";
|
name = "neon-0.30.1.tar.gz";
|
||||||
md5 = "ff369e69ef0f0143beb5626164e87ae2";
|
md5 = "231adebe5c2f78fded3e3df6e958878e";
|
||||||
brief = false;
|
brief = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
|
name = "nss-3.22.2-with-nspr-4.12.tar.gz";
|
||||||
md5 = "478e0e90ebc4a90159549e77021021fd";
|
md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7";
|
||||||
brief = false;
|
brief = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -401,8 +401,8 @@
|
||||||
brief = false;
|
brief = false;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
name = "openssl-1.0.2a.tar.gz";
|
name = "openssl-1.0.2g.tar.gz";
|
||||||
md5 = "a06c547dac9044161a477211049f60ef";
|
md5 = "f3c710c045cdee5fd114feb69feba7aa";
|
||||||
brief = true;
|
brief = true;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue