Commit Graph
233328 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
Mario Rodas 2150d372a3 Merge pull request #92239 from r-ryantm/auto-update/bettercap
bettercap: 2.27.1 -> 2.28
2020-07-04 13:13:48 -05:00
Mario Rodas 1a0b923a6d Merge pull request #92258 from r-ryantm/auto-update/tendermint
tendermint: 0.33.5 -> 0.33.6
2020-07-04 13:11:40 -05:00
Vladimír Čunát 8e3e3bfb55 Merge #91932: thunderbird*: 68.9.0 -> 68.10.0 2020-07-04 20:09:38 +02:00
Vladimír Čunát ab35379cdb evince: remove myself from meta.maintainers
That reflects reality of the past couple of years.  I used to spend
really large fraction of my time reading PDFs but not anymore.
Fortunately there seem to be enough other maintainers...
2020-07-04 20:08:45 +02:00
Mario Rodas c70f0c6548 Merge pull request #92257 from r-ryantm/auto-update/tebreak
tebreak: 1.0 -> 1.1
2020-07-04 12:45:00 -05:00
Mario Rodas b3aa101728 Merge pull request #92259 from r-ryantm/auto-update/terragrunt
terragrunt: 0.23.23 -> 0.23.31
2020-07-04 12:42:21 -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 248c9ef9bb Merge pull request #92287 from dasj19/evince-update
evince: 3.36.6 -> 3.36.7
2020-07-04 19:39:02 +02:00
Mario Rodas d0d53fb34e Merge pull request #92262 from r-ryantm/auto-update/watchexec
watchexec: 1.13.1 -> 1.14.0
2020-07-04 12:30:27 -05:00
Maximilian Bosch 3897eb5836 Merge pull request #92234 from samuelgrf/update/nixos-wallpapers
nixos-artwork: add missing wallpapers
2020-07-04 19:27:15 +02:00
Daniel Șerbănescu 1c98b0781d evince: 3.36.6 -> 3.36.7 2020-07-04 18:55:52 +02: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
Maximilian Bosch 8842a387ef mautrix-whatsapp: 0.1.1 -> 0.1.2
https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.2
2020-07-04 18:33:35 +02: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 BalmelliandJoh 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
worldofpeace d3a40e7cfc Merge pull request #92270 from samuelgrf/fix/whether-typo
nixos/*: fix misspellings of whether
2020-07-04 09:34:28 -04:00
Robert Scott f499144c32 Merge pull request #91987 from r-ryantm/auto-update/afl
afl: 2.56b -> 2.57b
2020-07-04 14:25:10 +01:00
Samuel Gräfenstein 5bb0b72720 nixos/*: wheter -> whether 2020-07-04 15:20:41 +02:00
Samuel Gräfenstein 850d7d1790 nixos/*: wether -> whether 2020-07-04 15:17:03 +02:00
Niklas Hambüchen 7c903ca1d2 Merge pull request #92205 from chkno/qemu-vm-cleanup
qemu-vm device name cleanup
2020-07-04 15:08:52 +02:00
Peter Hoeg 770faa044a Merge pull request #92118 from NixOS/f/calibre
calibre: use webengine i/o webkit
2020-07-04 20:50:56 +08:00
Chuck e74755c422 nixos/qemu-vm: Don't assume boot drive is always vdb 2020-07-04 14:40:42 +02: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
Frederik Rietdijk 3bdebb0a82 Merge pull request #90584 from endgame/update-aws-sam-cli
aws-lambda-builders: 0.8.0 -> 0.9.0; aws-sam-cli: 0.44.0 -> 1.0.0rc1
2020-07-04 14:37:31 +02:00
R. RyanTM 0b159862c9 watchexec: 1.13.1 -> 1.14.0 2020-07-04 11:56:16 +00:00
Mario Rodas 0c9df94772 Merge pull request #92187 from r-ryantm/auto-update/grml-zsh-config
grml-zsh-config: 0.17.2 -> 0.17.3
2020-07-04 06:20:32 -05:00
Mario Rodas d95bcae974 Merge pull request #92245 from r-ryantm/auto-update/libgen-cli
libgen-cli: 1.0.6 -> 1.0.7
2020-07-04 06:17:53 -05: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
R. RyanTM 87accbfb90 terragrunt: 0.23.23 -> 0.23.31 2020-07-04 11:01:18 +00:00
R. RyanTM d8956ba50e tebreak: 1.0 -> 1.1 2020-07-04 10:45:49 +00:00
Jörg Thalheim b2aa673d5a nixos: fix manual build
https://github.com/NixOS/nixpkgs/pull/92240#issuecomment-653740926
2020-07-04 10:23:25 +01:00
Mario Rodas 82106e0c3b tendermint: use subPackages 2020-07-04 04:20:00 -05:00
R. RyanTM 5a4fe405d3 tendermint: 0.33.5 -> 0.33.6 2020-07-04 10:51:58 +00: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