Obsolete fonts.extraFonts

You can now just set fonts.fonts, which will be merged with the
default value unless you use mkOverride.

nixos/modules/config/fonts/corefonts.nix

@@ -25,7 +25,7 @@ with lib;
 
   config = mkIf config.fonts.enableCoreFonts {
 
-    fonts.extraFonts = [ pkgs.corefonts ];
+    fonts.fonts = [ pkgs.corefonts ];
 
   };
 

nixos/modules/config/fonts/fonts.nix

@@ -10,18 +10,26 @@ with lib;
 
       # TODO: find another name for it.
       fonts = mkOption {
-        default = [
-          # - the user's current profile
+        example = [ pkgs.dejavu_fonts ];
+        description = "List of primary font paths.";
+        apply = list: list ++
+          [ # - the user's current profile
             "~/.nix-profile/lib/X11/fonts"
             "~/.nix-profile/share/fonts"
             # - the default profile
             "/nix/var/nix/profiles/default/lib/X11/fonts"
             "/nix/var/nix/profiles/default/share/fonts"
           ];
-        description = "List of primary font paths.";
-        apply = list: list ++ [
-          # - a few statically built locations
-          pkgs.xorg.fontbhttf
+      };
+
+    };
+
+  };
+
+  config = {
+
+    fonts.fonts =
+      [ pkgs.xorg.fontbhttf
         pkgs.xorg.fontbhlucidatypewriter100dpi
         pkgs.xorg.fontbhlucidatypewriter75dpi
         pkgs.ttf_bitstream_vera
@@ -30,17 +38,7 @@ with lib;
         pkgs.xorg.fontbh100dpi
         pkgs.xorg.fontmiscmisc
         pkgs.xorg.fontcursormisc
-        ]
-        ++ config.fonts.extraFonts;
-      };
-
-      extraFonts = mkOption {
-        default = [];
-        example = [ pkgs.dejavu_fonts ];
-        description = "List of packages with additional fonts.";
-      };
-
-    };
+      ];
 
   };
 

nixos/modules/config/fonts/ghostscript.nix

@@ -25,7 +25,7 @@ with lib;
 
   config = mkIf config.fonts.enableGhostscriptFonts {
 
-    fonts.extraFonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
+    fonts.fonts = [ "${pkgs.ghostscript}/share/ghostscript/fonts" ];
 
   };
 

nixos/modules/rename.nix

@@ -74,6 +74,7 @@ in zipModules ([]
 ++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ]
 ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ]
 ++ obsolete [ "environment" "nix" ] [ "nix" "package" ]
+++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]
 
 ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ]
 ++ obsolete [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]

nixos/modules/services/x11/desktop-managers/gnome3.nix

@@ -64,7 +64,7 @@ in {
     networking.networkmanager.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
-    fonts.extraFonts = [ pkgs.dejavu_fonts ];
+    fonts.fonts = [ pkgs.dejavu_fonts ];
 
     services.xserver.desktopManager.session = singleton
       { name = "gnome3";