diff options
31 files changed, 113 insertions, 75 deletions
diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/tools/text/catdocx/default.nix index adf78397fcb3..c762e15c80e2 100644 --- a/pkgs/tools/text/catdocx/default.nix +++ b/pkgs/tools/text/catdocx/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, unzip, catdoc }: stdenv.mkDerivation { - name = "catdocx-20170102"; + pname = "catdocx"; + version = "unstable-2017-01-02"; src = fetchFromGitHub { owner = "jncraton"; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 18dc01c01d02..4225934d2d4e 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchzip, libtommath}: -stdenv.mkDerivation { - name = "convertlit-1.8"; +stdenv.mkDerivation rec { + pname = "convertlit"; + version = "1.8"; src = fetchzip { - url = "http://www.convertlit.com/convertlit18src.zip"; + url = "http://www.convertlit.com/convertlit${lib.replaceStrings ["."] [""] version}src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index c8ff1e973a50..3e156cf3132d 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -1,12 +1,13 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.64"; + pname = "diffstat"; + version = "1.64"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" - "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" + "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; }; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index bb93b217ea24..1a46110e2a42 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { - name = "ebook-tools-0.2.2"; + pname = "ebook-tools"; + version = "0.2.2"; src = fetchurl { - url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/ebook-tools-${version}.tar.gz"; sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index ae92f3ba9d9a..fff3e44baf69 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "html2text-1.3.2a"; +stdenv.mkDerivation rec { + pname = "html2text"; + version = "1.3.2a"; src = fetchurl { - url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; + url = "http://www.mbayer.de/html2text/downloads/html2text-${version}.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; diff --git a/pkgs/tools/text/kakasi/default.nix b/pkgs/tools/text/kakasi/default.nix index 609b8aff9b56..d2cf1f701ee9 100644 --- a/pkgs/tools/text/kakasi/default.nix +++ b/pkgs/tools/text/kakasi/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "kakasi-2.3.6"; + pname = "kakasi"; + version = "2.3.6"; buildInputs = lib.optional stdenv.isDarwin [ libiconv ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://kakasi.namazu.org/stable/${name}.tar.xz"; + url = "http://kakasi.namazu.org/stable/kakasi-${version}.tar.xz"; sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f"; }; diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index 57e05bf19f6e..aa58ecdd35a9 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.24"; + pname = "mairix"; + version = "0.24"; src = fetchurl { - url = "mirror://sourceforge/mairix/${name}.tar.gz"; + url = "mirror://sourceforge/mairix/mairix-${version}.tar.gz"; sha256 = "0msaxz5c5hf7k1ci16i67m4ynrbrpsxbqzk84nz6z2vnkh3jww50"; }; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index d5f228d78730..62a23318ca2f 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20200120"; + pname = "mawk"; + version = "1.3.4-20200120"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/mawk/${name}.tgz" - "https://invisible-mirror.net/archives/mawk/${name}.tgz" + "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" + "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; }; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 99cfec97a70b..b48f89d66180 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mpage-2.5.7"; + pname = "mpage"; + version = "2.5.7"; + src = fetchurl { - url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; + url = "https://www.mesa.nl/pub/mpage/mpage-${version}.tgz"; sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index a94f5bc96887..bfc148df782b 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -6,7 +6,9 @@ # The store file mentioned is in "${glibc.out}/lib/locale/locale-archive" stdenv.mkDerivation { - name = "multitran-data-0.3"; + pname = "multitran-data"; + version = "0.3"; + src = fetchurl { url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index 893c1e1d9316..91c4bb0ea7f8 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libbtree-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libbtree"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libbtree-${version}.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 3895f3a922c2..0e6dd0d6e652 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libmtsupport }: -stdenv.mkDerivation { - name = "libfacet-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libfacet"; + version = "0.0.1alpha2"; src = fetchurl { - url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libfacet-${version}.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index 3b7dd681e8ae..5cc8e724e71f 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : -stdenv.mkDerivation { - name = "libmtquery-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "libmtquery"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtquery-${version}.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index eebc88189f25..454709b8eb79 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libmtsupport-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libmtsupport"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtsupport-${version}.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index 00325276fdb1..2428caada5b8 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : -stdenv.mkDerivation { - name = "mt-utils-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "mt-utils"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/mt-utils-${version}.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index e2621ab18766..19f2d7b1cbd6 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "qprint-1.1"; + pname = "qprint"; + version = "1.1"; src = fetchurl { - url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/qprint-${version}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index 785ef3205967..f87bd5d7b1a1 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, opensp, perl }: stdenv.mkDerivation rec { - name = "openjade-1.3.2"; + pname = "openjade"; + version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/${name}.tar.gz"; + url = "mirror://sourceforge/openjade/openjade-${version}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 1c9131d29dc5..6924c8953eef 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 , libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: -stdenv.mkDerivation { - name = "opensp-1.5.2"; +stdenv.mkDerivation rec { + pname = "opensp"; + version = "1.5.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; + url = "mirror://sourceforge/openjade/OpenSP-${version}.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index e2bda04d13f1..d83e9393f941 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uni2ascii-4.18"; + pname = "uni2ascii"; + version = "4.18"; + src = fetchurl { - url = "https://billposer.org/Software/Downloads/${name}.tar.gz"; + url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 4c312250bf65..265ab10e5ac8 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2 }: -stdenv.mkDerivation { - name = "xml2-0.5"; +stdenv.mkDerivation rec { + pname = "xml2"; + version = "0.5"; src = fetchurl { - url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${version}.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index e179c3153e10..39d53088babf 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "xmlstarlet-1.6.1"; + pname = "xmlstarlet"; + version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; + url = "mirror://sourceforge/xmlstar/xmlstarlet-${version}.tar.gz"; sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index 29170394d1e6..ce0813c2ef4a 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -2,11 +2,12 @@ assert libxml2.pythonSupport == true; -stdenv.mkDerivation { - name = "xpf-0.2"; +stdenv.mkDerivation rec { + pname = "xpf"; + version = "0.2"; src = fetchurl { - url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; + url = "http://tarballs.nixos.org/xpf-${version}.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index 7c4ecc49df5d..e5794b439a53 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation { - name= "yaml-merge-2016-02-16"; + pname = "yaml-merge"; + version = "unstable-2016-02-16"; src = fetchFromGitHub { owner = "abbradar"; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index affa12c40190..f3fdcd32502e 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: stdenv.mkDerivation rec { - name = "docbook2odf-0.244"; + pname = "docbook2odf"; + version = "0.244"; src = fetchurl { - url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz"; + url = "http://open.comsultia.com/docbook2odf/dwn/docbook2odf-${version}.tar.gz"; sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 4b9e571c0ad3..aac992552d31 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -4,10 +4,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "docbook2X-0.8.8"; + pname = "docbook2X"; + version = "0.8.8"; src = fetchurl { - url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; + url = "mirror://sourceforge/docbook2x/docbook2X-${version}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; }; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index d077ef823ffc..ec5598e4d689 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "halibut-1.2"; + pname = "halibut"; + version = "1.2"; src = fetchurl { - url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz"; + url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; }; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index ad6427e56224..8253d73e3dbb 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.35"; + pname = "hevea"; + version = "2.35"; src = fetchurl { - url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; + url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss="; }; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 4737c5d74097..f5bf22c0f338 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.40"; + pname = "lout"; + version = "3.40"; src = fetchurl { urls = [ - "ftp://ftp.cs.usyd.edu.au/jeff/lout/${name}.tar.gz" - "mirror://savannah/lout/${name}.tar.gz" # new! - "mirror://sourceforge/lout/${name}.tar.gz" # to be phased out + "ftp://ftp.cs.usyd.edu.au/jeff/lout/${pname}-${version}.tar.gz" + "mirror://savannah/lout/${pname}-${version}.tar.gz" # new! + "mirror://sourceforge/lout/${pname}-${version}.tar.gz" # to be phased out # XXX: We could add the CTAN mirrors # (see https://www.ctan.org/tex-archive/support/lout/). ]; diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index 4f896ef32baf..6b866b43d1b9 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "lkproof-3.1"; + pname = "lkproof"; + version = "3.1"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index fe928615eb42..0a2667f284e9 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pgfplots-1.5.1"; +stdenv.mkDerivation rec { + pname = "pgfplots"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; + url = "mirror://sourceforge/pgfplots/pgfplots_${version}.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index 0f6bf5d0d55c..d15386417218 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,15 +1,16 @@ { lib, stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: -stdenv.mkDerivation { - name = "tetex-3.0"; +stdenv.mkDerivation rec { + pname = "tetex"; + version = "3.0"; src = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-src-${version}.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-texmf-${version}.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; |