Skip to content

nixos/fonts: remove fontconfig-penultimate #95681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
infinisil merged 2 commits into from
Aug 17, 2020
Merged

nixos/fonts: remove fontconfig-penultimate #95681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d51b52
nixos/fonts/fontconfig-penultimate: remove module
flokli Aug 17, 2020
119401d
fontconfig-penultimate: remove package
flokli Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
292 changes: 0 additions & 292 deletions nixos/modules/config/fonts/fontconfig-penultimate.nix
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion nixos/modules/config/fonts/fontconfig.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ in
environment.systemPackages = [ pkgs.fontconfig ];
environment.etc.fonts.source = "${fontconfigEtc}/etc/fonts/";
})
(mkIf (cfg.enable && !cfg.penultimate.enable) {
(mkIf cfg.enable {
fonts.fontconfig.confPackages = [ confPkg ];
})
];
Expand Down
1 change: 0 additions & 1 deletion nixos/modules/module-list.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[
./config/debug-info.nix
./config/fonts/fontconfig.nix
./config/fonts/fontconfig-penultimate.nix
./config/fonts/fontdir.nix
./config/fonts/fonts.nix
./config/fonts/ghostscript.nix
Expand Down
1 change: 1 addition & 0 deletions nixos/modules/rename.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ with lib;
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])

# Completely removed modules
(mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "")
(mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "")
Expand Down
24 changes: 0 additions & 24 deletions pkgs/data/fonts/fontconfig-penultimate/default.nix
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions pkgs/top-level/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ mapAliases ({
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.
'';
fontconfig-penultimate = throw ''
fontconfig-penultimate has been removed.
It was a fork of the abandoned fontconfig-ultimate.
'';
# 2020-07-21
fontconfig_210 = throw ''
fontconfig 2.10.x hasn't had a release in years, is vulnerable to CVE-2016-5384
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12103,8 +12103,6 @@ in

fontconfig = callPackage ../development/libraries/fontconfig { };

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

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

folks = callPackage ../development/libraries/folks { };
Expand Down