diff --git a/pkgs/tools/typesetting/tex/texlive/pgf.nix b/pkgs/tools/typesetting/tex/texlive/pgf.nix deleted file mode 100644 index b46229e9828..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/pgf.nix +++ /dev/null @@ -1,41 +0,0 @@ -args: with args; - - -rec { - name = "texlive-pgf-2010"; - - src = fetchurl { - url = "mirror://debian/pool/main/p/pgf/pgf_2.10.orig.tar.gz"; - sha256 = "642092e6b49df9e33bd901ac7eb7024ff235a29f43d27e78e5827ca3bc03f120"; - }; - - propagatedBuildInputs = [texLiveLatexXColor texLive]; - - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/share/ - mkdir -p $out/texmf-dist/tex/generic/pgf - cp -r * $out/texmf-dist/tex/generic/pgf - ln -s $out/texmf* $out/share/ - '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - - meta = { - description = "Extra components for TeXLive: graphics package"; - - longDescription = '' - PGF is a macro package for creating graphics. It is platform- - and format-independent and works together with the most - important TeX backend drivers, including pdftex and dvips. It - comes with a user-friedly syntax layer called TikZ. - - Its usage is similar to pstricks and the standard picture - environment. PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and - ConTeXt. Unlike pstricks , it can produce either PostScript or - PDF output. - ''; - - license = [ "GPLv2" "LPPLv1.3c" ]; - - homepage = http://tug.ctan.org/tex-archive/graphics/pgf/; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdf86837e35..247e5db8546 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14152,9 +14152,7 @@ let inherit texLive; }; - texLivePGF = builderDefsPackage (import ../tools/typesetting/tex/texlive/pgf.nix) { - inherit texLiveLatexXColor texLive; - }; + texLivePGF = pgf3; texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) { inherit texLiveLatexXColor texLivePGF texLive;