about summary refs log tree commit diff
path: root/pkgs/tools/typesetting
diff options
context:
space:
mode:
authorJustin Bedo <cu@cua0.org>2014-08-01 10:19:00 +1000
committerJustin Bedo <cu@cua0.org>2014-08-01 10:19:00 +1000
commitbefd1289ac91486971d0338053f99419e639b1ca (patch)
tree27ef50b740e0ea64d0cfd7ffe54e8c1328331fa1 /pkgs/tools/typesetting
parentb525d6085fa93fac9ea8836ac193ac8c67d5a486 (diff)
downloadnixlib-befd1289ac91486971d0338053f99419e639b1ca.tar
nixlib-befd1289ac91486971d0338053f99419e639b1ca.tar.gz
nixlib-befd1289ac91486971d0338053f99419e639b1ca.tar.bz2
nixlib-befd1289ac91486971d0338053f99419e639b1ca.tar.lz
nixlib-befd1289ac91486971d0338053f99419e639b1ca.tar.xz
nixlib-befd1289ac91486971d0338053f99419e639b1ca.tar.zst
nixlib-befd1289ac91486971d0338053f99419e639b1ca.zip
Updated texlive to latest release
Diffstat (limited to 'pkgs/tools/typesetting')
-rw-r--r--pkgs/tools/typesetting/tex/texlive/default.nix10
-rw-r--r--pkgs/tools/typesetting/tex/texlive/extra.nix6
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 94d84fec4cee..b5589cf943b3 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -5,16 +5,16 @@ rec {
     sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
   };
 
-  texmfVersion = "2014.20140626";
+  texmfVersion = "2014.20140717";
   texmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
-    sha256 = "1zimavr8nid6425i2k3i34a7xl45lskvsnp55q526i8y6f3zlw3g";
+    sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9";
   };
 
-  langTexmfVersion = "2014.20140626";
+  langTexmfVersion = "2014.20140717";
   langTexmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
-    sha256 = "0gwms9jj8x2hp8fbqx420lvzccx3s6wlif7afp176y7ja9i3s17r";
+    sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
@@ -120,7 +120,7 @@ rec {
 
   configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt"
     "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib"
-    "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" 
+    "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2"
     "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ]
     ++ stdenv.lib.optionals stdenv.isDarwin [
       # TODO: We should be able to fix these tests
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index be280c5f4836..4644ee3e50ec 100644
--- a/pkgs/tools/typesetting/tex/texlive/extra.nix
+++ b/pkgs/tools/typesetting/tex/texlive/extra.nix
@@ -1,11 +1,11 @@
 args: with args;
 rec {
   name    = "texlive-extra-2014";
-  version = "2014.20140626";
+  version = "2014.20140717";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
-    sha256 = "1n7n2vssdspzg95qrikl4p8cr6axdpj6bgv2l61px7vp837ma83v";
+    sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q";
   };
 
   buildInputs = [texLive xz];
@@ -20,7 +20,7 @@ rec {
     description = "Extra components for TeXLive";
     maintainers = [ args.lib.maintainers.raskin ];
 
-    # Actually, arch-independent.. 
+    # Actually, arch-independent..
     hydraPlatforms = [];
   };
 }