Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 997bd95b3be6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c716705fd05
Choose a head ref
  • 4 commits
  • 7 files changed
  • 1 contributor

Commits on Nov 6, 2019

  1. nixos/corefonts: remove

    4 years ago in 7edb27b the option was made
    hidden. We should just remove the module and use mkRemovedOptionModule.
    worldofpeace committed Nov 6, 2019
    Copy the full SHA
    3485204 View commit details
  2. nixos/fontconfig-ultimate: remove

    This module has been obsolete for several years now.
    worldofpeace committed Nov 6, 2019
    Copy the full SHA
    070fbc3 View commit details
  3. Copy the full SHA
    7a551b3 View commit details

Commits on Nov 7, 2019

  1. Merge pull request #72369 from worldofpeace/corefonts-drop

    nixos/fontconfig-ultimate: remove
    worldofpeace authored Nov 7, 2019
    Copy the full SHA
    7c71670 View commit details
36 changes: 0 additions & 36 deletions nixos/modules/config/fonts/corefonts.nix

This file was deleted.

86 changes: 0 additions & 86 deletions nixos/modules/config/fonts/fontconfig-ultimate.nix

This file was deleted.

2 changes: 0 additions & 2 deletions nixos/modules/module-list.nix
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions nixos/modules/rename.nix
Original file line number Diff line number Diff line change
@@ -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.
'' ));
}
49 changes: 0 additions & 49 deletions pkgs/development/libraries/fontconfig-ultimate/default.nix

This file was deleted.

5 changes: 5 additions & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -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 { };