Merge pull request #72369 from worldofpeace/corefonts-drop
nixos/fontconfig-ultimate: remove
This commit is contained in:
worldofpeace
GitHub
commit
7c716705fd
|
|
@ -1,36 +0,0 @@
|
|||
# This module is deprecated, since you can just say ‘fonts.fonts = [
|
||||
# pkgs.corefonts ];’ instead.
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
|
||||
options = {
|
||||
|
||||
fonts = {
|
||||
|
||||
enableCoreFonts = mkOption {
|
||||
visible = false;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to include Microsoft's proprietary Core Fonts. These fonts
|
||||
are redistributable, but only verbatim, among other restrictions.
|
||||
See <link xlink:href="http://corefonts.sourceforge.net/eula.htm"/>
|
||||
for details.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
|
||||
config = mkIf config.fonts.enableCoreFonts {
|
||||
|
||||
fonts.fonts = [ pkgs.corefonts ];
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let cfg = config.fonts.fontconfig.ultimate;
|
||||
|
||||
latestVersion = pkgs.fontconfig.configVersion;
|
||||
|
||||
# The configuration to be included in /etc/font/
|
||||
confPkg = pkgs.runCommand "font-ultimate-conf" { preferLocalBuild = true; } ''
|
||||
support_folder=$out/etc/fonts/conf.d
|
||||
latest_folder=$out/etc/fonts/${latestVersion}/conf.d
|
||||
|
||||
mkdir -p $support_folder
|
||||
mkdir -p $latest_folder
|
||||
|
||||
# fontconfig ultimate substitutions
|
||||
${optionalString (cfg.substitutions != "none") ''
|
||||
ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \
|
||||
$support_folder
|
||||
ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \
|
||||
$latest_folder
|
||||
''}
|
||||
|
||||
# fontconfig ultimate various configuration files
|
||||
ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/conf.d/*.conf \
|
||||
$support_folder
|
||||
ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/conf.d/*.conf \
|
||||
$latest_folder
|
||||
'';
|
||||
|
||||
in
|
||||
{
|
||||
|
||||
options = {
|
||||
|
||||
fonts = {
|
||||
|
||||
fontconfig = {
|
||||
|
||||
ultimate = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable fontconfig-ultimate settings (formerly known as
|
||||
Infinality). Besides the customizable settings in this NixOS
|
||||
module, fontconfig-ultimate also provides many font-specific
|
||||
rendering tweaks.
|
||||
'';
|
||||
};
|
||||
|
||||
substitutions = mkOption {
|
||||
type = types.enum ["free" "combi" "ms" "none"];
|
||||
default = "free";
|
||||
description = ''
|
||||
Font substitutions to replace common Type 1 fonts with nicer
|
||||
TrueType fonts. <literal>free</literal> uses free fonts,
|
||||
<literal>ms</literal> uses Microsoft fonts,
|
||||
<literal>combi</literal> uses a combination, and
|
||||
<literal>none</literal> disables the substitutions.
|
||||
'';
|
||||
};
|
||||
|
||||
preset = mkOption {
|
||||
type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"];
|
||||
default = "ultimate3";
|
||||
description = ''
|
||||
FreeType rendering settings preset. Any of the presets may be
|
||||
customized by setting environment variables.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
|
||||
|
||||
fonts.fontconfig.confPackages = [ confPkg ];
|
||||
environment.variables.INFINALITY_FT = cfg.preset;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -1,9 +1,7 @@
|
|||
[
|
||||
./config/debug-info.nix
|
||||
./config/fonts/corefonts.nix
|
||||
./config/fonts/fontconfig.nix
|
||||
./config/fonts/fontconfig-penultimate.nix
|
||||
./config/fonts/fontconfig-ultimate.nix
|
||||
./config/fonts/fontdir.nix
|
||||
./config/fonts/fonts.nix
|
||||
./config/fonts/ghostscript.nix
|
||||
|
|
|
|||
|
|
@ -234,6 +234,7 @@ with lib;
|
|||
(mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")
|
||||
(mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")
|
||||
(mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")
|
||||
(mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")
|
||||
|
||||
# ZSH
|
||||
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
|
||||
|
|
@ -291,5 +292,14 @@ with lib;
|
|||
(opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''
|
||||
The prometheus exporters are now configured using `services.prometheus.exporters'.
|
||||
See the 18.03 release notes for more information.
|
||||
'' ))
|
||||
|
||||
++ (forEach [ "enable" "substitutions" "preset" ]
|
||||
(opt: 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.
|
||||
'' ));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
{ stdenv, fetchFromGitHub }:
|
||||
|
||||
let version = "2016-04-23"; in
|
||||
stdenv.mkDerivation {
|
||||
pname = "fontconfig-ultimate";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498";
|
||||
rev = version;
|
||||
repo = "fontconfig-ultimate";
|
||||
owner = "bohoomil";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/etc/fonts/conf.d
|
||||
cp conf.d.infinality/*.conf $out/etc/fonts/conf.d
|
||||
|
||||
# Base rendering settings will be determined by NixOS module
|
||||
rm $out/etc/fonts/conf.d/10-base-rendering.conf
|
||||
|
||||
# Options controlled by NixOS module
|
||||
rm $out/etc/fonts/conf.d/35-repl-custom.conf
|
||||
rm $out/etc/fonts/conf.d/38-repl-*.conf
|
||||
rm $out/etc/fonts/conf.d/82-*.conf
|
||||
rm $out/etc/fonts/conf.d/83-*.conf
|
||||
|
||||
# Inclusion of local and user configs handled by global configuration
|
||||
rm $out/etc/fonts/conf.d/29-local.conf
|
||||
rm $out/etc/fonts/conf.d/28-user.conf
|
||||
|
||||
cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d
|
||||
|
||||
# fix font priority issue https://github.com/bohoomil/fontconfig-ultimate/issues/173
|
||||
mv $out/etc/fonts/conf.d/{43,60}-wqy-zenhei-sharp.conf
|
||||
|
||||
mkdir -p $out/etc/fonts/presets/{combi,free,ms}
|
||||
cp fontconfig_patches/combi/*.conf $out/etc/fonts/presets/combi
|
||||
cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free
|
||||
cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Font configuration files, patches, scripts and source packages (Infinality & friends)";
|
||||
homepage = https://github.com/bohoomil/fontconfig-ultimate;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -106,6 +106,11 @@ mapAliases ({
|
|||
firefoxWrapper = firefox; # 2015-09
|
||||
flameGraph = flamegraph; # added 2018-04-25
|
||||
font-awesome-ttf = font-awesome; # 2018-02-25
|
||||
# 2019-10-31
|
||||
fontconfig-ultimate = throw ''
|
||||
fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years.
|
||||
https://github.com/bohoomil/fontconfig-ultimate/issues/171.
|
||||
'';
|
||||
font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12
|
||||
foomatic_filters = foomatic-filters; # 2016-08
|
||||
fuse_exfat = exfat; # 2015-09-11
|
||||
|
|
|
|||
|
|
@ -11029,8 +11029,6 @@ in
|
|||
|
||||
fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {};
|
||||
|
||||
fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};
|
||||
|
||||
folly = callPackage ../development/libraries/folly { };
|
||||
|
||||
folks = callPackage ../development/libraries/folks { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue