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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/development/libraries/poppler/default.nix
This commit is contained in:
Eelco Dolstra
2014-10-16 15:16:50 +02:00
parent 3c6efec2c0 e39bf7a704
commit 09dc132e04
826 changed files with 8930 additions and 7226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/typesetting/tex/texlive/beamer.nix
View File

@@ -20,6 +20,6 @@ rec {
meta = {
description = "Extra components for TeXLive: beamer class";
maintainers = [ stdenv.lib.maintainers.mornfall ];
maintainers = [ stdenv.lib.maintainers.mornfall stdenv.lib.maintainers.jwiegley ];
};
}

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

@@ -1,20 +1,20 @@
args : with args;
rec {
src = fetchurl {
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140528.34243.orig.tar.xz;
sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s";
url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz;
sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3";
};
texmfVersion = "2014.20140821";
texmfVersion = "2014.20140927";
texmfSrc = fetchurl {
url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz";
sha256 = "02qkzlhb381sybs970fgpc94nhx4jm0l3j5pv8z48l11415lvm9b";
sha256 = "1g4nzr9rgmw8i0i82svmkwjy2kvbyrc8jgnk2f3cl2wsx7sfrydy";
};
langTexmfVersion = "2014.20140821";
langTexmfVersion = "2014.20140927";
langTexmfSrc = fetchurl {
url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz";
sha256 = "075avhhhhzw5pbd19q659rn23rws15b5hv7nv0grd93vn3vfwdcy";
sha256 = "1ckm8yra96m44n708dc1kgq4xrzi7ginxpsb73ijbwzbjy1yqzwg";
};
passthru = { inherit texmfSrc langTexmfSrc; };
@@ -115,7 +115,8 @@ rec {
buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11 libICE xproto
freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext
xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig
poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace ]
poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace gmp mpfr
xpdf ]
++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ]
;
@@ -145,7 +146,7 @@ rec {
description = "A TeX distribution";
homepage = http://www.tug.org/texlive;
license = stdenv.lib.licenses.gpl2;
maintainers = with maintainers; [ lovek323 raskin ];
maintainers = with maintainers; [ lovek323 raskin jwiegley ];
platforms = platforms.unix;
};
}

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

@@ -1,11 +1,11 @@
args: with args;
rec {
name = "texlive-extra-2014";
version = "2014.20140821";
version = "2014.20140927";
src = fetchurl {
url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz";
sha256 = "1y3w8bgp85s90ng2y5dw9chrrvvdf7ibb6ynss8kycvgc0y4m6b3";
sha256 = "0chbl20dh61ld7nq9aiay7hi371l6285c2caqz18br29ifh8jicd";
};
buildInputs = [texLive xz];
@@ -18,7 +18,7 @@ rec {
meta = {
description = "Extra components for TeXLive";
maintainers = [ args.lib.maintainers.raskin ];
maintainers = [ args.lib.maintainers.raskin args.lib.maintainers.jwiegley ];
# Actually, arch-independent..
hydraPlatforms = [];

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

@@ -6,7 +6,7 @@ stdenv.mkDerivation {
name = "xmlroff-0.3.98";
src = fetchurl {
url = mirror://sourceforge/xmlroff/xmlroff-0.3.98.tar.gz;
md5 = "6c1d05b6480e98870751bf9102ea68e2";
sha256 = "0pg7zc8ri0xzmdk30vnyd84wy8yn973h1bnrvibv71q44s6xhwp2";
};
buildInputs = [