diff options
author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/data/fonts | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) | |
download | nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.gz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.bz2 nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.lz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.xz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.zst nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.zip |
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/data/fonts')
60 files changed, 117 insertions, 117 deletions
diff --git a/pkgs/data/fonts/alegreya-sans/default.nix b/pkgs/data/fonts/alegreya-sans/default.nix index 47984334165..cc0cd6cac9b 100644 --- a/pkgs/data/fonts/alegreya-sans/default.nix +++ b/pkgs/data/fonts/alegreya-sans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "alegreya-sans"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Humanist sans serif family with a calligraphic feeling"; longDescription = '' Alegreya Sans is a humanist sans serif family with a calligraphic feeling that conveys a dynamic and varied rhythm. This gives a pleasant feeling to readers of long texts. diff --git a/pkgs/data/fonts/alegreya/default.nix b/pkgs/data/fonts/alegreya/default.nix index 99a7131dc11..b2ec1de0cc8 100644 --- a/pkgs/data/fonts/alegreya/default.nix +++ b/pkgs/data/fonts/alegreya/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "alegreya"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -D -m 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An elegant and versatile font family for comfortable reading"; longDescription = '' Alegreya is a typeface originally intended for literature. Among its crowning characteristics, it conveys a dynamic and varied rhythm which facilitates the reading of long texts. Also, it provides freshness to the page while referring to the calligraphic letter, not as a literal interpretation, but rather in a contemporary typographic language. diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index a69aa3684ab..53d9149091e 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: +{ lib, stdenv, fetchFromGitHub, fonttosfnt, mkfontdir }: stdenv.mkDerivation rec { pname = "cherry"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkfontdir $out/share/fonts/misc ''; - meta = with stdenv.lib; { + meta = with lib; { description = "cherry font"; homepage = "https://github.com/turquoise-hexagon/cherry"; license = licenses.mit; diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 84cf3ebc538..5c97d3b7134 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: +{ lib, stdenv, fetchurl, fonttosfnt, mkfontscale, libfaketime }: stdenv.mkDerivation rec { pname = "clearlyU"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A Unicode font"; license = licenses.mit; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 13a40b8c0a0..df618aea811 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "comic-neue"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2 ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index ed28f6b5e6c..c37d3251a9d 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cabextract }: +{ lib, stdenv, fetchurl, cabextract }: let @@ -61,7 +61,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index 7c7ad4d5aa9..d4748544af5 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libfaketime +{ lib, stdenv, fetchFromGitHub, libfaketime , fonttosfnt, mkfontscale }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A pretty sweet 4px wide pixel font"; homepage = "https://github.com/romeovs/creep"; license = licenses.mit; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 1a8ac344a53..2a770222ed1 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip +{ lib, stdenv, fetchurl, unzip , bdftopcf, mkfontscale, fontforge }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = '' Dina is a monospace bitmap font, primarily aimed at programmers. It is diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index d5b9b29dd85..629e46fe797 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "emojione"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source emoji set"; homepage = "http://emojione.com/"; license = licenses.cc-by-40; diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 0d69b812c4c..dbfb85f881f 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libfaketime +{ lib, stdenv, fetchurl, libfaketime , fonttosfnt, mkfontscale }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' Readable bitmap font inspired by Envy Code R ''; diff --git a/pkgs/data/fonts/et-book/default.nix b/pkgs/data/fonts/et-book/default.nix index 58586ba7db6..e7d97b77707 100644 --- a/pkgs/data/fonts/et-book/default.nix +++ b/pkgs/data/fonts/et-book/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: fetchFromGitHub rec { rev = "7e8f02dadcc23ba42b491b39e5bdf16e7b383031"; @@ -13,7 +13,7 @@ fetchFromGitHub rec { cp -t $out/share/fonts/truetype et-book-${rev}/source/4-ttf/*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The typeface used in Edward Tufte’s books."; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index a3fac2d69d0..546c7d905a7 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "5.2"; @@ -15,7 +15,7 @@ in fetchzip { sha256 = "1wbfjgvr9m5azl5w49y0hpqzgcraw6spd1wnxgxlzfx57x6gcw0k"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tonsky/FiraCode"; description = "Monospace font with programming ligatures"; longDescription = '' diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index 624616bdd58..2e4cfc8f05b 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "fira-code-symbols-20160811"; @@ -12,7 +12,7 @@ fetchzip { sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; - meta = with stdenv.lib; { + meta = with lib; { description = "FiraCode unicode ligature glyphs in private use area"; longDescription = '' FiraCode uses ligatures, which some editors don’t support. diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index d29d6304cee..37f285b5552 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "fira-mono-3.206"; @@ -12,7 +12,7 @@ fetchzip { sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; description = "Monospace font for Firefox OS"; longDescription = '' diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index e887f0ffef1..b2225f5b49b 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ lib, stdenv, fetchgit }: let version = "2017-03-30"; @@ -17,7 +17,7 @@ in (fetchgit { sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz"; }) // { - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; license = licenses.bsd3; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index ac82c82ae3d..f28e3d5ba61 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub +{ lib, stdenv, fetchurl, fetchFromGitHub , mkfontscale, bdf2psf, bdftopcf , fonttosfnt, libfaketime }: @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = '' A monospace bitmap font well suited for programming and terminal use ''; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 153f37c88e0..0fac2a67bb8 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "google-fonts"; @@ -48,7 +48,7 @@ stdenv.mkDerivation { find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://fonts.google.com"; description = "Font files available from Google Fonts"; license = with licenses; [ asl20 ofl ufl ]; diff --git a/pkgs/data/fonts/gubbi/default.nix b/pkgs/data/fonts/gubbi/default.nix index 2d1c520e610..9ae46d08992 100644 --- a/pkgs/data/fonts/gubbi/default.nix +++ b/pkgs/data/fonts/gubbi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge }: +{ lib, stdenv, fetchFromGitHub, fontforge }: stdenv.mkDerivation rec { pname = "gubbi-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dm444 -t $out/share/fonts/truetype/ Gubbi.ttf"; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "A Kannada font"; license = licenses.gpl3Plus; diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 10568073e4b..f064b4f6192 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,4 +1,4 @@ -{ stdenv, google-fonts }: +{ lib, stdenv, google-fonts }: stdenv.mkDerivation { pname = "inconsolata"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.levien.com/type/myfonts/inconsolata.html"; description = "A monospace font for both screen and print"; maintainers = with maintainers; [ mikoim raskin rycee ]; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index e69e6e02a22..945fafcfcc5 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fontforge}: +{lib, stdenv, fetchFromGitHub, fontforge}: stdenv.mkDerivation rec { pname = "inconsolata-lgc"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/doc/${pname}-${version} LICENSE README ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' Inconsolata is one of the most suitable font for programmers created by Raph diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index 2db7e259a35..9956325e15b 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, unzip }: +{ lib, stdenv, requireFile, unzip }: stdenv.mkDerivation { pname = "input-fonts"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; - meta = with stdenv.lib; { + meta = with lib; { description = "Fonts for Code, from Font Bureau"; longDescription = '' Input is a font family designed for computer programming, data, diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 989c2d39c19..0d998a4863a 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { updateScript = ./update-default.sh; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index fc06a7e9843..a8df441d999 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip}: +{lib, stdenv, fetchzip}: let version = "3.5"; @@ -13,7 +13,7 @@ in fetchzip { sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/indestructible-type/Jost"; description = "A sans serif font by Indestructible Type"; license = licenses.ofl; diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index c19a55400fc..d7442b34521 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , config , acceptLicense ? config.joypixels.acceptLicense or false @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon diff --git a/pkgs/data/fonts/kanji-stroke-order-font/default.nix b/pkgs/data/fonts/kanji-stroke-order-font/default.nix index 7b8444c3cde..80c97024ac3 100644 --- a/pkgs/data/fonts/kanji-stroke-order-font/default.nix +++ b/pkgs/data/fonts/kanji-stroke-order-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let version = "4.003"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation { cp *.txt $out/share/doc/kanji-stroke-order ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://sites.google.com/site/nihilistorguk/"; diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix index edc39ff0a40..04ee3781b6b 100644 --- a/pkgs/data/fonts/liberation-fonts/default.nix +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3 }: let inherit (python3.pkgs) fonttools; @@ -27,7 +27,7 @@ let install -m444 -Dt $out/share/doc/${pname}-${version} README || true ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; longDescription = '' The Liberation Fonts are intended to be replacements for the three most diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix index 373704f25f5..281bfa4c42b 100644 --- a/pkgs/data/fonts/liberation-sans-narrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fontforge, python3Packages, python3 }: +{ lib, stdenv, fetchFromGitHub, fontforge, python3Packages, python3 }: stdenv.mkDerivation rec { pname = "liberation-sans-narrow"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/doc/${pname}-${version} AUTHORS ChangeLog COPYING License.txt README.rst ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Liberation Sans Narrow Font Family is a replacement for Arial Narrow"; longDescription = '' Liberation Sans Narrow is a font originally created by Ascender diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index bd47998b924..2120c5965e2 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fontforge }: +{ lib, stdenv, fetchurl, fontforge }: stdenv.mkDerivation { name = "linux-libertine-5.3.0"; @@ -38,7 +38,7 @@ stdenv.mkDerivation { install -m444 -Dt $out/share/texmf/fonts/map *.map ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Linux Libertine Fonts"; homepage = "http://linuxlibertine.sf.net"; maintainers = [ maintainers.volth ]; diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 1b5e5b1be69..d89d4c41c0f 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "libre-caslon"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "05aajwny99yqzn1nnq1blx6h7rl54x056y12hyawfbigkzxhscns"; - meta = with stdenv.lib; { + meta = with lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; homepage = "http://www.impallari.com/librecaslon"; license = licenses.ofl; diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index d5a46b43fb4..fb1595fe2fc 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{lib, stdenv, fetchurl}: let @@ -69,7 +69,7 @@ in outputHashMode = "recursive"; outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/librefonts/lobstertwo"; description = "Script font with many ligatures"; license = licenses.ofl; diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/data/fonts/meslo-lgs-nf/default.nix index 36ce33cd7d2..305bd69f2da 100644 --- a/pkgs/data/fonts/meslo-lgs-nf/default.nix +++ b/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "meslo-lgs-nf"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp $src/*.ttf $out/share/fonts/truetype ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Meslo Nerd Font patched for Powerlevel10k"; homepage = "https://github.com/romkatv/powerlevel10k-media"; license = licenses.asl20; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 1b3313d4e02..bcc0666f035 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "migmix"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "1fhh8wg6lxwrnsg9rl4ihffl0bsp1wqa5gps9fx60kr6j9wpvmbg"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; homepage = "http://mix-mplus-ipa.osdn.jp/migmix"; license = licenses.ipa; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 530fd4f543f..09992ef5ec8 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: stdenv.mkDerivation rec { pname = "migu"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHash = "0nbpn21cxdd6gsgr3fadzjsnz84f2swpf81wmscmjgvd56ngndzh"; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts"; homepage = "http://mix-mplus-ipa.osdn.jp/migu/"; license = licenses.ipa; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 48dc121af45..77ef87152ac 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3 }: stdenv.mkDerivation { pname = "monoid"; @@ -39,7 +39,7 @@ stdenv.mkDerivation { install -m444 -Dt $out/share/doc Readme.md ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://larsenwork.com/monoid"; description = "Customisable coding font with alternates, ligatures and contextual positioning"; license = [ licenses.ofl licenses.mit ]; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index bf98effb150..ceb0cb8b03a 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; longDescription = '' Nerd Fonts is a project that attempts to patch as many developer targeted diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 1c1d773038e..59d1ed353f3 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -179,7 +179,7 @@ in install -D $src $out/share/fonts/blobmoji/Blobmoji.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Noto Emoji with extended Blob support"; homepage = "https://github.com/C1710/blobmoji"; license = with licenses; [ ofl asl20 ]; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 54dbe3abf4e..eecab47c087 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-mono"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index afaba6804f8..826b8887365 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-sans"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index a6f21e425f8..bbff974e107 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: fetchzip { name = "paratype-pt-serif"; @@ -16,7 +16,7 @@ fetchzip { sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index 6297a8fbb20..3570bf7bf91 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mkfontscale }: +{ lib, stdenv, fetchzip, mkfontscale }: stdenv.mkDerivation { pname = "profont"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://tobiasjung.name/profont/"; description = "A monospaced font created to be a most readable font for programming"; maintainers = with maintainers; [ myrl ]; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 7ddfd69aeeb..81ecb735409 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontscale }: +{ lib, stdenv, fetchurl, mkfontscale }: stdenv.mkDerivation { name = "proggyfonts-0.1"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://upperbounds.net"; description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index 13cb056dc45..435cdb7d163 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, google-fonts, migu, fontforge, which }: +{ lib, stdenv, fetchurl, google-fonts, migu, fontforge, which }: stdenv.mkDerivation rec { pname = "ricty"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { install -m644 --target $out/share/fonts/truetype/ricty -D Ricty-*.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; license = licenses.unfree; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 0f90c13d11e..ceed8307004 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fontforge, python3 }: +{ lib, stdenv, fetchgit, fontforge, python3 }: stdenv.mkDerivation rec { pname = "rictydiminished-with-firacode"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ])) ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/hakatashi/RictyDiminished-with-FiraCode"; description = "The best Japanese programming font meets the awesome ligatures of Firacode"; license = licenses.ofl; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index 9bb65526801..fd3372123c6 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: let # Latest commit touching the robotomono tree @@ -67,7 +67,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; longDescription = '' diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 1fec03b46fe..dc37c825856 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "roboto-slab"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = "0g663npi5lkvwcqafd4cjrm90ph0nv1lig7d19xzfymnj47qpj8x"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.google.com/fonts/specimen/Roboto+Slab"; description = "Roboto Slab Typeface by Google"; longDescription = '' diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index fb13f82263d..ea2d2b687d5 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: +{ lib, stdenv, fetchzip, libfaketime, fonttosfnt, mkfontscale }: stdenv.mkDerivation rec { name = "siji-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/stark/siji"; description = "An iconic bitmap font based on Stlarch with additional glyphs"; license = licenses.gpl2; diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 4d1e58a6bb3..6f0886e1d97 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fontforge, mkfontscale }: +{ lib, stdenv, fetchurl, fontforge, mkfontscale }: let version = "1.11"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at programmers. It was derived from Gilles Boccon-Gibod's MonteCarlo. Tamsyn diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 026ec63d670..80212a14aeb 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, mkfontscale, stdenv }: +{ fetchFromGitHub, mkfontscale, lib, stdenv }: stdenv.mkDerivation rec { pname = "tamzen-font"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkfontdir "$out/share/fonts/misc" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Bitmapped programming font based on Tamsyn"; longDescription = '' Tamzen is a monospace bitmap font. It is programatically forked diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index bbde1dd252c..fca357706a6 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 +{ lib, stdenv, fetchurl, python3 , libfaketime, fonttosfnt , bdftopcf, mkfontscale }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "fontdir" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A clean fixed width font"; longDescription = '' Terminus Font is designed for long (8 and more hours per day) work diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 7821cc66041..1cf31b5affe 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3 +{ lib, stdenv, fetchFromGitHub, python3 , bdftopcf, mkfontscale , libfaketime, fonttosfnt }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mkfontdir "$fontDir" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' Tewi is a bitmap font, readable even at very small font sizes. This is diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index cd3c3ab00b1..92898be0f3f 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let variants = { @@ -48,7 +48,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with stdenv.lib; { + meta = with lib; { longDescription = '' TeX Gyre ${displayName} Math is a math companion for the TeX Gyre ${displayName} family of fonts (see diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 197d14c3f03..333da24e95f 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let mkVariant = variant: { version, abbreviation, sha256, outputHash }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ let outputHashMode = "recursive"; inherit outputHash; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre"; # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 2e3a0a95c05..9c03bbb162f 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, fontforge }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, fontforge }: stdenv.mkDerivation rec { pname = "tlwg"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preAutoreconf = "echo ${version} > VERSION"; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of Thai scalable fonts available under free licenses"; homepage = "https://linux.thai.net/projects/fonts-tlwg"; license = with licenses; [ gpl2 publicDomain lppl13c free ]; diff --git a/pkgs/data/fonts/ttf-tw-moe/default.nix b/pkgs/data/fonts/ttf-tw-moe/default.nix index 1115b48b709..69579289442 100644 --- a/pkgs/data/fonts/ttf-tw-moe/default.nix +++ b/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip }: +{ lib, stdenv, fetchzip }: let version = "2020-11-14"; in @@ -14,7 +14,7 @@ fetchzip { sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; - meta = with stdenv.lib; { + meta = with lib; { homepage = "http://www.moe.gov.tw/"; description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; version = version; diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 23ae8e76b1d..5e690e7fd6f 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, inkscape, imagemagick, potrace, svgo, scfbuild }: stdenv.mkDerivation rec { pname = "twemoji-color-font"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { install -Dm644 linux/fontconfig/56-twemoji-color.conf $out/etc/fonts/conf.d/56-twemoji-color.conf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags"; longDescription = '' A color and B&W emoji SVGinOT font built from the Twitter Emoji for diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 8435957fe20..de70a0b6c6a 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,7 +1,7 @@ # Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) -{ stdenv +{ lib, stdenv , fetchFromGitHub , cairo , imagemagick @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { install -Dm644 TwitterColorEmoji.ttf $out/share/fonts/truetype/TwitterColorEmoji.ttf ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Color emoji font with a flat visual style, designed and used by Twitter"; longDescription = '' A bitmap color emoji font built from the Twitter Emoji for diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 71c42c46b5d..7bb9930ccfc 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bdftopcf +{ lib, stdenv, fetchurl, bdftopcf , libfaketime, fonttosfnt, mkfontscale }: @@ -51,7 +51,7 @@ stdenv.mkDerivation { outputs = [ "out" "bdf" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html"; description = "Unicode bitmap fonts"; license = licenses.publicDomain; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 3a9f107c4c7..507faae53e3 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mkfontscale +{ lib, stdenv, fetchurl, mkfontscale , libfaketime, fonttosfnt }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { mkfontscale ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Unicode font for Base Multilingual Plane"; homepage = "http://unifoundry.com/unifont.html"; diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index b0e58faed60..a3c3f7b68aa 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl +{ lib, stdenv, fetchurl, perl , bdftopcf, bdf2psf, mkfontdir , fonttosfnt , targetsDat ? null @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Monospace bitmap screen fonts for X11"; homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"; license = with licenses; [ free mit ]; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index dfb38973edd..9e3c013f44d 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3Packages}: +{ lib, stdenv, fetchFromGitHub, python3Packages}: stdenv.mkDerivation rec { pname = "xits-math"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -m444 -Dt $out/share/fonts/opentype *.otf ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/alif-type/xits"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; |