summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2016-09-12 12:45:38 +0200
committerMichael Raskin <7c6f434c@mail.ru>2016-09-12 12:58:30 +0200
commit357d544d232f7143c914b02be4f4a4f4b5abd5a3 (patch)
tree5c8f9e4fc6928ec0308550fddb519b3ebd2a85bd
parent242cea8a6353f22d5c06127eaf858cf07c14fa7d (diff)
downloadnixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.tar
nixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.tar.gz
nixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.tar.bz2
nixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.tar.lz
nixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.tar.xz
nixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.tar.zst
nixpkgs-357d544d232f7143c914b02be4f4a4f4b5abd5a3.zip
libreoffice-fresh: 5.2.0.4 -> 5.2.1.2
-rw-r--r--pkgs/applications/office/libreoffice/default.nix10
-rw-r--r--pkgs/applications/office/libreoffice/libreoffice-srcs.nix12
2 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index caf500d2b97..9cd1389ab0a 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -23,8 +23,8 @@ let
   langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
   minor = "2";
-  patch = "0";
-  tweak = "4";
+  patch = "1";
+  tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -50,14 +50,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0a3dnqm9k1skp7jvg354fdn84y0ylvnjzpd4v2r2mbz8vc4p3ld5";
+      sha256 = "1ahdz1ynbab001441lqqlfphysr867rjcndq93z66mr5v3r1spvm";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "1gyakwbbsd3aykf0gsanyg6p4g4qixj1rh6qxspln70afl3kxm90";
+      sha256 = "0mln1mqy3c7k4c449w5knjnc4dv0ckl0i7q47p2pldxjjf5n2887";
     };
 
   };
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1v3bbk2afq61gs3l4qvc1r6y0ylr21jzbm3wcnyq9c3bbyw43pj7";
+    sha256 = "14g2xwpid4vsgmc69rs7hz1wx96dfkq0cbm32vjgljsm7a19qfc1";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 219b7e20632..5240edcf5d1 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -290,8 +290,8 @@
   brief = true;
 }
 {
-  name = "language-subtag-registry-2016-02-10.tar.bz2";
-  md5 = "d1e7c55a0383f7d720d3ead0b6117284";
+  name = "language-subtag-registry-2016-07-19.tar.bz2";
+  md5 = "8a037dc60b16bf8c5fe871b33390a4a2";
   brief = true;
 }
 {
@@ -436,13 +436,13 @@
   brief = false;
 }
 {
-  name = "libpng-1.6.19.tar.gz";
-  md5 = "3121bdc77c365a87e054b9f859f421fe";
+  name = "libpng-1.6.24.tar.gz";
+  md5 = "65213080dd30a9b16193d9b83adc1ee9";
   brief = true;
 }
 {
-  name = "poppler-0.26.4.tar.gz";
-  md5 = "35c0660065d023365e9854c13e289d12";
+  name = "poppler-0.46.0.tar.bz2";
+  md5 = "38c758d84437378ec4f5aae9f875301d";
   brief = true;
 }
 {