Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ed07403382cc
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8b56d205b2e1
Choose a head ref
Loading
Showing with 1,689 additions and 843 deletions.
  1. +90 −78 nixos/modules/config/fonts/fontconfig-penultimate.nix
  2. +231 −229 nixos/modules/config/fonts/fontconfig.nix
  3. +52 −0 nixos/modules/config/vte.nix
  4. +2 −1 nixos/modules/module-list.nix
  5. +36 −0 nixos/modules/programs/gnome-terminal.nix
  6. +0 −41 nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
  7. +31 −2 nixos/modules/services/web-servers/nginx/default.nix
  8. +1 −1 nixos/modules/services/x11/desktop-managers/gnome3.nix
  9. +4 −0 nixos/modules/services/x11/desktop-managers/mate.nix
  10. +4 −0 nixos/modules/services/x11/desktop-managers/pantheon.nix
  11. +88 −0 nixos/modules/system/boot/networkd.nix
  12. +10 −4 nixos/modules/virtualisation/containers.nix
  13. +1 −0 nixos/tests/all-tests.nix
  14. +43 −17 nixos/tests/nginx.nix
  15. +80 −0 nixos/tests/systemd-networkd-wireguard.nix
  16. +4 −8 pkgs/applications/editors/android-studio/default.nix
  17. +2 −2 pkgs/applications/editors/kdevelop5/kdev-php.nix
  18. +2 −2 pkgs/applications/editors/kdevelop5/kdev-python.nix
  19. +2 −2 pkgs/applications/editors/kdevelop5/kdevelop.nix
  20. +0 −2 pkgs/applications/misc/jekyll/basic/Gemfile
  21. +24 −20 pkgs/applications/misc/jekyll/basic/Gemfile.lock
  22. +54 −23 pkgs/applications/misc/jekyll/basic/gemset.nix
  23. +8 −11 pkgs/applications/misc/jekyll/full/Gemfile
  24. +33 −35 pkgs/applications/misc/jekyll/full/Gemfile.lock
  25. +73 −120 pkgs/applications/misc/jekyll/full/gemset.nix
  26. +2 −2 pkgs/applications/misc/st/xst.nix
  27. +2 −2 pkgs/applications/misc/waybar/default.nix
  28. +2 −2 pkgs/applications/misc/worker/default.nix
  29. +14 −6 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
  30. +2 −2 pkgs/applications/science/misc/tulip/default.nix
  31. +2 −2 pkgs/applications/version-management/gitkraken/default.nix
  32. +2 −2 pkgs/applications/video/shotcut/default.nix
  33. +2 −2 pkgs/applications/video/vlc/default.nix
  34. +9 −10 pkgs/applications/virtualization/xen/4.8.nix
  35. +2 −2 pkgs/applications/virtualization/xen/generic.nix
  36. +95 −0 pkgs/applications/virtualization/xen/qemu-gluster-6-compat.diff
  37. +2 −2 pkgs/applications/window-managers/sxhkd/default.nix
  38. +2 −2 pkgs/desktops/gnome-3/games/tali/default.nix
  39. +1 −0 pkgs/development/compilers/compcert/default.nix
  40. +1 −0 pkgs/development/compilers/rust/default.nix
  41. +12 −14 pkgs/development/{tools → compilers}/rust/rls/default.nix
  42. +8 −3 pkgs/development/haskell-modules/configuration-common.nix
  43. +0 −1 pkgs/development/haskell-modules/configuration-hackage2nix.yaml
  44. +323 −95 pkgs/development/haskell-modules/hackage-packages.nix
  45. +24 −3 pkgs/development/interpreters/python/cpython/default.nix
  46. +32 −0 pkgs/development/interpreters/python/default.nix
  47. +38 −41 pkgs/development/libraries/graphene/0001-meson-add-options-for-tests-installation-dirs.patch
  48. +8 −3 pkgs/development/libraries/graphene/default.nix
  49. +72 −0 pkgs/development/libraries/gthree/default.nix
  50. +9 −1 pkgs/development/libraries/libressl/default.nix
  51. +34 −0 pkgs/development/libraries/mutest/default.nix
  52. +2 −2 pkgs/development/libraries/science/math/sympow/default.nix
  53. +2 −2 pkgs/development/libraries/wcslib/default.nix
  54. +2 −2 pkgs/development/libraries/wxSVG/default.nix
  55. +2 −2 pkgs/development/libraries/xxHash/default.nix
  56. +6 −10 pkgs/development/python-modules/Fabric/default.nix
  57. +18 −0 pkgs/development/python-modules/crc16/default.nix
  58. +2 −2 pkgs/development/python-modules/invoke/default.nix
  59. +9 −9 pkgs/development/python-modules/xdis/default.nix
  60. +43 −0 pkgs/games/gnome-hexgl/default.nix
  61. +1 −1 pkgs/games/warsow/default.nix
  62. +2 −1 pkgs/games/warsow/engine.nix
  63. +2 −2 pkgs/os-specific/linux/wpa_supplicant/default.nix
  64. +2 −0 pkgs/servers/meguca/default.nix
  65. +2 −2 pkgs/shells/xonsh/default.nix
  66. +2 −2 pkgs/tools/X11/wpgtk/default.nix
  67. +2 −2 pkgs/tools/X11/xkb-switch/default.nix
  68. +2 −2 pkgs/tools/system/stress-ng/default.nix
  69. +2 −2 pkgs/tools/system/thermald/default.nix
  70. +8 −4 pkgs/top-level/all-packages.nix
  71. +1 −1 pkgs/top-level/coq-packages.nix
  72. +2 −0 pkgs/top-level/python-packages.nix
