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/data/fonts | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
download | nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2 nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst nixlib-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/data/fonts')
26 files changed, 37 insertions, 39 deletions
diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index 27306a0ef05c..061bbb445fb2 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.92"; - name = "dina-font-pcf-${version}"; + pname = "dina-font-pcf"; src = fetchurl { url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 4837425d19a7..81a1b5649b36 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "dosemu-fonts-${version}"; + pname = "dosemu-fonts"; version = "1.4.0"; src = fetchurl { diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 3e71352f8025..171ec10c8f16 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { - name = "emojione-${version}"; + pname = "emojione"; version = "1.4"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index 59ac4ec850b1..1f861afcf83f 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gohufont-${version}"; + pname = "gohufont"; version = "2.1"; src = fetchurl { - url = "http://font.gohu.org/${name}.tar.gz"; + url = "http://font.gohu.org/${pname}-${version}.tar.gz"; sha256 = "10dsl7insnw95hinkcgmp9rx39lyzb7bpx5g70vswl8d6p4n53bm"; }; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index d743d2ccbd42..707beb41231d 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "google-fonts-${version}"; + pname = "google-fonts"; version = "2019-07-14"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 7eded5deab48..94c43b11285e 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,7 +1,7 @@ { stdenv, google-fonts }: stdenv.mkDerivation rec { - name = "inconsolata-${version}"; + pname = "inconsolata"; inherit (google-fonts) src version; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index 8b5570081757..aec48b120860 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub, fontforge}: stdenv.mkDerivation rec { - name = "inconsolata-lgc-${version}"; + pname = "inconsolata-lgc"; version = "1.3"; src = fetchFromGitHub { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = '' find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; find . -name '*.otf' -exec install -m444 -Dt $out/share/fonts/opentype {} \; - install -m444 -Dt $out/share/doc/${name} LICENSE README + install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README ''; meta = with stdenv.lib; { diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 4910ef21f9ab..d079ae59b0d6 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, requireFile, unzip }: stdenv.mkDerivation rec { - name = "input-fonts-${version}"; + pname = "input-fonts"; version = "2017-08-10"; # date of the download and checksum src = requireFile { diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index ec932ab978c2..7a68c9deb5a6 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "libre-caslon-${version}"; + pname = "libre-caslon"; version = "1.002"; srcs = [ @@ -26,10 +26,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} + mkdir -p $out/share/doc/${pname}-${version} cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ - cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${pname}-${version} ''; outputHashAlgo = "sha256"; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index d9e7ec66ee67..773b53c88921 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -50,15 +50,15 @@ let in stdenv.mkDerivation rec { - name = "lobstertwo-${version}"; + pname = "lobstertwo"; version = "1.006"; phases = ["installPhase"]; installPhase = '' mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - cp -v ${fontlog.file} $out/share/doc/${name}/${fontlog.name} + mkdir -p $out/share/doc/${pname}-${version} + cp -v ${fontlog.file} $out/share/doc/${pname}-${version}/${fontlog.name} cp -v ${bold.file} $out/share/fonts/opentype/${bold.name} cp -v ${boldItalic.file} $out/share/fonts/opentype/${boldItalic.name} cp -v ${italic.file} $out/share/fonts/opentype/${italic.name} diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index f990575def0f..a041f9ce907a 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { version = "1.2.1"; - name = "meslo-lg-${version}"; + pname = "meslo-lg"; meslo-lg = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true"; - name="${name}"; + name="${pname}-${version}"; sha256="1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"; }; meslo-lg-dz = fetchurl { url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip?raw=true"; - name="${name}-dz"; + name="${pname}-${version}-dz"; sha256="0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; }; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 228952aaa56d..8a089ea9e79f 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "migmix-${version}"; + pname = "migmix"; version = "20150712"; srcs = [ diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 193e98d01a4b..775d1766894c 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: stdenv.mkDerivation rec { - name = "migu-${version}"; + pname = "migu"; version = "20150712"; srcs = [ diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 2bc5a82fa94f..c4cf4f142516 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python, fontforge }: stdenv.mkDerivation rec { - name = "monoid-${version}"; + pname = "monoid"; version = "2016-07-21"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index c08630335d4a..59b0f89e45ed 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { version = "2.0.0"; - name = "nerdfonts-${version}"; + pname = "nerdfonts"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "nerd-fonts"; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index a9d45128c5b4..7db2d9ef75a6 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -2,7 +2,7 @@ pythonPackages.buildPythonPackage rec { version = "2017-09-25"; - name = "nototools-${version}"; + pname = "nototools"; src = fetchFromGitHub { owner = "googlei18n"; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index 2667562b1b02..ab794992e45f 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, google-fonts, migu, fontforge, which }: stdenv.mkDerivation rec { - name = "ricty-${version}"; + pname = "ricty"; version = "4.1.1"; src = fetchurl { diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 2bdb96228d9c..2e83d5b12d4c 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fontforge, pythonFull }: stdenv.mkDerivation rec { - name = "rictydiminished-with-firacode-${version}"; + pname = "rictydiminished-with-firacode"; version = "0.0.1"; src = fetchgit { url = "https://github.com/hakatashi/RictyDiminished-with-FiraCode.git"; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index 175acb22d7b2..d55e3b753dd7 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -5,7 +5,7 @@ let commit = "883939708704a19a295e0652036369d22469e8dc"; in stdenv.mkDerivation rec { - name = "roboto-mono-${version}"; + pname = "roboto-mono"; version = "2016-01-11"; srcs = [ diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index c5ce13ad7ae4..548414152ddb 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -5,7 +5,7 @@ let commit = "883939708704a19a295e0652036369d22469e8dc"; in stdenv.mkDerivation rec { - name = "roboto-slab-${version}"; + pname = "roboto-slab"; version = "2016-01-11"; srcs = [ diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 57356398004e..358ab959cd0e 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -2,11 +2,10 @@ stdenv.mkDerivation rec { pname = "terminus-font"; - version = "4.48"; - name = "${pname}-${version}"; # set here for use in URL below + version = "4.48"; # set here for use in URL below src = fetchurl { - url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz"; + url = "mirror://sourceforge/project/${pname}/${pname}-${version}/${pname}-${version}.tar.gz"; sha256 = "1bwlkj39rqbyq57v5yssayav6hzv1n11b9ml2s0dpiyfsn6rqy9l"; }; diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 494f48fd36e0..787009928313 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, autoreconfHook, fontforge }: stdenv.mkDerivation rec { - name = "tlwg-${version}"; + pname = "tlwg"; version = "0.6.4"; src = fetchFromGitHub { diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 996d11923972..f1545e3d5b45 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "ucs-fonts-${version}"; + pname = "ucs-fonts"; version = "20090406"; srcs = [ diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index b3c6d585b8bb..a80beee342b3 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, mkfontscale, mkfontdir }: stdenv.mkDerivation rec { - name = "unifont-${version}"; + pname = "unifont"; version = "12.1.03"; ttf = fetchurl { - url = "mirror://gnu/unifont/${name}/${name}.ttf"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p"; }; pcf = fetchurl { - url = "mirror://gnu/unifont/${name}/${name}.pcf.gz"; + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; }; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 6d169e940cf9..cd4d0dc42cdd 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -1,11 +1,10 @@ {stdenv, fetchurl, perl, bdftopcf, perlPackages, fontforge, SDL, SDL_image}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "unscii"; version = "1.1"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { - url = "http://pelulamu.net/${pname}/${name}-src.tar.gz"; + url = "http://pelulamu.net/${pname}/${pname}-${version}-src.tar.gz"; sha256 = "0qcxcnqz2nlwfzlrn115kkp3n8dd7593h762vxs6vfqm13i39lq1"; }; nativeBuildInputs = [perl bdftopcf perlPackages.TextCharWidth fontforge diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 553c1dbde221..24e9f2a39357 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2Packages, fontforge }: stdenv.mkDerivation rec { - name = "xits-math-${version}"; + pname = "xits-math"; version = "1.200"; src = fetchFromGitHub { |