about summary refs log tree commit diff
path: root/pkgs/tools/typesetting/tex
diff options
context:
space:
mode:
authorLuca Bruno <lucabru@src.gnome.org>2014-11-10 10:03:52 +0100
committerLuca Bruno <lucabru@src.gnome.org>2014-11-10 10:03:52 +0100
commit6af0d6974fbbf60c9e43d5bd563e4df0570a61b2 (patch)
tree62b8785527061f9b872682c6746d9017aea8e448 /pkgs/tools/typesetting/tex
parent4030ab3ba4988cc96d22f6bf6963cf3727aa2e41 (diff)
parent9e3137ddf069218f875b385eef27d00d7c0597e1 (diff)
downloadnixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar
nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.gz
nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.bz2
nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.lz
nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.xz
nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.tar.zst
nixlib-6af0d6974fbbf60c9e43d5bd563e4df0570a61b2.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/typesetting/tex')
-rw-r--r--pkgs/tools/typesetting/tex/texlive/default.nix8
-rw-r--r--pkgs/tools/typesetting/tex/texlive/extra.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 7179c3538615..b21c937e785f 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -5,16 +5,16 @@ rec {
     sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
   };
 
-  texmfVersion = "2014.20140927";
+  texmfVersion = "2014.20141024";
   texmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
-    sha256 = "1g4nzr9rgmw8i0i82svmkwjy2kvbyrc8jgnk2f3cl2wsx7sfrydy";
+    sha256 = "1a6968myfi81s76n9p1qljgpwia9mi55pkkz1q6lbnwybf97akj1";
   };
 
-  langTexmfVersion = "2014.20140927";
+  langTexmfVersion = "2014.20141024";
   langTexmfSrc = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
-    sha256 = "1ckm8yra96m44n708dc1kgq4xrzi7ginxpsb73ijbwzbjy1yqzwg";
+    sha256 = "1ydz5m1v40n34g1l31r3vqg74rbr01x2f80drhz4igh21fm7zzpa";
   };
 
   passthru = { inherit texmfSrc langTexmfSrc; };
diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix
index 2c19783beb7c..59c3389d750b 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.20140927";
+  version = "2014.20141024";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
-    sha256 = "0chbl20dh61ld7nq9aiay7hi371l6285c2caqz18br29ifh8jicd";
+    sha256 = "190p5v6madcgkxjmfal0pcylfz88zi6yaixky0vrcz1kbvxqlcb9";
   };
 
   buildInputs = [texLive xz];