168 changes: 90 additions & 78 deletions nixos/modules/config/fonts/fontconfig-penultimate.nix
Original file line number Diff line number Diff line change
@@ -52,85 +52,11 @@ let
</fontconfig>
'';

# local configuration file
localConf = pkgs.writeText "fc-local.conf" cfg.localConf;

# The configuration to be included in /etc/font/
penultimateConf = pkgs.runCommand "font-penultimate-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
ln -s ${supportFontsConf} $support_folder/../fonts.conf
ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
$latest_folder/../fonts.conf
# fontconfig-penultimate various configuration files
ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
$support_folder
ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
$latest_folder
ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf
ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf
rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf
ln -s ${antialiasConf} $support_folder/10-antialias.conf
ln -s ${antialiasConf} $latest_folder/10-antialias.conf
rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf
ln -s ${hintingConf} $support_folder/10-hinting.conf
ln -s ${hintingConf} $latest_folder/10-hinting.conf
${optionalString cfg.useEmbeddedBitmaps ''
rm $support_folder/10-no-embedded-bitmaps.conf
rm $latest_folder/10-no-embedded-bitmaps.conf
''}
rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf
ln -s ${subpixelConf} $support_folder/10-subpixel.conf
ln -s ${subpixelConf} $latest_folder/10-subpixel.conf
${optionalString (cfg.dpi != 0) ''
ln -s ${dpiConf} $support_folder/11-dpi.conf
ln -s ${dpiConf} $latest_folder/11-dpi.conf
''}
${optionalString (!cfg.includeUserConf) ''
rm $support_folder/50-user.conf
rm $latest_folder/50-user.conf
''}
# 51-local.conf
rm $latest_folder/51-local.conf
substitute \
${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \
$latest_folder/51-local.conf \
--replace local.conf /etc/fonts/${latestVersion}/local.conf
# local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") ''
ln -s ${localConf} $out/etc/fonts/local.conf
ln -s ${localConf} $out/etc/fonts/${latestVersion}/local.conf
''}
ln -s ${defaultFontsConf} $support_folder/52-default-fonts.conf
ln -s ${defaultFontsConf} $latest_folder/52-default-fonts.conf
${optionalString cfg.allowBitmaps ''
rm $support_folder/53-no-bitmaps.conf
rm $latest_folder/53-no-bitmaps.conf
''}
${optionalString (!cfg.allowType1) ''
ln -s ${rejectType1} $support_folder/53-no-type1.conf
ln -s ${rejectType1} $latest_folder/53-no-type1.conf
''}
'';

