public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Luca Bruno
2014-11-10 10:03:52 +01:00
parent 4030ab3ba4 9e3137ddf0
commit 6af0d6974f
96 changed files with 1773 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/typesetting/rubber/default.nix
View File

@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
patchPhase = "substituteInPlace configure --replace which \"type -P\"";
postInstall = "rm $out/share/rubber/modules/etex.rub";
meta = {
description = "Wrapper for LaTeX and friends";

8
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@@ -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; };

4
pkgs/tools/typesetting/tex/texlive/extra.nix
View File

@@ -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];