Commit graph

84253 commits

Author SHA1 Message Date
Jan Tojnar 6f8345035b
fontconfig: remove its rules from configs
ITS rules are used for extracting translatable strings and they have
been moved to external files in 2.13.92 so they are not needed in
the config files themselves.

Removing them also cuts down on errors/warnings produced when using
older versions of fontconfig (< 2.12.92). Now it will only complain
about the description element but that is fortunately just a warning,
not errors like the ones caused by the its attributes.

Thanks to this, we can change the config version in NixOS module
back to 2.11 allowing us to re-use the 2.13/2.14 configs for apps
built against 2.12 fontconfig.
2020-07-11 17:05:15 +02:00
Jan Tojnar 993deed7ab
fontconfig: Load fonts also from FHS paths
With previous patch, we no longer load non-versioned fonts.conf file to avoid incompatibilities
but this also means fontconfig will not load system-wide installed fonts on non-NixOS systems.

As a compromise, let's hardcode the FHS font paths to the built-in config so that the system
fonts work there. Unlike with the system config we do not need to worry about compatibility as
incompatible font files will be simply ignored.

Of course there will still be disparity if the system install fonts to some other location than
these two but I am afraid this is the best we can do.

See https://github.com/NixOS/nixpkgs/pull/73795#issuecomment-635771967 for discussion.
2020-07-11 17:05:13 +02:00
Jan Tojnar edf2541f02
fontconfig: Only read versioned config dirs
Falling back to unversioned `/etc/fonts/conf.d` when versioned one does not exist
is problematic since it only occurs on non-NixOS systems and those are likely
to have a different version of fontconfig. When those versions use incompatible
elements in the config, apps using fontconfig will crash.

Instead, we are now falling back to the in-package `fonts.conf` file that loads
both the versioned global `conf.d` directory and the in-package `conf.d` since using
upstream settings on non-NixOS is preferable to not being able to use apps there.

In fact, we would not even need to link `fonts.conf`, as the in-package `fonts.conf`
will be always used unless someone creates the global one manually (the option is still
retained if one wants to write a custom NixOS module and to avoid unnecessary stat call on NixOS).

Additionally, since the `fonts.conf` will always load `conf.d` from the package, we no longer
need to install them to sytem `/etc` in the module. This needed some mucking with `50-user.conf`
which disables configs in user directories (a good thing IMO, NixOS module will turn it back on)
but otherwise, it is cleaner. The files are still prioritized by their name, regardless of their location.

See https://github.com/NixOS/nixpkgs/pull/73795#issuecomment-634370125 for more information.
2020-07-11 17:05:13 +02:00
worldofpeace 87786bc47f
fontconfig: bump configVersion to 2.13 2020-07-11 17:05:13 +02:00
worldofpeace 27b14ee82a
fontconfig: 2.12.6 -> 2.13.92 2020-07-11 17:05:12 +02:00
Mario Rodas dc80d7bc4a
Merge pull request #92242 from r-ryantm/auto-update/cpp-hocon
cpp-hocon: 0.2.2 -> 0.3.0
2020-07-04 13:14:29 -05:00
Benjamin Hipple 4dbd1d54c1
Merge pull request #92278 from jonringer/fix-soil
soil: fix build
2020-07-04 13:39:17 -04:00
Maximilian Bosch eb7113f2c0
Merge pull request #92279 from jonringer/prawcore-disable-py2
python2Packages.prawcore: disable on python2
2020-07-04 18:48:44 +02:00
Benjamin Hipple ad5f34afa2
Merge pull request #92280 from jonringer/fix-zope-contenttype
python3Packages.zope_contenttype: fix build
2020-07-04 12:35:33 -04:00
Benjamin Hipple 68a0a9b433
Merge pull request #92281 from jonringer/detox-remove
pythonPackages.detox: remove
2020-07-04 12:35:00 -04:00
Benjamin Hipple 0eabb1b779
Merge pull request #92277 from jonringer/fix-pipdate
python3Packages.pipdate: fix dependency management
2020-07-04 12:33:11 -04:00
betaboon e747fc91fa python3.pkgs.pyls-black: 0.4.4 -> 0.4.6 2020-07-04 09:27:54 -07:00
Jonathan Ringer ba5559fd7a
pythonPackages.detox: remove 2020-07-04 08:53:59 -07:00
Jonathan Ringer 93e7581c9a
python3Packages.zope_contenttype: fix build 2020-07-04 08:39:36 -07:00
Jonathan Ringer 01f1f3d5d0
python2Packages.prawcore: disable on python2
no longer compatible with python2's urllib

