Branch: refs/heads/staging
  Home:   https://github.com/NixOS/nixpkgs
  Commit: cd2948a72e3116a3a42f1f523fe2638db994362c
      
https://github.com/NixOS/nixpkgs/commit/cd2948a72e3116a3a42f1f523fe2638db994362c
  Author: Eric Sagnes <eric.sag...@gmail.com>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M nixos/modules/config/fonts/fontconfig-ultimate.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M pkgs/development/libraries/fontconfig/default.nix
    M pkgs/development/libraries/fontconfig/make-fonts-conf.xsl

  Log Message:
  -----------
  fontconfig: fix etc priority


  Commit: e80e8b9dc95fd21de14bd4647cb957765030aa59
      
https://github.com/NixOS/nixpkgs/commit/e80e8b9dc95fd21de14bd4647cb957765030aa59
  Author: Eric Sagnes <eric.sag...@gmail.com>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M nixos/modules/config/fonts/fontconfig.nix
    M pkgs/development/libraries/fontconfig/default.nix

  Log Message:
  -----------
  fontconfig module: respect upstream definitions


  Commit: 4114cf9c6c184d72d51260caa6ad0e11984fee0b
      
https://github.com/NixOS/nixpkgs/commit/4114cf9c6c184d72d51260caa6ad0e11984fee0b
  Author: Eric Sagnes <eric.sag...@gmail.com>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M pkgs/development/libraries/fontconfig-ultimate/confd.nix

  Log Message:
  -----------
  fontconfig-ultimate: fix wqy-zenhei-sharp priority


  Commit: e3ab0826c2139253dc1717b8cff9aae599db2432
      
https://github.com/NixOS/nixpkgs/commit/e3ab0826c2139253dc1717b8cff9aae599db2432
  Author: Nikolay Amiantov <a...@fmap.me>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1609.xml
    M nixos/modules/config/fonts/fontconfig-ultimate.nix
    M nixos/modules/rename.nix
    R pkgs/development/libraries/fontconfig-ultimate/confd.nix
    M pkgs/development/libraries/fontconfig-ultimate/default.nix
    R pkgs/development/libraries/fontconfig-ultimate/rendering.nix

  Log Message:
  -----------
  fontconfig-ultimate: 2015-12-06 -> 2016-04-23

This removes our hardcoded presets which weren't updated for quite some time.
Infinality now has new hardcoded presets in freetype, which can be overriden if
desired with environment variables (as before). Accordingly, updated NixOS
module to set the hardcoded preset.

Additionally used a more "right" type for substitutions.


  Commit: c8658f9da8dfab593319fd73bf1809907fa1b315
      
https://github.com/NixOS/nixpkgs/commit/c8658f9da8dfab593319fd73bf1809907fa1b315
  Author: Nikolay Amiantov <a...@fmap.me>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M pkgs/development/libraries/cairo/default.nix

  Log Message:
  -----------
  cairo: add infinality patches


  Commit: eb6f576ffd4a7ac1d8807dcca2229bff49dcd21d
      
https://github.com/NixOS/nixpkgs/commit/eb6f576ffd4a7ac1d8807dcca2229bff49dcd21d
  Author: cmfwyp <cmf...@riseup.net>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M pkgs/build-support/fetchurl/mirrors.nix

  Log Message:
  -----------
  fetchurl: update Savannah mirrors


  Commit: 574bba7f065f16a588e3ba21cb31df967e72a252
      
https://github.com/NixOS/nixpkgs/commit/574bba7f065f16a588e3ba21cb31df967e72a252
  Author: cmfwyp <cmf...@riseup.net>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M pkgs/development/libraries/freetype/default.nix

  Log Message:
  -----------
  freetype: remove -fno-strict-aliasing

The strict aliasing violations this was meant to fix were already
fixed in FreeType.


  Commit: 50c0011292fd44b5050c9829cb1860d0cd11cb89
      
https://github.com/NixOS/nixpkgs/commit/50c0011292fd44b5050c9829cb1860d0cd11cb89
  Author: cmfwyp <cmf...@riseup.net>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M pkgs/development/libraries/freetype/default.nix

  Log Message:
  -----------
  freetype: add a long description


  Commit: 1c7114da69a257b01f6ca7827ae58e788844c114
      
https://github.com/NixOS/nixpkgs/commit/1c7114da69a257b01f6ca7827ae58e788844c114
  Author: cmfwyp <cmf...@riseup.net>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M nixos/modules/config/fonts/fontconfig-ultimate.nix
    M pkgs/development/compilers/openjdk/8.nix
    M pkgs/development/libraries/freetype/default.nix

  Log Message:
  -----------
  freetype: 2.6.2 -> 2.6.5

The fontconfig-ultimate patches are unmaintained. Since they were
not updated for newer FreeType versions, this removes them and
disables fontconfig-ultimate by default.


  Commit: f961fc7dd13a724f332482234e126e4526bc2091
      
https://github.com/NixOS/nixpkgs/commit/f961fc7dd13a724f332482234e126e4526bc2091
  Author: Nikolay Amiantov <a...@fmap.me>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M nixos/modules/config/fonts/fontconfig-ultimate.nix
    M pkgs/development/compilers/openjdk/8.nix
    M pkgs/development/libraries/freetype/default.nix

  Log Message:
  -----------
  freetype: re-add infinality patches

archfan has updated those patches for the new version.


  Commit: 3b22b8add0f47860b7e64ad77703b43a01a2dd31
      
https://github.com/NixOS/nixpkgs/commit/3b22b8add0f47860b7e64ad77703b43a01a2dd31
  Author: Nikolay Amiantov <a...@fmap.me>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M nixos/doc/manual/release-notes/rl-1609.xml
    M nixos/modules/config/fonts/fontconfig-ultimate.nix
    M nixos/modules/config/fonts/fontconfig.nix
    M nixos/modules/rename.nix
    M pkgs/build-support/fetchurl/mirrors.nix
    M pkgs/development/libraries/cairo/default.nix
    R pkgs/development/libraries/fontconfig-ultimate/confd.nix
    M pkgs/development/libraries/fontconfig-ultimate/default.nix
    R pkgs/development/libraries/fontconfig-ultimate/rendering.nix
    M pkgs/development/libraries/fontconfig/default.nix
    M pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
    M pkgs/development/libraries/freetype/default.nix

  Log Message:
  -----------
  Merge branch 'font-updates' into staging

Closes #16730. Closes #17770. Closes #17846.

Test plan:

* Check that `fonts.fontconfig.ultimate.preset` changes things;
* Check that `fonts.fontconfig.dpi` changes things;
* Check that `fonts.fontconfig.defaultFonts.monospace` changes things;

Tested with AbiWord, mousepad and Firefox.


Compare: https://github.com/NixOS/nixpkgs/compare/c74145467d83...3b22b8add0f4
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to