mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00
Code Issues Wiki Activity

Update LibreOffice to 4.4.2.2

Browse source
This commit is contained in:
Michael Raskin 2015-04-05 00:49:25 +03:00
parent 7d80aed6e2
commit 07ba92e794
2 changed files with 5 additions and 5 deletions
pkgs
applications/office/libreoffice
default.nix
top-level
all-packages.nix

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

@ -24,7 +24,7 @@ let
langsSpaces = stdenv.lib.concatStringsSep " " langs; langsSpaces = stdenv.lib.concatStringsSep " " langs;
major = "4"; major = "4";
minor = "4"; minor = "4";
patch = "1"; patch = "2";
tweak = "2"; tweak = "2";
subdir = "${major}.${minor}.${patch}"; subdir = "${major}.${minor}.${patch}";
version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@ -80,14 +80,14 @@ let
translations = fetchSrc { translations = fetchSrc {
name = "translations"; name = "translations";
sha256 = "0a1p9jd9lgb1mxnj4c55yrlc7q2dsm5s9cyax6cwaya2q5m5xhnk"; sha256 = "0m1a09vzgh5mz0dgx2ji3fwmsqr7xymr0hhrrhf75nd1dr0blv2s";
}; };
# TODO: dictionaries # TODO: dictionaries
help = fetchSrc { help = fetchSrc {
name = "help"; name = "help";
sha256 = "042xp6xz3gb75k332xclwfjyik63zgcw5135967nclim1sl8rgh7"; sha256 = "06i2c143dpqm4w1a9nba0gn1ayrvrhdrcm2kydzapvljgljqswkh";
}; };
}; };
@ -97,7 +97,7 @@ 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 = "0pa7gf29sgsl6kxs7j1x1zl4ycv682wrj1dg22qc0kb7aijhpm2f"; sha256 = "0dif783zbh9qb4636mm055clwwsv8j6pmb8msi9lr183drnaw73x";
}; };
# Openoffice will open libcups dynamically, so we link it directly # Openoffice will open libcups dynamically, so we link it directly

2
pkgs/top-level/all-packages.nix
View file

@ -11062,6 +11062,7 @@ let
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
boost = boost155; boost = boost155;
glm = glm_0954; glm = glm_0954;
bluez5 = bluez5_28;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {
fontDirectories = [ fontDirectories = [
freefont_ttf xorg.fontmiscmisc xorg.fontbhttf freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
@ -11072,7 +11073,6 @@ let
harfbuzz = harfbuzz.override { harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = true; withIcu = true; withGraphite2 = true;
}; };
bluez5 = bluez5_28;
}; };
liferea = callPackage ../applications/networking/newsreaders/liferea { liferea = callPackage ../applications/networking/newsreaders/liferea {