diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/tools/typesetting/tex | |
parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/tools/typesetting/tex')
-rw-r--r-- | nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix | 3 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix | 21 |
2 files changed, 15 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix index 5444914f7a4e..2513d48796e1 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/auctex/default.nix @@ -2,7 +2,6 @@ let auctex = stdenv.mkDerivation ( rec { version = "12.1"; - name = "${pname}-${version}"; # Make this a valid tex(live-new) package; # the pkgs attribute is provided with a hack below. @@ -13,7 +12,7 @@ let auctex = stdenv.mkDerivation ( rec { outputs = [ "out" "tex" ]; src = fetchurl { - url = "mirror://gnu/${pname}/${name}.tar.gz"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; sha256 = "1d2x59jw42hr81fma195bniqyhvp5ig5q0xmywbkcy59f16wlp69"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 57347a120214..c27c68741fc7 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -91,7 +91,8 @@ texliveYear = year; core = stdenv.mkDerivation rec { - name = "texlive-bin-${version}"; + pname = "texlive-bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -183,7 +184,8 @@ core = stdenv.mkDerivation rec { inherit (core-big) metafont metapost luatex xetex; core-big = stdenv.mkDerivation { #TODO: upmendex - name = "texlive-core-big.bin-${version}"; + pname = "texlive-core-big.bin"; + inherit version; inherit (common) src patches postPatch preAutoreconf postAutoreconf; @@ -246,7 +248,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex dvisvgm = stdenv.mkDerivation { - name = "texlive-dvisvgm.bin-${version}"; + pname = "texlive-dvisvgm.bin"; + inherit version; inherit (common) src; @@ -263,7 +266,8 @@ dvisvgm = stdenv.mkDerivation { dvipng = stdenv.mkDerivation { - name = "texlive-dvipng.bin-${version}"; + pname = "texlive-dvipng.bin"; + inherit version; inherit (common) src; @@ -318,7 +322,8 @@ latexindent = perlPackages.buildPerlPackage rec { inherit biber; bibtexu = bibtex8; bibtex8 = stdenv.mkDerivation { - name = "texlive-bibtex-x.bin-${version}"; + pname = "texlive-bibtex-x.bin"; + inherit version; inherit (common) src; @@ -335,7 +340,8 @@ bibtex8 = stdenv.mkDerivation { xdvi = stdenv.mkDerivation { - name = "texlive-xdvi.bin-${version}"; + pname = "texlive-xdvi.bin"; + inherit version; inherit (common) src; @@ -363,7 +369,8 @@ xdvi = stdenv.mkDerivation { { xindy = stdenv.mkDerivation { - name = "texlive-xindy.bin-${version}"; + pname = "texlive-xindy.bin"; + inherit version; inherit (common) src; |