summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-06-19 00:07:46 +0200
committerGitHub <noreply@github.com>2020-06-19 00:07:46 +0200
commitf5f8b08f16a49e527b2c583b9a7082eb12cfed15 (patch)
treefc19661a7947d4f4516c60431a72de23a6e36459 /nixos/modules/config
parent54f53575c2ea83f9d6872ff4be6ff31b33c2d710 (diff)
parent78453e6ba67a547ce9f0be9d96cd1c27790460d0 (diff)
downloadnixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.tar
nixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.tar.gz
nixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.tar.bz2
nixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.tar.lz
nixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.tar.xz
nixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.tar.zst
nixpkgs-f5f8b08f16a49e527b2c583b9a7082eb12cfed15.zip
Merge pull request #91065 from Infinisil/move-fontultimate
nixos/fontconfig: Move deprecated ultimate removals to relevant module
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/fonts/fontconfig.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 6ac64b0ec9c..ac2a024eaa8 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -278,7 +278,14 @@ in
     (mkRemovedOptionModule [ "fonts" "fontconfig" "hinting" "style" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
     (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
-  ];
+  ] ++ lib.forEach [ "enable" "substitutions" "preset" ]
+     (opt: lib.mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''
+       The fonts.fontconfig.ultimate module and configuration is obsolete.
+       The repository has since been archived and activity has ceased.
+       https://github.com/bohoomil/fontconfig-ultimate/issues/171.
+       No action should be needed for font configuration, as the fonts.fontconfig
+       module is already used by default.
+     '');
 
   options = {