Merge master into haskell-updates

4 files changed, 20 insertions, 13 deletions

diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix
index 29569d1137aa5..895e70a544b99 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 f8ffc6a2b8e66..059350da7d4f2 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
 
diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 1d7ed6640979f..04f89b6d2a1f3 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = if set != null then "iosevka-${set}" else "iosevka";
-  version = "27.3.4";
+  version = "27.3.5";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-JsK2jzXyAACh9e3P2y0YLky2XQuR/dKyEbRpFUSnJdM=";
+    hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I=";
   };
 
-  npmDepsHash = "sha256-uchJ+1NWbo4FpNOjOO3luhIdZyQZLToZ1UCMLdGzjkY=";
+  npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg=";
 
   nativeBuildInputs = [
     remarshal
diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix
index 25923f3cfc773..1a6537a0096fe 100644
--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/pkgs/data/fonts/material-design-icons/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "material-design-icons";
-  version = "7.2.96";
+  version = "7.3.67";
 
   src = fetchFromGitHub {
     owner = "Templarian";
     repo = "MaterialDesign-Webfont";
     rev = "v${version}";
-    sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM=";
+    sha256 = "sha256-gQT+5MqYo1qUiLJTzlhF5dB5BZMtr34JWn9rMa9MJvQ=";
     sparseCheckout = [ "fonts" ];
   };