alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

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

Browse source
This commit is contained in:
Michael Raskin 2016-04-13 21:07:39 +02:00
parent 1e37217b80
commit b338187e71
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/office/libreoffice/default.nix
View file

@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, 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" ]
, withHelp ? true
, kdeIntegration ? false
@ -23,8 +23,8 @@ let
langsSpaces = lib.concatStringsSep " " langs;
major = "5";
minor = "1";
patch = "0";
tweak = "3";
patch = "2";
tweak = "2";
subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@ -50,14 +50,14 @@ let
translations = fetchSrc {
name = "translations";
sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px";
sha256 = "1w2m4hfrxb706p8bjfgklqv0j5hnivbvif3vav7sbngp5ms0vgvz";
};
# TODO: dictionaries
help = fetchSrc {
name = "help";
sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2";
sha256 = "0lr90z5fdg157lcid5w4p0zxi72c4xziiw51kh38kbbqrbb9ykfw";
};
};
@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
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
@ -240,7 +240,7 @@ in stdenv.mkDerivation rec {
python3 sablotron sane-backends tcsh unzip vigra which zip zlib
mdds bluez5 glibc libcmis libwps libabw
libxshmfence libatomic_ops graphite2 harfbuzz
librevenge libe-book libmwaw glm glew
librevenge libe-book libmwaw glm glew ncurses
libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
]
++ lib.optional kdeIntegration kde4.kdelibs;

20
pkgs/applications/office/libreoffice/libreoffice-srcs.nix
View file

@ -190,8 +190,8 @@
brief = false;
}
{
name = "graphite2-minimal-1.3.4.tgz";
md5 = "5c0c9ac0996fbb4a0e17780ff5441959";
name = "graphite-minimal-1.3.6.tgz";
md5 = "17df8301bcc459e83f8a8f3aca6183b2";
brief = false;
}
{
@ -285,8 +285,8 @@
brief = true;
}
{
name = "language-subtag-registry-2015-08-04.tar.bz2";
md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
name = "language-subtag-registry-2016-02-10.tar.bz2";
md5 = "d1e7c55a0383f7d720d3ead0b6117284";
brief = true;
}
{
@ -376,13 +376,13 @@
brief = false;
}
{
name = "neon-0.29.5.tar.gz";
md5 = "ff369e69ef0f0143beb5626164e87ae2";
name = "neon-0.30.1.tar.gz";
md5 = "231adebe5c2f78fded3e3df6e958878e";
brief = false;
}
{
name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
md5 = "478e0e90ebc4a90159549e77021021fd";
name = "nss-3.22.2-with-nspr-4.12.tar.gz";
md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7";
brief = false;
}
{
@ -401,8 +401,8 @@
brief = false;
}
{
name = "openssl-1.0.2a.tar.gz";
md5 = "a06c547dac9044161a477211049f60ef";
name = "openssl-1.0.2g.tar.gz";
md5 = "f3c710c045cdee5fd114feb69feba7aa";
brief = true;
}
{