diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-12 19:45:20 +0100 |
| commit | 74d102ce50f5d71e193a27b899e96739dadeed2f (patch) | |
| tree | 333dadf38ed34c5d783422b0d6b9f0c03a2b4a58 /pkgs/data | |
| parent | 2c237f6180dc06bdd5214ac5216c7e42e5c0d5b1 (diff) | |
| parent | 12c5150ee5702e3d87049e88f58f35cc88e0dccf (diff) | |
| download | nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.gz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.bz2 nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.lz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.xz nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.tar.zst nixpkgs-74d102ce50f5d71e193a27b899e96739dadeed2f.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/fonts/commit-mono/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/data/fonts/corefonts/default.nix | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index 29569d1137a..895e70a544b 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.139"; + version = "1.141"; src = fetchzip { url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; - hash = "sha256-TrXuWQzNlJsFwwOsnLuCCEj/9B9XrTNHSDVES68gIYs="; + hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; stripRoot = false; }; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index f8ffc6a2b8e..059350da7d4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab # rename to more standard names + # handle broken macOS file-system mv andalemo.ttf Andale_Mono.ttf mv ariblk.ttf Arial_Black.ttf - mv arial.ttf Arial.ttf + mv arial.ttf Arial.ttf.tmp + mv Arial.ttf.tmp Arial.ttf mv arialbd.ttf Arial_Bold.ttf mv arialbi.ttf Arial_Bold_Italic.ttf mv ariali.ttf Arial_Italic.ttf @@ -51,12 +53,15 @@ stdenv.mkDerivation { mv courbd.ttf Courier_New_Bold.ttf mv couri.ttf Courier_New_Italic.ttf mv courbi.ttf Courier_New_Bold_Italic.ttf - mv georgia.ttf Georgia.ttf + mv georgia.ttf Georgia.ttf.tmp + mv Georgia.ttf.tmp Georgia.ttf mv georgiab.ttf Georgia_Bold.ttf mv georgiai.ttf Georgia_Italic.ttf mv georgiaz.ttf Georgia_Bold_Italic.ttf - mv impact.ttf Impact.ttf - mv tahoma.ttf Tahoma.ttf + mv impact.ttf Impact.ttf.tmp + mv Impact.ttf.tmp Impact.ttf + mv tahoma.ttf Tahoma.ttf.tmp + mv Tahoma.ttf.tmp Tahoma.ttf mv times.ttf Times_New_Roman.ttf mv timesbd.ttf Times_New_Roman_Bold.ttf mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf @@ -65,11 +70,13 @@ stdenv.mkDerivation { mv trebucbd.ttf Trebuchet_MS_Bold.ttf mv trebucit.ttf Trebuchet_MS_Italic.ttf mv trebucbi.ttf Trebuchet_MS_Italic.ttf - mv verdana.ttf Verdana.ttf + mv verdana.ttf Verdana.ttf.tmp + mv Verdana.ttf.tmp Verdana.ttf mv verdanab.ttf Verdana_Bold.ttf mv verdanai.ttf Verdana_Italic.ttf mv verdanaz.ttf Verdana_Bold_Italic.ttf - mv webdings.ttf Webdings.ttf + mv webdings.ttf Webdings.ttf.tmp + mv Webdings.ttf.tmp Webdings.ttf install -m444 -Dt $out/share/fonts/truetype *.ttf |