diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/tools/typesetting | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
Diffstat (limited to 'pkgs/tools/typesetting')
19 files changed, 25 insertions, 27 deletions
diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index fd2cf133c0ac..cb667e6b1218 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "0.9.2"; - name = "djvu2pdf-${version}"; + pname = "djvu2pdf"; src = fetchurl { url = "http://0x2a.at/site/projects/djvu2pdf/djvu2pdf-${version}.tar.gz"; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 9240926ab5b4..a72ca6980774 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, ant, jdk, runtimeShell }: stdenv.mkDerivation rec { - name = "fop-${version}"; + pname = "fop"; version = "2.1"; src = fetchurl { - url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz"; + url = "mirror://apache/xmlgraphics/fop/source/${pname}-${version}-src.tar.gz"; sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5"; }; diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index a255779c08a3..c214bd3cac7e 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "1.3.0"; - name = "git-latexdiff-${version}"; + pname = "git-latexdiff"; src = fetchFromGitLab { sha256 = "05fnhr1pqvj8l25vi9hdccwfk4mv2f0pfhn05whbdvf66gyl4fs9"; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index d6c4fedc1434..7fca57ab9d26 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -8,7 +8,7 @@ assert stdenv.isDarwin -> SystemConfiguration != null stdenv.mkDerivation rec { version = "1.8.29"; - name = "htmldoc-${version}"; + pname = "htmldoc"; src = fetchurl { url = "https://github.com/michaelrsweet/htmldoc/releases/download" + "/release-${version}/htmldoc-${version}-source.tar.gz"; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 2b7a6f3ffb44..064e75ecbdc1 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "mmark-${version}"; + pname = "mmark"; version = "1.3.6"; rev = "v${version}"; diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 3a7d7be006a1..cd78f63ef78c 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, perl }: stdenv.mkDerivation rec { - name = "multimarkdown-${version}"; + pname = "multimarkdown"; version = "4.7.1"; src = fetchgit { diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index c53e8573c90f..9f62671a4fac 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonApplication rec { - name = "odpdown-${version}"; + pname = "odpdown"; version = "0.4.1"; src = fetchurl { diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index 42f984b8cc60..a6f38ad0bc2c 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { version = "0.9.13"; - name = "pdf2djvu-${version}"; + pname = "pdf2djvu"; src = fetchurl { - url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz"; + url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${pname}-${version}.tar.xz"; sha256 = "0qscmfii1pvnb8g7kbl1rdiqyic6ybfiw4kwvy35qqi967c1daz0"; }; diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index 3e40c9caf28e..c8e27fb5a6e7 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -14,7 +14,7 @@ let ]; in stdenv.mkDerivation rec { - name = "pdf2odt-${version}"; + pname = "pdf2odt"; version = "20170207"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 38382689edce..20da90961dda 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, poppler, libgcrypt, pcre, asciidoc }: stdenv.mkDerivation rec { - name = "pdfgrep-${version}"; + pname = "pdfgrep"; version = "2.1.2"; src = fetchurl { - url = "https://pdfgrep.org/download/${name}.tar.gz"; + url = "https://pdfgrep.org/download/${pname}-${version}.tar.gz"; sha256 = "1fia10djcxxl7n9jw2prargw4yzbykk6izig2443ycj9syhxrwqf"; }; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 0a0f593eaa3b..6a2ebb089d21 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -29,7 +29,7 @@ let }); in stdenv.mkDerivation rec { - name = "satysfi-${version}"; + pname = "satysfi"; version = "0.0.3"; src = fetchFromGitHub { owner = "gfngfn"; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index f2a48e5db049..af1e8711f227 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "scdoc-${version}"; + pname = "scdoc"; version = "1.9.6"; src = fetchurl { diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 966d657ae7d0..3b6ec809869d 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { - name = "sile-${version}"; + pname = "sile"; version = "0.9.5.1"; src = fetchurl { - url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; + url = "https://github.com/simoncozens/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; sha256 = "0fh0jbpsyqyq0hzq4midn7yw2z11hqdgqb9mmgz766cp152wrkb0"; }; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index 355d7a055e8f..b06b2e25fcc2 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "skribilo-${version}"; + pname = "skribilo"; version = "0.9.4"; src = fetchurl { - url = "http://download.savannah.nongnu.org/releases/skribilo/${name}.tar.gz"; + url = "http://download.savannah.nongnu.org/releases/skribilo/${pname}-${version}.tar.gz"; sha256 = "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"; }; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index 1cb7b9ce9759..e1bd3922ff3a 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, inotify-tools, openssh, perl, gnutar, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "sshlatex-${version}"; + pname = "sshlatex"; version = "0.8"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index b60cbcf22ad0..a03432b729ad 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "ted"; version = "2.23"; src = fetchurl { - url = "http://ftp.nluug.nl/pub/editors/${pname}/${name}.src.tar.gz"; + url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz"; sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z"; }; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 5444914f7a4e..2513d48796e1 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/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/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 906d9be0f1ec..a08f32ce9c29 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, qmake, qttools, qtbase, libsForQt5, flex, bison }: stdenv.mkDerivation rec { - name = "tikzit-${version}"; + pname = "tikzit"; version = "2.1.4"; src = fetchFromGitHub { diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 523a34c0b569..df9a607d4f27 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -2,7 +2,7 @@ , glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: stdenv.mkDerivation rec { - name = "xmlroff-${version}"; + pname = "xmlroff"; version = "0.6.2"; src = fetchurl { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "docs" "" ''; - sourceRoot = "${name}/xmlroff/"; + sourceRoot = "${pname}-${version}/xmlroff/"; patches = [./xmlroff.patch]; |