diff options
| author | Scott Worley <scottworley@scottworley.com> | 2022-09-29 00:52:55 -0700 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-01-17 01:03:11 +0200 |
| commit | af89d3a2be6f70edb187dd817377d6c4360134fa (patch) | |
| tree | 432c3ff8a5c9e40ac5fef7d6387e12db60310cc9 | |
| parent | ea27fb07efe68cb426593a4d7c2efe469621021d (diff) | |
| download | nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.tar nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.tar.gz nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.tar.bz2 nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.tar.lz nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.tar.xz nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.tar.zst nixpkgs-af89d3a2be6f70edb187dd817377d6c4360134fa.zip | |
78 fonts: Fix build after #173430 changed postFetch semantics
72 files changed, 672 insertions, 584 deletions
diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 6d0b5f483ec..2995f85f93e 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.0.2"; -in fetchzip { +in (fetchzip { name = "andagii-${version}"; url = "http://www.i18nguy.com/unicode/andagii.zip"; curlOpts = "--user-agent 'Mozilla/5.0'"; - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf - ''; sha256 = "0j5kf2fmyqgnf5ji6h0h79lq9n9d85hkfrr4ya8hqj4gwvc0smb2"; # There are multiple claims that the font is GPL, so I include the @@ -24,4 +20,10 @@ in fetchzip { license = "unknown"; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf + ''; +}) diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index 02ee29a382e..5f2e6640d26 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "6.101"; + name = "andika-${version}"; in - fetchzip rec { - name = "andika-${version}"; + (fetchzip rec { + inherit name; url = "https://software.sil.org/downloads/r/andika/Andika-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "sha256-J/Ad+fmCMOxLoo+691LE6Bgi/l3ovIfWScwwVWtqACI="; meta = with lib; { @@ -28,4 +24,10 @@ in platforms = platforms.all; maintainers = [ maintainers.f--t ]; }; - } + }).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + }) diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index fbf587c7c6c..afbd80674c6 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -1,16 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.100"; in -fetchzip { +(fetchzip { name = "ankacoder-${version}"; url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip"; - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; - sha256 = "1jqx9micfmiarqh9xp330gl96v3vxbwzz9cmg2vi845n9md4im85"; meta = with lib; { @@ -20,4 +15,10 @@ fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/annapurna-sil/default.nix b/pkgs/data/fonts/annapurna-sil/default.nix index f14602eccf2..6eff39cf1ac 100644 --- a/pkgs/data/fonts/annapurna-sil/default.nix +++ b/pkgs/data/fonts/annapurna-sil/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.204"; + name = "annapurna-sil-${version}"; in - fetchzip rec { - name = "annapurna-sil-${version}"; + (fetchzip rec { + inherit name; url = "https://software.sil.org/downloads/r/annapurna/AnnapurnaSIL-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "sha256-kVeP9ZX8H+Wn6jzmH1UQvUKY6vJjadMTdEusS7LodFM="; meta = with lib; { @@ -26,4 +22,10 @@ in platforms = platforms.all; maintainers = [ maintainers.kmein ]; }; - } + }).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + }) diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index e78f00a4975..7ec429036bc 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -1,16 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "13.0.3"; -in fetchzip { +in (fetchzip { name = "babelstone-han-${version}"; # upstream download links are unversioned, so hash changes url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype - ''; sha256 = "018isk3hbzsihzrxavgjbn485ngzvlm96npqx9y7zpkxsssslc4w"; meta = with lib; { @@ -21,4 +18,9 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ emily ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/truetype + unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/barlow/default.nix b/pkgs/data/fonts/barlow/default.nix index e9257260ea2..aa618140b1b 100644 --- a/pkgs/data/fonts/barlow/default.nix +++ b/pkgs/data/fonts/barlow/default.nix @@ -1,14 +1,23 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.422"; in -fetchzip rec { +(fetchzip rec { name = "barlow-${version}"; url = "https://tribby.com/fonts/barlow/download/barlow-${version}.zip"; sha256 = "08ld4c3zq4d1px07lc64i7l8848zsc61ddy3654w2sh0hx5sm5ld"; + meta = with lib; { + description = "A grotesk variable font superfamily"; + homepage = "https://tribby.com/fonts/barlow/"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +}).overrideAttrs (_: { postFetch = '' mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype @@ -17,12 +26,4 @@ fetchzip rec { unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - - meta = with lib; { - description = "A grotesk variable font superfamily"; - homepage = "https://tribby.com/fonts/barlow/"; - license = licenses.ofl; - maintainers = [ maintainers.marsam ]; - platforms = platforms.all; - }; -} +}) diff --git a/pkgs/data/fonts/borg-sans-mono/default.nix b/pkgs/data/fonts/borg-sans-mono/default.nix index 57b0a23bf7b..0f5de931b84 100644 --- a/pkgs/data/fonts/borg-sans-mono/default.nix +++ b/pkgs/data/fonts/borg-sans-mono/default.nix @@ -1,21 +1,17 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let pname = "borg-sans-mono"; version = "0.2.0"; in -fetchzip { +(fetchzip { name = "${pname}-${version}"; # https://github.com/marnen/borg-sans-mono/issues/19 url = "https://github.com/marnen/borg-sans-mono/files/107663/BorgSansMono.ttf.zip"; sha256 = "1gz4ab0smw76ih5cs2l3n92c77nv7ld5zghq42avjsfhxrc2n5ri"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - meta = with lib; { description = "Droid Sans Mono Slashed + Hasklig-style ligatures"; homepage = "https://github.com/marnen/borg-sans-mono"; @@ -23,4 +19,9 @@ fetchzip { platforms = platforms.all; maintainers = with maintainers; [ atila ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/cascadia-code/default.nix b/pkgs/data/fonts/cascadia-code/default.nix index 67ad8682a8e..112f7c8d7d1 100644 --- a/pkgs/data/fonts/cascadia-code/default.nix +++ b/pkgs/data/fonts/cascadia-code/default.nix @@ -1,20 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2111.01"; in -fetchzip { +(fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; sha256 = "sha256-kUVTQ/oMZztNf22sDbQBpQW0luSc5nr5sxWU5etLDec="; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - meta = with lib; { description = "Monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"; homepage = "https://github.com/microsoft/cascadia-code"; @@ -23,4 +18,10 @@ fetchzip { maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 3294cb71105..533f40a9a00 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "6.101"; + name = "charis-sil-${version}"; in - fetchzip rec { - name = "charis-sil-${version}"; + (fetchzip rec { + inherit name; url = "https://software.sil.org/downloads/r/charis/CharisSIL-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "sha256-b1ms9hJ6IPe7W6O9KgzHZvwT4/nAoLOhdydcUrwNfnU="; meta = with lib; { @@ -28,4 +24,10 @@ in platforms = platforms.all; maintainers = [ maintainers.f--t ]; }; - } + }).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + }) diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index b5a7e887887..a5eafeae89c 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -1,21 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.1"; -in fetchzip rec { name = "comic-relief-${version}"; +in (fetchzip rec { + inherit name; url = "https://fontlibrary.org/assets/downloads/comic-relief/45c456b6db2aaf2f7f69ac66b5ac7239/comic-relief.zip"; - postFetch = '' - mkdir -p $out/etc/fonts/conf.d - mkdir -p $out/share/doc/${name} - mkdir -p $out/share/fonts/truetype - cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} - ''; - sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; meta = with lib; { @@ -37,4 +30,13 @@ in fetchzip rec { # want to install the font alias of this package. priority = 10; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/etc/fonts/conf.d + mkdir -p $out/share/doc/${name} + mkdir -p $out/share/fonts/truetype + cp -v ${./comic-sans-ms-alias.conf} $out/etc/fonts/conf.d/30-comic-sans-ms.conf + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile FONTLOG.txt -d $out/share/doc/${name} + ''; +}) diff --git a/pkgs/data/fonts/courier-prime/default.nix b/pkgs/data/fonts/courier-prime/default.nix index 81788b322cf..59a823727b8 100644 --- a/pkgs/data/fonts/courier-prime/default.nix +++ b/pkgs/data/fonts/courier-prime/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "unstable-2019-12-05"; repo = "CourierPrime"; rev = "7f6d46a766acd9391d899090de467c53fd9c9cb0"; -in fetchzip rec { +in (fetchzip rec { name = "courier-prime-${version}"; url = "https://github.com/quoteunquoteapps/${repo}/archive/${rev}/${name}.zip"; sha256 = "1xh4pkksm6zrafhb69q4lq093q6pl245zi9qhqw3x6c1ab718704"; - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf - ''; - meta = with lib; { description = "Monospaced font designed specifically for screenplays"; homepage = "https://github.com/quoteunquoteapps/CourierPrime"; @@ -21,4 +17,9 @@ in fetchzip rec { maintainers = [ maintainers.austinbutler ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip $downloadedFile + install -m444 -Dt $out/share/fonts/truetype ${repo}-${rev}/fonts/ttf/*.ttf + ''; +}) diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 1b0b0338366..6402cf5be59 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -1,23 +1,16 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.13.0"; in -fetchzip rec { +(fetchzip rec { name = "Cozette-${version}"; url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; sha256 = "sha256-xp3BCYfNUxCNewg4FfzmJnKp0PARvvnViMVwT25nWdM="; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc - unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc - ''; - meta = with lib; { description = "A bitmap programming font optimized for coziness"; homepage = "https://github.com/slavfox/cozette"; @@ -25,4 +18,12 @@ fetchzip rec { platforms = platforms.all; maintainers = with maintainers; [ brettlyons marsam ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.bdf -d $out/share/fonts/misc + unzip -j $downloadedFile \*.otb -d $out/share/fonts/misc + ''; +}) diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index 25d92fc0f9e..0df5dd51df6 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.3.2"; pname = "d2codingfont"; -in fetchzip { +in (fetchzip { name = "${pname}-${version}"; url = "https://github.com/naver/${pname}/releases/download/VER${version}/D2Coding-Ver${version}-20180524.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/ - ''; - sha256 = "1812r82530wzfki7k9cm35fy6k2lvis7j6w0w8svc784949m1wwj"; meta = with lib; { @@ -29,4 +25,9 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*-all.ttc -d $out/share/fonts/truetype/ + ''; +}) diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index f720c2cac7d..83e2a9ac8e7 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "6.101"; + name = "doulos-sil-${version}"; in - fetchzip rec { - name = "doulos-sil-${version}"; + (fetchzip rec { + inherit name; url = "https://software.sil.org/downloads/r/doulos/DoulosSIL-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "sha256-vYdnudMkkWz6r8pwq98fyO0zcfFBRPmrqlmWxHCOIcc="; meta = with lib; { @@ -28,4 +24,10 @@ in platforms = platforms.all; maintainers = [ maintainers.f--t ]; }; - } + }).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + }) diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 869d889ef3c..4240e853f29 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "0.016"; -in fetchzip rec { name = "eb-garamond-${version}"; +in (fetchzip rec { + inherit name; url = "https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" - ''; - sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; meta = with lib; { @@ -22,4 +18,10 @@ in fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*Changes \*README.markdown \*README.xelualatex -d "$out/share/doc/${name}" + ''; +}) diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index 2f7a804ad08..5a31358b72a 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "5.0.0"; -in fetchzip { +in (fetchzip { name = "emacs-all-the-icons-fonts-${version}"; url = "https://github.com/domtronn/all-the-icons.el/archive/${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons - ''; - sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; meta = with lib; { @@ -32,4 +28,9 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ rlupton20 ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons + ''; +}) diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index 3fd0115ddb4..a6836afbc87 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -1,16 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: - -fetchzip rec { - name = "encode-sans-1.002"; +let name = "encode-sans-1.002"; +in (fetchzip rec { + inherit name; url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "16mx894zqlwrhnp4rflgayxhxppmsj6k7haxdngajhb30rlwf08p"; meta = with lib; { @@ -28,4 +23,10 @@ fetchzip rec { maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*README.md \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; +}) diff --git a/pkgs/data/fonts/ezra-sil/default.nix b/pkgs/data/fonts/ezra-sil/default.nix index 8489ab03562..2d970fbc38c 100644 --- a/pkgs/data/fonts/ezra-sil/default.nix +++ b/pkgs/data/fonts/ezra-sil/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.51"; + name = "ezra-sil-${version}"; in - fetchzip rec { - name = "ezra-sil-${version}"; + (fetchzip rec { + inherit name; url = "https://software.sil.org/downloads/r/ezra/EzraSIL-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "sha256-1LGw/RPFeNtEvcBWFWZf8+dABvWye2RfZ/jt8rwQewM="; meta = with lib; { @@ -23,4 +19,10 @@ in platforms = platforms.all; maintainers = [ maintainers.kmein ]; }; - } + }).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + }) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 8bdc411a7eb..f1eb2184266 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,18 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "6.2"; -in fetchzip { +in (fetchzip { name = "fira-code-${version}"; url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; - # only extract the variable font because everything else is a duplicate - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype - ''; - sha256 = "0l02ivxz3jbk0rhgaq83cqarqxr07xgp7n27l0fh8fbgxwi52djl"; meta = with lib; { @@ -27,4 +22,10 @@ in fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + # only extract the variable font because everything else is a duplicate + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile '*-VF.ttf' -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/fira-code/symbols.nix b/pkgs/data/fonts/fira-code/symbols.nix index e226c351a33..3d8c5bf3428 100644 --- a/pkgs/data/fonts/fira-code/symbols.nix +++ b/pkgs/data/fonts/fira-code/symbols.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "fira-code-symbols-20160811"; url = "https://github.com/tonsky/FiraCode/files/412440/FiraCode-Regular-Symbol.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile -d $out/share/fonts/opentype - ''; - sha256 = "19krsp22rin74ix0i19v4bh1c965g18xkmz1n55h6n6qimisnbkm"; meta = with lib; { @@ -23,4 +19,9 @@ fetchzip { maintainers = [ maintainers.Profpatsch ]; homepage = "https://github.com/tonsky/FiraCode/issues/211#issuecomment-239058632"; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 2cf1e7addbf..763f54bb767 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -1,16 +1,12 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "4.202"; -in fetchzip { +in (fetchzip { name = "fira-mono-${version}"; url = "https://github.com/mozilla/Fira/archive/${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype - ''; - sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; meta = with lib; { @@ -26,4 +22,9 @@ in fetchzip { maintainers = [ maintainers.rycee ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile Fira-${version}/otf/FiraMono\*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/data/fonts/fraunces/default.nix index d5879d6c2bc..2d053b1ce7f 100644 --- a/pkgs/data/fonts/fraunces/default.nix +++ b/pkgs/data/fonts/fraunces/default.nix @@ -1,20 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.000"; in -fetchzip { +(fetchzip { name = "fraunces-${version}"; url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - meta = with lib; { description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; homepage = "https://github.com/undercasetype/Fraunces"; @@ -22,4 +17,10 @@ fetchzip { maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/galatia-sil/default.nix b/pkgs/data/fonts/galatia-sil/default.nix index 99ae5802005..965596373c2 100644 --- a/pkgs/data/fonts/galatia-sil/default.nix +++ b/pkgs/data/fonts/galatia-sil/default.nix @@ -1,19 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.1"; + name = "galatia-sil-${version}"; in - fetchzip rec { - name = "galatia-sil-${version}"; + (fetchzip rec { + inherit name; url = "https://software.sil.org/downloads/r/galatia/GalatiaSIL-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*FONTLOG.txt -d "$out/share/doc/${name}" - ''; - sha256 = "sha256-zLL/7LMcJul2LilhEafpvm+tiYlgv1y1jj85VvG+wiI="; meta = with lib; { @@ -26,4 +22,10 @@ in platforms = platforms.all; maintainers = [ maintainers.kmein ]; }; - } + }).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*FONTLOG.txt -d "$out/share/doc/${name}" + ''; + }) diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 2e14795ebd1..be2f71b5346 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -1,20 +1,16 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let major = "1"; minor = "102"; version = "${major}.${minor}"; -in fetchzip rec { name = "gentium-book-basic-${version}"; +in (fetchzip rec { + inherit name; url = "http://software.sil.org/downloads/r/gentium/GentiumBasic_${major}${minor}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} - ''; - sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; meta = with lib; { @@ -24,4 +20,10 @@ in fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt -d $out/share/doc/${name} + ''; +}) diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index f64f7b34144..9494f8e62af 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,28 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "6.101"; -in fetchzip rec { name = "gentium-${version}"; +in (fetchzip rec { + inherit name; url = "http://software.sil.org/downloads/r/gentium/GentiumPlus-${version}.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf \ - -d $out/share/fonts/truetype - unzip -j $downloadedFile \ - \*/FONTLOG.txt \ - \*/README.txt \ - -d $out/share/doc/${name} - unzip -j $downloadedFile \ - \*/documentation/\*.html \ - \*/documentation/\*.txt \ - -x \*/documentation/source/\* \ - -d $out/share/doc/${name}/documentation - ''; - sha256 = "sha256-+T5aUlqQYDWRp4/4AZzsREHgjAnOeUB6qn1GAI0A5hE="; meta = with lib; { @@ -48,4 +34,20 @@ in fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf \ + -d $out/share/fonts/truetype + unzip -j $downloadedFile \ + \*/FONTLOG.txt \ + \*/README.txt \ + -d $out/share/doc/${name} + unzip -j $downloadedFile \ + \*/documentation/\*.html \ + \*/documentation/\*.txt \ + -x \*/documentation/source/\* \ + -d $out/share/doc/${name}/documentation + ''; +}) diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index 91a8aaf3c30..63633ffcda7 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let baseName = "gyre-fonts"; version = "2.005"; -in fetchzip { +in (fetchzip { name="${baseName}-${version}"; url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${version}otf.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype - ''; - sha256 = "17amdpahs6kn7hk3dqxpff1s095cg1caxzij3mxjbbxp8zy0l111"; meta = { @@ -29,4 +25,9 @@ in fetchzip { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ bergey ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 0427cf36429..4b67da84d99 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "3.003"; -in fetchzip { +in (fetchzip { name = "hack-font-${version}"; url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack - ''; - sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s"; meta = with lib; { @@ -37,4 +33,9 @@ in fetchzip { maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack + ''; +}) diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index d9deef80c0d..8c81bf52042 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.1"; -in fetchzip { +in (fetchzip { name = "hasklig-${version}"; url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - ''; - sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; meta = with lib; { @@ -21,4 +17,9 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ davidrusu Profpatsch ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip $downloadedFile + install -m444 -Dt $out/share/fonts/opentype *.otf + ''; +}) diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 09bcc2464ba..bd7e14a72f0 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -1,3 +1,4 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { fetchzip, lib }: let @@ -5,15 +6,10 @@ let pname = "HyperScrypt"; in -fetchzip { +(fetchzip { name = "${lib.toLower pname}-font-${version}"; url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip"; sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m"; - postFetch = '' - mkdir -p $out/share/fonts/{truetype,opentype} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf - unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf - ''; meta = with lib; { homepage = "http://velvetyne.fr/fonts/hyper-scrypt/"; @@ -37,4 +33,10 @@ fetchzip { maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/{truetype,opentype} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/${pname}.ttf + unzip -j $downloadedFile \*${pname}.otf -d $out/share/fonts/opentype/${pname}.otf + ''; +}) diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index f0405066492..c632338d59e 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "6.0.1"; -in fetchzip { +in (fetchzip { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype - ''; - sha256 = "sha256-HxO0L5Q6WJQBqtg64cczzuRcSYi4jEqbOzEWxDmqFp8="; meta = with lib; { @@ -23,4 +19,9 @@ in fetchzip { platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile "OpenType/*/*.otf" -x "OpenType/IBM-Plex-Sans-JP/unhinted/*" -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index ca01acd0c54..16adc93a9ee 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "3.19"; -in fetchzip { +in (fetchzip { name = "inter-${version}"; url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - sha256 = "sha256-8p15thg3xyvCA/8dH2jGQoc54nzESFDyv5m47FgWrSI="; meta = with lib; { @@ -21,5 +17,10 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ demize dtzWill ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index 5223bc499d5..9f3268f8d5b 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "ipaexfont-004.01"; url = "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; - sha256 = "0wp369kri33kb1mmiq4lpl9i4xnacw9fj63ycmkmlkq64s8qnjnx"; meta = with lib; { @@ -25,4 +21,9 @@ fetchzip { license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index 9bc9b82db0e..5dca9b9faa9 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "ipafont-003.03"; url = "https://moji.or.jp/wp-content/ipafont/IPAfont/IPAfont00303.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype - ''; - sha256 = "0lrjd0bfy36f9j85m12afg5nvr5id3sig2nmzs5qifskbd7mqv9h"; meta = { @@ -23,4 +19,9 @@ fetchzip { license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index 457cb0d03c9..676ec842c8d 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -1,16 +1,12 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' {lib, fetchzip}: let version = "3.5"; -in fetchzip { +in (fetchzip { name = "jost-${version}"; url = "https://github.com/indestructible-type/Jost/releases/download/${version}/Jost.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; meta = with lib; { @@ -19,4 +15,9 @@ in fetchzip { license = licenses.ofl; maintainers = [ maintainers.ar1a ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index 1e07123badc..2dbe43aa6ae 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "kawkab-mono-20151015"; url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - sha256 = "1vfrb7xs817najplncg7zl9j5yxj8qnwb7aqm2v9p9xwafa4d2yd"; meta = { @@ -17,6 +13,9 @@ fetchzip { homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; -} - - +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index 76effcf97cd..7fa894c1cc8 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "lato-2.0"; url = "https://www.latofonts.com/download/Lato2OFL.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato - ''; - sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; meta = with lib; { @@ -36,4 +32,9 @@ fetchzip { platforms = platforms.all; maintainers = with maintainers; [ chris-martin ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/lato + ''; +}) diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index 0530141317b..ebe4ceb88ca 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -1,17 +1,12 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.959"; -in fetchzip rec { +in (fetchzip rec { name = "lmmath-${version}"; url = "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; - postFetch = '' - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/latinmodern-math-${version}/ - unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ - unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ - ''; sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; meta = with lib; { @@ -24,4 +19,11 @@ in fetchzip rec { maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/opentype/ + mkdir -p $out/share/doc/latinmodern-math-${version}/ + unzip -j $downloadedFile "*/otf/*.otf" -d $out/share/fonts/opentype/ + unzip -j $downloadedFile "*/doc/*.txt" -d $out/share/doc/latinmodern-math-${version}/ + ''; +}) diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index eeb53904fe1..f0ff4c1b205 100644 --- a/pkgs/data/fonts/mno16/default.nix +++ b/pkgs/data/fonts/mno16/default.nix @@ -1,21 +1,22 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let pname = "mno16"; version = "1.0"; -in fetchzip rec { +in (fetchzip rec { name = "${pname}-${version}"; url = "https://github.com/sevmeyer/${pname}/releases/download/${version}/${name}.zip"; sha256 = "1x06nl281fcjk6g1p4cgrgxakmwcci6vvasskaygsqlzxd8ig87w"; - postFetch = '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; - meta = with lib; { description = "minimalist monospaced font"; homepage = "https://sev.dev/fonts/mno16"; license = licenses.cc0; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + ''; +}) diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index d48332b4a27..b45d130b1c2 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.3"; -in fetchzip { +in (fetchzip { name = "mononoki-${version}"; url = "https://github.com/madmalik/mononoki/releases/download/${version}/mononoki.zip"; - postFetch = '' - mkdir -p $out/share/fonts/mononoki - unzip -j $downloadedFile -d $out/share/fonts/mononoki - ''; - sha256 = "sha256-K2uOpJRmQ1NcDZfh6rorCF0MvGHFCsSW8J7Ue9OC/OY="; meta = with lib; { @@ -20,4 +16,9 @@ in fetchzip { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/mononoki + unzip -j $downloadedFile -d $out/share/fonts/mononoki + ''; +}) diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 5066a2aef4d..4a0e3c975f5 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "VER2.5"; fullName = "NanumGothicCoding-2.5"; -in fetchzip { +in (fetchzip { name = "nanum-gothic-coding"; url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip"; - postFetch = '' - mkdir -p $out/share/fonts/NanumGothicCoding - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding - ''; - sha256 = "0b3pkhd6xn6393zi0dhj3ah08w1y1ji9fl6584bi0c8lanamf2pc"; meta = with lib; { @@ -22,4 +18,9 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/NanumGothicCoding + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/NanumGothicCoding + ''; +}) diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index 8ed251de53d..cfa36870ed4 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let pname = "national-park-typeface"; version = "206464"; -in fetchzip { +in (fetchzip { name = "${pname}-${version}"; url = "https://files.cargocollective.com/c${version}/NationalPark.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ - ''; - sha256 = "044gh4xcasp8i9ny6z4nmns1am2pk5krc4ann2afq35v9bnl2q5d"; meta = with lib; { @@ -21,4 +17,9 @@ in fetchzip { license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile National\*.otf -d $out/share/fonts/opentype/ + ''; +}) diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index d4e4cf1ee0f..5d96ba55272 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.2"; pname = "norwester"; -in fetchzip { +in (fetchzip { name = "${pname}-${version}"; url = "http://jamiewilson.io/norwester/assets/norwester.zip"; - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ - ''; - sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; meta = with lib; { @@ -22,4 +18,9 @@ in fetchzip { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -D -j $downloadedFile ${pname}-v${version}/${pname}.otf -d $out/share/fonts/opentype/ + ''; +}) diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index ddff3666b0b..c6b7846a85f 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.2"; -in fetchzip rec { name = "oldstandard-${version}"; +in (fetchzip rec { + inherit name; url = "https://github.com/akryukov/oldstand/releases/download/v${version}/${name}.otf.zip"; - postFetch = '' - unzip $downloadedFile - install -m444 -Dt $out/share/fonts/opentype *.otf - install -m444 -Dt $out/share/doc/${name} FONTLOG.txt - ''; - sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; meta = with lib; { @@ -22,4 +18,10 @@ in fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip $downloadedFile + install -m444 -Dt $out/share/fonts/opentype *.otf + install -m444 -Dt $out/share/doc/${name} FONTLOG.txt + ''; +}) diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index f22ce9f882f..f34ff0c17b7 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -1,18 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2016-06-23"; -in fetchzip { +in (fetchzip { name = "open-dyslexic-${version}"; url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic - ''; - sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; meta = with lib; { @@ -22,4 +17,10 @@ in fetchzip { platforms = platforms.all; maintainers = [maintainers.rycee]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*/README.md -d $out/share/doc/open-dyslexic + ''; +}) diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 120098fd67f..553b4e52efd 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,19 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "3.0.5"; -in fetchzip rec { name = "overpass-${version}"; +in (fetchzip rec { + inherit name; url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts $out/share/doc - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.md -d $out/share/doc/${name} - ''; - sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; meta = with lib; { @@ -23,4 +18,11 @@ in fetchzip rec { platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts $out/share/doc + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.md -d $out/share/doc/${name} + ''; +}) diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 4dd6093922c..292e9466b96 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,6 +1,7 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "paratype-pt-mono"; urls = [ @@ -8,12 +9,6 @@ fetchzip { "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" ]; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; - sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; meta = with lib; { @@ -28,5 +23,10 @@ fetchzip { platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -} - +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype + ''; +}) diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 8b47dd9ee1f..1c976ecb489 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,6 +1,7 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "paratype-pt-sans"; urls = [ @@ -8,12 +9,6 @@ fetchzip { "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" ]; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; - sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; meta = with lib; { @@ -28,5 +23,10 @@ fetchzip { platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -} - +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype + ''; +}) diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index a4142f757fc..abe6c3d87f6 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,6 +1,7 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "paratype-pt-serif"; urls = [ @@ -8,12 +9,6 @@ fetchzip { "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" ]; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype - ''; - sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; meta = with lib; { @@ -28,5 +23,10 @@ fetchzip { platforms = platforms.all; maintainers = with maintainers; [ raskin ]; }; -} - +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.txt -d $out/share/doc/paratype + ''; +}) diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index be75da9e665..36fa7b136af 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -1,18 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.001"; -in fetchzip { +in (fetchzip { name = "public-sans-${version}"; url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - sha256 = "sha256-Ba7D4J72GZQsGn0KINRib9BmHsAnoEsAwAOC+M3CkMU="; meta = with lib; { @@ -23,4 +18,10 @@ in fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 0d62a866e0f..7841a203f7e 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.0"; -in fetchzip rec { name = "quattrocento-sans-${version}"; +in (fetchzip rec { + inherit name; url = "https://web.archive.org/web/20170709124317/http://www.impallari.com/media/releases/quattrocento-sans-v${version}.zip"; - postFetch = '' - mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype - unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} - ''; - sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; meta = with lib; { @@ -22,4 +18,10 @@ in fetchzip rec { platforms = platforms.all; maintainers = [maintainers.rycee]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile '*/QuattrocentoSans*.otf' -d $out/share/fonts/opentype + unzip -j $downloadedFile '*/FONTLOG.txt' -d $out/share/doc/${name} + ''; +}) diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index aa23175a04d..12f146c0e8f 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.1"; -in fetchzip rec { name = "quattrocento-${version}"; +in (fetchzip rec { + inherit name; url = "https://web.archive.org/web/20170707001804/http://www.impallari.com/media/releases/quattrocento-v${version}.zip"; - postFetch = '' - mkdir -p $out/share/{fonts,doc} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} - ''; - sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; meta = with lib; { @@ -22,4 +18,10 @@ in fetchzip rec { platforms = platforms.all; maintainers = [maintainers.rycee]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{fonts,doc} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*FONTLOG.txt -d $out/share/doc/${name} + ''; +}) diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index fe13fdf89d1..9f53eaa38cd 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.138"; -in fetchzip { +in (fetchzip { name = "roboto-${version}"; url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype - ''; - sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; meta = { @@ -26,4 +22,9 @@ in fetchzip { platforms = lib.platforms.all; maintainers = [ lib.maintainers.romildo ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.ttf -x __MACOSX/\* -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index e91d108ade8..07c7f6b0bc3 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -1,3 +1,4 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip, version ? "3.300" }: let @@ -6,20 +7,12 @@ let "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; "3.300" = "1bja1ma1mnna0qlk3dis31cvq5z1kgcqj7wjp8ml03zc5mpa2wb2"; }."${version}"; - -in fetchzip rec { name = "scheherazade${lib.optionalString new "-new"}-${version}"; - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; +in (fetchzip rec { + inherit name; - postFetch = '' - mkdir -p $out/share/{doc,fonts} - unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip $downloadedFile \*/documentation/\* -d $out/share/doc/ - mv $out/share/doc/* $out/share/doc/${name} - unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} - ''; + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; inherit sha256; @@ -47,4 +40,13 @@ in fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/{doc,fonts} + unzip -l $downloadedFile + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip $downloadedFile \*/documentation/\* -d $out/share/doc/ + mv $out/share/doc/* $out/share/doc/${name} + unzip -j $downloadedFile \*/FONTLOG.txt \*/README.txt -d $out/share/doc/${name} + ''; +}) diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index eaf82d412a1..37273530bb5 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -1,17 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.038"; -in fetchzip { +in (fetchzip { name = "source-code-pro-${version}"; url = "https://github.com/adobe-fonts/source-code-pro/releases/download/${version}R-ro%2F1.058R-it%2F1.018R-VAR/OTF-source-code-pro-${version}R-ro-1.058R-it.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - sha256 = "027cf62zj27q7l3d4sqzdfgz423lzysihdg8cvmkk6z910a1v368"; meta = { @@ -21,4 +17,9 @@ in fetchzip { homepage = "https://adobe-fonts.github.io/source-code-pro/"; license = lib.licenses.ofl; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix index 7f12fee5067..076291ab889 100644 --- a/pkgs/data/fonts/source-han-code-jp/default.nix +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let pname = "source-han-code-jp"; version = "2.012R"; -in fetchzip { +in (fetchzip { name = "${pname}-${version}"; url = "https://github.com/adobe-fonts/${pname}/archive/${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - sha256 = "16y5as1k864ghy3vzp8svr3q0sw57rv53za3f48700ksvxz5pwry"; meta = { @@ -22,4 +18,9 @@ in fetchzip { homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html"; license = lib.licenses.ofl; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 1672af411c0..edf8ecfaa49 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/pkgs/data/fonts/source-han/default.nix @@ -1,3 +1,4 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { stdenvNoCC , lib , fetchzip @@ -18,11 +19,11 @@ let lib.toUpper (lib.substring 0 1 family) + lib.substring 1 (lib.stringLength family) family; in - fetchzip { + (fetchzip { name = "source-han-${family}-${lib.removeSuffix "R" rev}"; url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; - inherit sha256 postFetch; + inherit sha256; meta = { description = "An open source Pan-CJK ${description} typeface"; @@ -30,7 +31,7 @@ let license = lib.licenses.ofl; maintainers = with lib.maintainers; [ taku0 emily ]; }; - }; + }).overrideAttrs (_: { inherit postFetch; }); in { sans = makePackage { diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 879f5083e23..382c20aa976 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -1,3 +1,4 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: # Source Sans Pro got renamed to Source Sans 3 (see @@ -6,18 +7,11 @@ # with older documents/templates/etc. let version = "3.006"; -in fetchzip { +in (fetchzip { name = "source-sans-pro-${version}"; url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; - sha256 = "sha256-uWr/dFyLF65v0o6+oN/3RQoe4ziPspzGB1rgiBkoTYY="; meta = with lib; { @@ -27,4 +21,11 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; +}) diff --git a/pkgs/data/fonts/source-sans/default.nix b/pkgs/data/fonts/source-sans/default.nix index c16d0d2b8b4..94df27765ee 100644 --- a/pkgs/data/fonts/source-sans/default.nix +++ b/pkgs/data/fonts/source-sans/default.nix @@ -1,19 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "3.046"; -in fetchzip { +in (fetchzip { name = "source-sans-${version}"; url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; - sha256 = "1wxdinnliq0xqbjrs0sqykwaggkmyqawfq862d9xn05g1pnxda94"; meta = with lib; { @@ -23,4 +17,11 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; +}) diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index a4d472d6085..8f2ae0f7990 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -1,3 +1,4 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: # Source Serif Pro got renamed to Source Serif 4 (see @@ -6,18 +7,11 @@ # with older documents/templates/etc. let version = "3.001"; -in fetchzip { +in (fetchzip { name = "source-serif-pro-${version}"; url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-pro-${version}R.zip"; - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; - sha256 = "sha256-rYWk8D41QMuuSP+cQMk8ttT7uX3a7gBk4OqjA7K9udk="; meta = with lib; { @@ -27,4 +21,11 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; +}) diff --git a/pkgs/data/fonts/source-serif/default.nix b/pkgs/data/fonts/source-serif/default.nix index 855fe7e6e9e..3c61627183c 100644 --- a/pkgs/data/fonts/source-serif/default.nix +++ b/pkgs/data/fonts/source-serif/default.nix @@ -1,19 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "4.004"; -in fetchzip { +in (fetchzip { name = "source-serif-${version}"; url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts/{opentype,truetype,variable} - unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype - unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype - unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable - ''; - sha256 = "06814hcp20abca6p0ii61f23g6h1ibqyhq30lsva59wbwx5iha0h"; meta = with lib; { @@ -23,4 +17,11 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/{opentype,truetype,variable} + unzip -j $downloadedFile "*/OTF/*.otf" -d $out/share/fonts/opentype + unzip -j $downloadedFile "*/TTF/*.ttf" -d $out/share/fonts/truetype + unzip -j $downloadedFile "*/VAR/*.otf" -d $out/share/fonts/variable + ''; +}) diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index c05c1273a48..fb494391a87 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -1,20 +1,15 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.13"; in -fetchzip { +(fetchzip { name = "stix-two-${version}"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; sha256 = "sha256-cBtZe/oq4bQCscSAhJ4YuTSghDleD9O/+3MHOJyI50o="; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - meta = with lib; { homepage = "https://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; @@ -22,4 +17,10 @@ fetchzip { platforms = platforms.all; maintainers = [ maintainers.rycee ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index e1b43e39c60..c4af97c7cc2 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,16 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "0.64"; -in fetchzip { +in (fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; sha256 = "sha256-ewLTeIVY76eq5mHTnjIsJ5Q2CMuBqXJzxvjZTONPsr8="; - postFetch = '' - mkdir -p $out/share/fonts/ - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ - ''; meta = with lib; { description = "Font for programmers and command line users"; homepage = "https://www.kutilek.de/sudo-font/"; @@ -19,4 +16,9 @@ in fetchzip { maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype/ + ''; +}) diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 3eca29882d8..3c9494f1c04 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,23 +1,13 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "4.49.1"; -in fetchzip { +in (fetchzip { name = "terminus-font-ttf-${version}"; url = "https://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip"; - postFetch = '' - unzip -j $downloadedFile - - for i in *.ttf; do - local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" - install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" - done - - install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" - ''; - sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; meta = with lib; { @@ -30,4 +20,15 @@ in fetchzip { license = licenses.ofl; maintainers = with maintainers; [ ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip -j $downloadedFile + + for i in *.ttf; do + local destname="$(echo "$i" | sed -E 's|-[[:digit:].]+\.ttf$|.ttf|')" + install -Dm 644 "$i" "$out/share/fonts/truetype/$destname" + done + + install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" + ''; +}) diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index 360d32f3e62..69107f4a8e5 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -1,19 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.0"; -in fetchzip rec { name = "theano-${version}"; +in (fetchzip rec { + inherit name; url = "https://github.com/akryukov/theano/releases/download/v${version}/theano-${version}.otf.zip"; - postFetch = '' - mkdir -p $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" - ''; - sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; meta = with lib; { @@ -23,4 +18,11 @@ in fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.txt -d "$out/share/doc/${name}" + ''; +}) diff --git a/pkgs/data/fonts/times-newer-roman/default.nix b/pkgs/data/fonts/times-newer-roman/default.nix index 4bfe358d13e..8f6e7eceb0c 100644 --- a/pkgs/data/fonts/times-newer-roman/default.nix +++ b/pkgs/data/fonts/times-newer-roman/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "unstable-2018-09-11"; in -fetchzip { +(fetchzip { name = "times-newer-roman-${version}"; url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip"; - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - hash = "sha256-Hx59RYLLwfimEQjEEes0lCpg6iql46DFwhQ7kVGiEzc="; meta = with lib; { @@ -22,4 +18,9 @@ fetchzip { maintainers = with maintainers; [ ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 4733bcf04e7..2c945f24528 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.2"; in -fetchzip { +(fetchzip { name = "ultimate-oldschool-pc-font-pack-${version}"; url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_linux.zip"; sha256 = "sha256-BOA2fMa2KT3Bkpvj/0DzrzuZbl3RARvNn4qbI/+dApU="; - postFetch= '' - mkdir -p $out/share/fonts/truetype - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - ''; - meta = with lib; { description = "The Ultimate Oldschool PC Font Pack (TTF Fonts)"; homepage = "https://int10h.org/oldschool-pc-fonts/"; @@ -20,4 +16,9 @@ fetchzip { license = licenses.cc-by-sa-40; maintainers = [ maintainers.endgame ]; }; -} +}).overrideAttrs (_: { + postFetch= '' + mkdir -p $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; +}) diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 5773aa94d5b..fe694a5e31a 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: - -fetchzip rec { - name = "undefined-medium-1.0"; +let name = "undefined-medium-1.0"; +in (fetchzip rec { + inherit name; url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype - ''; - sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk"; meta = with lib; { @@ -23,4 +19,9 @@ fetchzip rec { license = licenses.ofl; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile ${name}/fonts/otf/\*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/vollkorn/default.nix b/pkgs/data/fonts/vollkorn/default.nix index 6c5836da5b0..b5e3a8e5729 100644 --- a/pkgs/data/fonts/vollkorn/default.nix +++ b/pkgs/data/fonts/vollkorn/default.nix @@ -1,14 +1,23 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, stdenv, fetchzip }: let pname = "vollkorn"; version = "4.105"; in -fetchzip { +(fetchzip { name = "${pname}-${version}"; url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss"; stripRoot = false; + meta = with lib; { + homepage = "http://vollkorn-typeface.com/"; + description = "The free and healthy typeface for bread and butter use"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.schmittlauch ]; + }; +}).overrideAttrs (_: { postFetch = '' mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} unzip $downloadedFile @@ -18,12 +27,4 @@ fetchzip { cp -v WOFF/*.woff $out/share/fonts/WOFF cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 ''; - - meta = with lib; { - homepage = "http://vollkorn-typeface.com/"; - description = "The free and healthy typeface for bread and butter use"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.schmittlauch ]; - }; -} +}) diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index a979dca4477..7171f65cb68 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -1,19 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.0.12"; -in fetchzip { +in (fetchzip { name = "weather-icons-${version}"; url = "https://github.com/erikflowers/weather-icons/archive/refs/tags/${version}.zip"; sha256 = "sha256-NGPzAloeZa1nCazb+mjAbYw7ZYYDoKpLwcvzg1Ly9oM="; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype - ''; - - meta = with lib; { description = "Weather Icons"; longDescription = '' @@ -26,4 +21,9 @@ in fetchzip { platforms = platforms.all; maintainers = with maintainers; [ pnelson ]; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/work-sans/default.nix b/pkgs/data/fonts/work-sans/default.nix index 49722fc3e01..208f3701057 100644 --- a/pkgs/data/fonts/work-sans/default.nix +++ b/pkgs/data/fonts/work-sans/default.nix @@ -1,18 +1,14 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "2.010"; in -fetchzip { +(fetchzip { name = "work-sans-${version}"; url = "https://github.com/weiweihuanghuang/Work-Sans/archive/refs/tags/v${version}.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile "*/fonts/*.ttf" -d $out/share/fonts/opentype - ''; - sha256 = "sha256-S4O5EoKY4w/p+MHeHRCmPyQRAOUfEwNiETxMgNcsrws="; meta = with lib; { @@ -22,4 +18,9 @@ fetchzip { maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile "*/fonts/*.ttf" -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix index bd610938154..2b1a967043d 100644 --- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -1,15 +1,11 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: -fetchzip { +(fetchzip { name = "yanone-kaffeesatz-2004"; url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - sha256 = "190c4wx7avy3kp98lsyml7kc0jw7csf5n79af2ypbkhsadfsy8di"; meta = { @@ -19,4 +15,9 @@ fetchzip { homepage = "https://yanone.de/fonts/kaffeesatz/"; license = lib.licenses.ofl; }; -} +}).overrideAttrs (_: { + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; +}) diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix index a244c04a65c..e3dd19c7112 100644 --- a/pkgs/data/fonts/zilla-slab/default.nix +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -1,16 +1,12 @@ +# when changing this expression convert it from 'fetchzip' to 'stdenvNoCC.mkDerivation' { lib, fetchzip }: let version = "1.002"; -in fetchzip { +in (fetchzip { name = "zilla-slab-${version}"; url = "https://github.com/mozilla/zilla-slab/releases/download/v${version}/Zilla-Slab-Fonts-v${version}.zip"; - postFetch = '' - unzip $downloadedFile - mkdir -p $out/share/fonts/truetype - cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ - ''; sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; meta = with lib; { @@ -30,4 +26,10 @@ in fetchzip { maintainers = with maintainers; [ caugner ]; platforms = platforms.all; }; -} +}).overrideAttrs (_: { + postFetch = '' + unzip $downloadedFile + mkdir -p $out/share/fonts/truetype + cp -v zilla-slab/ttf/*.ttf $out/share/fonts/truetype/ + ''; +}) |