commit 7c716705fd05d2fd15dd197cc7f531fd84c59d20 · pyrox.dev/nixpkgs

-36

nixos/modules/config/fonts/corefonts.nix

···

       1
       1
       -
       # This module is deprecated, since you can just say ‘fonts.fonts = [

     

       2
       2
       -
       # pkgs.corefonts ];’ instead.

     

       3
       3
       -
       

     

       4
       4
       -
       { config, lib, pkgs, ... }:

     

       5
       5
       -
       

     

       6
       6
       -
       with lib;

     

       7
       7
       -
       

     

       8
       8
       -
       {

     

       9
       9
       -
       

     

       10
       10
       -
         options = {

     

       11
       11
       -
       

     

       12
       12
       -
           fonts = {

     

       13
       13
       -
       

     

       14
       14
       -
             enableCoreFonts = mkOption {

     

       15
       15
       -
               visible = false;

     

       16
       16
       -
               default = false;

     

       17
       17
       -
               description = ''

     

       18
       18
       -
                 Whether to include Microsoft's proprietary Core Fonts.  These fonts

     

       19
       19
       -
                 are redistributable, but only verbatim, among other restrictions.

     

       20
       20
       -
                 See <link xlink:href="http://corefonts.sourceforge.net/eula.htm"/>

     

       21
       21
       -
                 for details.

     

       22
       22
       -
              '';

     

       23
       23
       -
             };

     

       24
       24
       -
       

     

       25
       25
       -
           };

     

       26
       26
       -
       

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       29
       -
       

     

       30
       30
       -
         config = mkIf config.fonts.enableCoreFonts {

     

       31
       31
       -
       

     

       32
       32
       -
           fonts.fonts = [ pkgs.corefonts ];

     

       33
       33
       -
       

     

       34
       34
       -
         };

     

       35
       35
       -
       

     

       36
       36
       -
       }

-86

nixos/modules/config/fonts/fontconfig-ultimate.nix

···

       1
       1
       -
       { config, pkgs, lib, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let cfg = config.fonts.fontconfig.ultimate;

     

       6
       6
       -
       

     

       7
       7
       -
           latestVersion  = pkgs.fontconfig.configVersion;

     

       8
       8
       -
       

     

       9
       9
       -
           # The configuration to be included in /etc/font/

     

       10
       10
       -
           confPkg = pkgs.runCommand "font-ultimate-conf" { preferLocalBuild = true; } ''

     

       11
       11
       -
             support_folder=$out/etc/fonts/conf.d

     

       12
       12
       -
             latest_folder=$out/etc/fonts/${latestVersion}/conf.d

     

       13
       13
       -
       

     

       14
       14
       -
             mkdir -p $support_folder

     

       15
       15
       -
             mkdir -p $latest_folder

     

       16
       16
       -
       

     

       17
       17
       -
             # fontconfig ultimate substitutions

     

       18
       18
       -
             ${optionalString (cfg.substitutions != "none") ''

     

       19
       19
       -
             ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \

     

       20
       20
       -
                   $support_folder

     

       21
       21
       -
             ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \

     

       22
       22
       -
                   $latest_folder

     

       23
       23
       -
             ''}

     

       24
       24
       -
       

     

       25
       25
       -
             # fontconfig ultimate various configuration files

     

       26
       26
       -
             ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/conf.d/*.conf \

     

       27
       27
       -
                   $support_folder

     

       28
       28
       -
             ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/conf.d/*.conf \

     

       29
       29
       -
                   $latest_folder

     

       30
       30
       -
           '';

     

       31
       31
       -
       

     

       32
       32
       -
       in

     

       33
       33
       -
       {

     

       34
       34
       -
       

     

       35
       35
       -
         options = {

     

       36
       36
       -
       

     

       37
       37
       -
           fonts = {

     

       38
       38
       -
       

     

       39
       39
       -
             fontconfig = {

     

       40
       40
       -
       

     

       41
       41
       -
               ultimate = {

     

       42
       42
       -
                 enable = mkOption {

     

       43
       43
       -
                   type = types.bool;

     

       44
       44
       -
                   default = false;

     

       45
       45
       -
                   description = ''

     

       46
       46
       -
                     Enable fontconfig-ultimate settings (formerly known as

     

       47
       47
       -
                     Infinality). Besides the customizable settings in this NixOS

     

       48
       48
       -
                     module, fontconfig-ultimate also provides many font-specific

     

       49
       49
       -
                     rendering tweaks.

     

       50
       50
       -
                   '';

     

       51
       51
       -
                 };

     

       52
       52
       -
       

     

       53
       53
       -
                 substitutions = mkOption {

     

       54
       54
       -
                   type = types.enum ["free" "combi" "ms" "none"];

     

       55
       55
       -
                   default = "free";

     

       56
       56
       -
                   description = ''

     

       57
       57
       -
                     Font substitutions to replace common Type 1 fonts with nicer

     

       58
       58
       -
                     TrueType fonts. <literal>free</literal> uses free fonts,

     

       59
       59
       -
                     <literal>ms</literal> uses Microsoft fonts,

     

       60
       60
       -
                     <literal>combi</literal> uses a combination, and

     

       61
       61
       -
                     <literal>none</literal> disables the substitutions.

     

       62
       62
       -
                   '';

     

       63
       63
       -
                 };

     

       64
       64
       -
       

     

       65
       65
       -
                 preset = mkOption {

     

       66
       66
       -
                   type = types.enum ["ultimate1" "ultimate2" "ultimate3" "ultimate4" "ultimate5" "osx" "windowsxp"];

     

       67
       67
       -
                   default = "ultimate3";

     

       68
       68
       -
                   description = ''

     

       69
       69
       -
                     FreeType rendering settings preset. Any of the presets may be

     

       70
       70
       -
                     customized by setting environment variables.

     

       71
       71
       -
                   '';

     

       72
       72
       -
                 };

     

       73
       73
       -
               };

     

       74
       74
       -
             };

     

       75
       75
       -
           };

     

       76
       76
       -
       

     

       77
       77
       -
         };

     

       78
       78
       -
       

     

       79
       79
       -
         config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {

     

       80
       80
       -
       

     

       81
       81
       -
           fonts.fontconfig.confPackages = [ confPkg ];

     

       82
       82
       -
           environment.variables.INFINALITY_FT = cfg.preset;

     

       83
       83
       -
       

     

       84
       84
       -
         };

     

       85
       85
       -
       

     

       86
       86
       -
       }

-2

nixos/modules/module-list.nix

···

       1
       1
        
       [

     

       2
       2
        
         ./config/debug-info.nix

     

       3
       3
       -
         ./config/fonts/corefonts.nix

     

       4
       3
        
         ./config/fonts/fontconfig.nix

     

       5
       4
        
         ./config/fonts/fontconfig-penultimate.nix

     

       6
       6
       -
         ./config/fonts/fontconfig-ultimate.nix

     

       7
       5
        
         ./config/fonts/fontdir.nix

     

       8
       6
        
         ./config/fonts/fonts.nix

     

       9
       7
        
         ./config/fonts/ghostscript.nix

+10

nixos/modules/rename.nix

···

       234
       234
        
           (mkRemovedOptionModule [ "services" "mysql" "rootPassword" ] "Use socket authentication or set the password outside of the nix store.")

     

       235
       235
        
           (mkRemovedOptionModule [ "services" "zabbixServer" "dbPassword" ] "Use services.zabbixServer.database.passwordFile instead.")

     

       236
       236
        
           (mkRemovedOptionModule [ "systemd" "generator-packages" ] "Use systemd.packages instead.")

     

       237
       237
       +
           (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.")

     

       237
       238
        
       

     

       238
       239
        
           # ZSH

     

       239
       240
        
           (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])

     
···

       291
       292
        
              (opt: mkRemovedOptionModule [ "services" "prometheus" "${opt}" ] ''

     

       292
       293
        
                The prometheus exporters are now configured using `services.prometheus.exporters'.

     

       293
       294
        
                See the 18.03 release notes for more information.

     

       295
       295
       +
              '' ))

     

       296
       296
       +
       

     

       297
       297
       +
           ++ (forEach [ "enable" "substitutions" "preset" ]

     

       298
       298
       +
              (opt: mkRemovedOptionModule [ "fonts" "fontconfig" "ultimate" "${opt}" ] ''

     

       299
       299
       +
                The fonts.fontconfig.ultimate module and configuration is obsolete.

     

       300
       300
       +
                The repository has since been archived and activity has ceased.

     

       301
       301
       +
                https://github.com/bohoomil/fontconfig-ultimate/issues/171.

     

       302
       302
       +
                No action should be needed for font configuration, as the fonts.fontconfig

     

       303
       303
       +
                module is already used by default.

     

       294
       304
        
              '' ));

     

       295
       305
        
       }

-49

pkgs/development/libraries/fontconfig-ultimate/default.nix

···

       1
       1
       -
       { stdenv, fetchFromGitHub }:

     

       2
       2
       -
       

     

       3
       3
       -
       let version = "2016-04-23"; in

     

       4
       4
       -
       stdenv.mkDerivation {

     

       5
       5
       -
         pname = "fontconfig-ultimate";

     

       6
       6
       -
         inherit version;

     

       7
       7
       -
       

     

       8
       8
       -
         src = fetchFromGitHub {

     

       9
       9
       -
           sha256 = "1rd2n60l8bamx84q3l91pd9a0wz9h7p6ajvx1dw22qn8rah4h498";

     

       10
       10
       -
           rev = version;

     

       11
       11
       -
           repo = "fontconfig-ultimate";

     

       12
       12
       -
           owner = "bohoomil";

     

       13
       13
       -
         };

     

       14
       14
       -
       

     

       15
       15
       -
         installPhase = ''

     

       16
       16
       -
           mkdir -p $out/etc/fonts/conf.d

     

       17
       17
       -
           cp conf.d.infinality/*.conf $out/etc/fonts/conf.d

     

       18
       18
       -
       

     

       19
       19
       -
           # Base rendering settings will be determined by NixOS module

     

       20
       20
       -
           rm $out/etc/fonts/conf.d/10-base-rendering.conf

     

       21
       21
       -
       

     

       22
       22
       -
           # Options controlled by NixOS module

     

       23
       23
       -
           rm $out/etc/fonts/conf.d/35-repl-custom.conf

     

       24
       24
       -
           rm $out/etc/fonts/conf.d/38-repl-*.conf

     

       25
       25
       -
           rm $out/etc/fonts/conf.d/82-*.conf

     

       26
       26
       -
           rm $out/etc/fonts/conf.d/83-*.conf

     

       27
       27
       -
       

     

       28
       28
       -
           # Inclusion of local and user configs handled by global configuration

     

       29
       29
       -
           rm $out/etc/fonts/conf.d/29-local.conf

     

       30
       30
       -
           rm $out/etc/fonts/conf.d/28-user.conf

     

       31
       31
       -
       

     

       32
       32
       -
           cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d

     

       33
       33
       -
       

     

       34
       34
       -
           # fix font priority issue https://github.com/bohoomil/fontconfig-ultimate/issues/173

     

       35
       35
       -
           mv $out/etc/fonts/conf.d/{43,60}-wqy-zenhei-sharp.conf

     

       36
       36
       -
       

     

       37
       37
       -
           mkdir -p $out/etc/fonts/presets/{combi,free,ms}

     

       38
       38
       -
           cp fontconfig_patches/combi/*.conf $out/etc/fonts/presets/combi

     

       39
       39
       -
           cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free

     

       40
       40
       -
           cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms

     

       41
       41
       -
         '';

     

       42
       42
       -
       

     

       43
       43
       -
         meta = with stdenv.lib; {

     

       44
       44
       -
           description = "Font configuration files, patches, scripts and source packages (Infinality & friends)";

     

       45
       45
       -
           homepage = https://github.com/bohoomil/fontconfig-ultimate;

     

       46
       46
       -
           license = licenses.mit;

     

       47
       47
       -
           platforms = platforms.all;

     

       48
       48
       -
         };

     

       49
       49
       -
       }

pkgs/top-level/aliases.nix

···

       106
       106
        
         firefoxWrapper = firefox;           # 2015-09

     

       107
       107
        
         flameGraph = flamegraph; # added 2018-04-25

     

       108
       108
        
         font-awesome-ttf = font-awesome; # 2018-02-25

     

       109
       109
       +
         # 2019-10-31

     

       110
       110
       +
         fontconfig-ultimate = throw ''

     

       111
       111
       +
           fontconfig-ultimate has been removed. The repository has been archived upstream and activity has ceased for several years.

     

       112
       112
       +
           https://github.com/bohoomil/fontconfig-ultimate/issues/171.

     

       113
       113
       +
         '';

     

       109
       114
        
         font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12

     

       110
       115
        
         foomatic_filters = foomatic-filters;  # 2016-08

     

       111
       116
        
         fuse_exfat = exfat;                   # 2015-09-11

-2

pkgs/top-level/all-packages.nix

···

       11029
       11029
        
       

     

       11030
       11030
        
         fontconfig-penultimate = callPackage ../data/fonts/fontconfig-penultimate {};

     

       11031
       11031
        
       

     

       11032
       11032
       -
         fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};

     

       11033
       11033
       -
       

     

       11034
       11032
        
         folly = callPackage ../development/libraries/folly { };

     

       11035
       11033
        
       

     

       11036
       11034
        
         folks = callPackage ../development/libraries/folks { };