summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-06-18 23:12:18 +0200
committerSilvan Mosberger <contact@infinisil.com>2020-06-18 23:12:18 +0200
commit78453e6ba67a547ce9f0be9d96cd1c27790460d0 (patch)
tree42a1bd2da3cbe4ebc5c11ef4f17c3cd8075c44c4 /nixos/modules/config
parenta1aecffc971202acaca5882e87510d2a15a000f7 (diff)
downloadnixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.tar
nixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.tar.gz
nixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.tar.bz2
nixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.tar.lz
nixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.tar.xz
nixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.tar.zst
nixpkgs-78453e6ba67a547ce9f0be9d96cd1c27790460d0.zip
nixos/fontconfig: Move deprecated ultimate removals to relevant module
This was a mistake in https://github.com/NixOS/nixpkgs/pull/61570, this
does not belong to prometheus
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 = {