# rendering settings configuration files
# priority 10
hintingConf = pkgs.writeText "fc-10-hinting.conf" ''
<?xml version='1.0'?>
<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
@@ -199,6 +125,8 @@ let
</fontconfig>
'';

# default fonts configuration file
# priority 52
defaultFontsConf =
let genDefault = fonts: name:
optionalString (fonts != []) ''
@@ -228,7 +156,9 @@ let
</fontconfig>
'';

rejectType1 = pkgs.writeText "fc-53-no-type1.conf" ''
# reject Type 1 fonts
# priority 53
rejectType1 = pkgs.writeText "fc-53-nixos-reject-type1.conf" ''
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
@@ -245,6 +175,88 @@ let
</fontconfig>
'';

# The configuration to be included in /etc/font/
penultimateConf = pkgs.runCommand "fontconfig-penultimate-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
# fonts.conf
ln -s ${supportFontsConf} $support_folder/../fonts.conf
ln -s ${latestPkg.out}/etc/fonts/fonts.conf \
$latest_folder/../fonts.conf
# fontconfig-penultimate various configuration files
ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
$support_folder
ln -s ${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/*.conf \
$latest_folder
ln -s ${cacheConfSupport} $support_folder/00-nixos-cache.conf
ln -s ${cacheConfLatest} $latest_folder/00-nixos-cache.conf
rm $support_folder/10-antialias.conf $latest_folder/10-antialias.conf
ln -s ${antialiasConf} $support_folder/10-antialias.conf
ln -s ${antialiasConf} $latest_folder/10-antialias.conf
rm $support_folder/10-hinting.conf $latest_folder/10-hinting.conf
ln -s ${hintingConf} $support_folder/10-hinting.conf
ln -s ${hintingConf} $latest_folder/10-hinting.conf
${optionalString cfg.useEmbeddedBitmaps ''
rm $support_folder/10-no-embedded-bitmaps.conf
rm $latest_folder/10-no-embedded-bitmaps.conf
''}
rm $support_folder/10-subpixel.conf $latest_folder/10-subpixel.conf
ln -s ${subpixelConf} $support_folder/10-subpixel.conf
ln -s ${subpixelConf} $latest_folder/10-subpixel.conf
${optionalString (cfg.dpi != 0) ''
ln -s ${dpiConf} $support_folder/11-dpi.conf
ln -s ${dpiConf} $latest_folder/11-dpi.conf
''}
# 50-user.conf
${optionalString (!cfg.includeUserConf) ''
rm $support_folder/50-user.conf
rm $latest_folder/50-user.conf
''}
# 51-local.conf
rm $latest_folder/51-local.conf
substitute \
${pkgs.fontconfig-penultimate}/etc/fonts/conf.d/51-local.conf \
$latest_folder/51-local.conf \
--replace local.conf /etc/fonts/${latestVersion}/local.conf
# local.conf (indirect priority 51)
${optionalString (cfg.localConf != "") ''
ln -s ${localConf} $support_folder/../local.conf
ln -s ${localConf} $latest_folder/../local.conf
''}
# 52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $support_folder/52-nixos-default-fonts.conf
ln -s ${defaultFontsConf} $latest_folder/52-nixos-default-fonts.conf
# 53-no-bitmaps.conf
${optionalString cfg.allowBitmaps ''
rm $support_folder/53-no-bitmaps.conf
rm $latest_folder/53-no-bitmaps.conf
''}
${optionalString (!cfg.allowType1) ''
# 53-nixos-reject-type1.conf
ln -s ${rejectType1} $support_folder/53-nixos-reject-type1.conf
ln -s ${rejectType1} $latest_folder/53-nixos-reject-type1.conf
''}
'';

in
{

Loading