```
  prawcore/exceptions.py:2: in <module>
      from urllib.parse import urlparse
  E   ImportError: No module named parse
  builder for '/nix/store/3l1rqygq58hbwyzn6fqx8x4djbmzgggh-python2.7-prawcore-1.4.0.drv' failed with exit code
```
2020-07-04 08:32:46 -07:00
Sirio Balmelli f0c7019005 python3Packages.testfixtures: fix build (ignore failing tests)
Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
Co-authored-by: Joh <jonringer@users.noreply.github.com>
2020-07-04 08:27:07 -07:00
Jonathan Ringer ee63ff7d4e
soil: fix build 2020-07-04 08:13:22 -07:00
Jonathan Ringer 7e6e87e7eb
python3Packages.pipdate: fix dependency management 2020-07-04 08:05:53 -07:00
Jonathan Ringer ff5aaa33e9 python3Packages.aiorun: fix build 2020-07-04 07:43:58 -07:00
Frederik Rietdijk a9ed5b7729
Merge pull request #91808 from danieldk/pytorch-1.5.1
python3Packages.pytorch: 1.5.0 -> 1.5.1
2020-07-04 14:38:48 +02:00
Jack Kelly c0e9bc1cf8 aws-sam-cli: 0.44.0 -> 1.0.0rc1 2020-07-04 21:01:32 +10:00
Jack Kelly 2fea6a2a64 aws-lambda-builders: 0.8.0 -> 0.9.0 2020-07-04 21:01:32 +10:00
Daniël de Kok 14b4a0e2f2
Merge pull request #92215 from r-ryantm/auto-update/intel-graphics-compiler
intel-graphics-compiler: 1.0.4062 -> 1.0.4241
2020-07-04 10:57:58 +02:00
Daniël de Kok 563b4b01ee
Merge pull request #92191 from Tomahna/metals
metals: 0.9.0 -> 0.9.1
2020-07-04 08:35:45 +02:00
R. RyanTM c271dab10a cpp-hocon: 0.2.2 -> 0.3.0 2020-07-04 01:28:11 +00:00
Mario Rodas 033204e47a
Merge pull request #92222 from r-ryantm/auto-update/jruby
jruby: 9.2.11.1 -> 9.2.12.0
2020-07-03 18:58:13 -05:00
Mario Rodas 2a208beca4
Merge pull request #92221 from r-ryantm/auto-update/joker
joker: 0.15.4 -> 0.15.5
2020-07-03 18:56:24 -05:00
Mario Rodas a252c3747d
Merge pull request #92179 from r-ryantm/auto-update/flyway
flyway: 6.4.4 -> 6.5.0
2020-07-03 18:27:57 -05:00
Mario Rodas 198d74cb65
Merge pull request #92218 from r-ryantm/auto-update/jc
jc: 1.11.6 -> 1.11.8
2020-07-03 18:24:31 -05:00
Daniel Șerbănescu 5c9d882550 libgweather: 3.36.0 -> 3.36.1 2020-07-04 01:23:14 +02:00
Timo Kaufmann e437a20642
Merge pull request #86861 from evils/btrfs-heatmap
btrfs-heatmap: init at v8; incl. python.pkgs.btrfs
2020-07-04 00:40:04 +02:00
Evils b75f75cd5b python.pkgs.btrfs: init at v11 2020-07-04 00:21:57 +02:00
Saúl Cabrera a45b66e3d9 asls: init at 0.4.0 2020-07-03 18:19:04 -04:00
Maximilian Bosch 109ec6fc25
Merge pull request #92104 from ggreif/wasmtime
wasmtime: 0.17.0 -> 0.18.0
2020-07-03 23:50:38 +02:00
Maximilian Bosch db0540d178
cargo-make: fix darwin build
https://hydra.nixos.org/build/123569405
2020-07-03 23:10:36 +02:00
Doron Behar b63e659a72 chromaprint: use latest ffmpeg 2020-07-04 01:57:04 +05:30
R. RyanTM 8eb0654d16 jruby: 9.2.11.1 -> 9.2.12.0 2020-07-03 20:04:39 +00:00
R. RyanTM 5e73c358aa joker: 0.15.4 -> 0.15.5 2020-07-03 19:57:53 +00:00
Jonathan Ringer b9fd42db62 python3Packages.sparse: fix tests 2020-07-03 12:52:20 -07:00
R. RyanTM caa5a63f37 jc: 1.11.6 -> 1.11.8 2020-07-03 19:52:19 +00:00
Renato Florentino Garcia b19523ba23 pythonPackages.icecream: init at 2.0.0 2020-07-03 12:34:06 -07:00
Renato Florentino Garcia d0269a3b97 pythonPackages.executing: init at 0.4.3 2020-07-03 12:34:06 -07:00
Peter Simons f614e5006f
Merge pull request #91759 from NixOS/haskell-updates
Update Haskell package set to LTS 16.3 (plus other fixes)
2020-07-03 21:29:53 +02:00
Peter Simons 8f516e2af8 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.15.5-8-g13e29eb from Hackage revision
ccbc276558.
2020-07-03 21:29:12 +02:00
Cole Mickens 4c84e1d8eb pythonPackages.matrix-nio: 0.12.0 -> 0.14.1 2020-07-03 12:15:59 -07:00
MetaDark a408cd9e7c pythonPackages.debugpy: init at 1.0.0b12 2020-07-03 12:15:09 -07:00
R. RyanTM 0c1b8043dd python27Packages.foxdot: 0.8.8 -> 0.8.11 2020-07-03 12:04:37 -07:00
Thomas Watson 3ba2e9f15c pythonPackages.zstandard: 0.13.0 -> 0.14.0 2020-07-03 12:04:02 -07:00
Cole Mickens 06c7787be7 pythonPackages.denonavr: 0.8.1 -> 0.9.3 2020-07-03 12:02:37 -07:00
Peter Simons 6f6e106b0c hackage2nix: disable broken builds to fix evaluation on Hydra 2020-07-03 20:56:33 +02:00