Commit Graph

84689 Commits

Author SHA1 Message Date
Maximilian Bosch
7713fba8f8
Revert "buildRustPackage: fix cargoBuildFlags"
This reverts commit deb78151a9.

Mixing up two distinct phases of a derivation's build is not a good idea. See
also https://github.com/NixOS/nixpkgs/pull/91689#issuecomment-657813954.
2020-07-14 17:39:09 +02:00
Cole Mickens
0e93ae3f67
mesa: 20.0.8 -> 20.1.3 (#92977) 2020-07-13 22:42:13 +02:00
Jan Tojnar
09558f1dbf
Merge pull request #73795 from worldofpeace/fontconfig-2.13.92 2020-07-13 03:34:06 +02:00
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
Frederik Rietdijk
a3a40ac7cc Merge staging-next into staging 2020-07-11 09:00:18 +02:00
Frederik Rietdijk
ae8eee9c3f Merge master into staging-next 2020-07-11 08:59:54 +02:00
Mario Rodas
c87c474b17
Merge pull request #92901 from r-ryantm/auto-update/rustup
rustup: 1.21.1 -> 1.22.1
2020-07-10 22:32:18 -05:00
R. RyanTM
0d68512749 rustup: 1.21.1 -> 1.22.1 2020-07-11 01:11:05 +00:00
Austin Seipp
57a53677b4
liburing: 0.6pre600 -> 0.7
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-10 16:54:28 -05:00
Jan Tojnar
4be4ae71aa
Merge pull request #92829 from r-ryantm/auto-update/poppler-glib
poppler: 0.89.0 -> 0.90.0
2020-07-10 23:20:42 +02:00
Benjamin Hipple
2dadcdc05b
Merge pull request #92840 from r-ryantm/auto-update/python2.7-bitarray
python27Packages.bitarray: 1.2.2 -> 1.3.0
2020-07-10 14:45:42 -04:00
Benjamin Hipple
01f0aef501
Merge pull request #86809 from r-ryantm/auto-update/capnproto
capnproto: 0.7.0 -> 0.8.0
2020-07-10 14:06:58 -04:00
R. RyanTM
3a32232cbf python27Packages.wasabi: 0.6.0 -> 0.7.0 2020-07-10 11:01:42 -07:00
R. RyanTM
c3bbbb75a9 python27Packages.pytest-isort: 1.0.0 -> 1.1.0 2020-07-10 10:57:01 -07:00
Benjamin Hipple
dd4a6b64f8
Merge pull request #92651 from matthuszagh/nmigen
python3Packages.nmigen: from unstable-2020-02-08 to unstable-2020-04-02
2020-07-10 12:47:09 -04:00
Silvan Mosberger
75ee18766a
yarn2nix: Don't pass yarnNix to mkDerivation (#92856)
The generated yarnNix file doesn't need to be part of the mkDerivation.
And doing so prevents other platforms from reproducibly instantiating
it. With this change you can e.g. do

  darwinPkgs.yarn2nix.mkYarnPackage {
    # ...
    yarnNix = pkgs.yarn2nix.mkYarnNix {
      yarnLock = ./yarn.lock;
    };
  }

Which is a darwin derivation, but can still be instantiated reproducibly on Linux.
2020-07-10 16:24:03 +00:00
Vincent Laporte
d1a7237eee coqPackages.coq-extensible-records: remove at 1.2.0 2020-07-10 11:26:41 +02:00
Vincent Laporte
473519a25d coqPackages.coq-extensible-records: enable for Coq 8.11 and 8.12 2020-07-10 11:26:41 +02:00
R. RyanTM
1e338c42bf python27Packages.bitarray: 1.2.2 -> 1.3.0 2020-07-10 09:21:44 +00:00
R. RyanTM
9c833ae6ae poppler: 0.89.0 -> 0.90.0 2020-07-10 07:03:32 +00:00
Jörg Thalheim
33b5621ef6
Merge pull request #92794 from dguibert/dg/cross-texinfo-interactive 2020-07-10 07:28:39 +01:00
David Guibert
b92c2c666c
Update cross-tools-flags.patch 2020-07-10 08:07:35 +02:00
Joe Hermaszewski
f6e07b3c5d defaultGemConfig.mathematical: fix cross compilation 2020-07-10 07:48:12 +02:00
Mario Rodas
eb227e19b3
Merge pull request #92816 from r-ryantm/auto-update/mercury
mercury: 20.01.2 -> 20.06
2020-07-09 19:51:20 -05:00
Daniel Șerbănescu
9d6f01aeef webkitgtk: 2.28.2 -> 2.28.3 2020-07-10 00:40:29 +02:00
R. RyanTM
178b8073d8 mercury: 20.01.2 -> 20.06 2020-07-09 22:32:11 +00:00
R. RyanTM
a31dc294f7 gjs: 1.64.3 -> 1.64.4 2020-07-10 00:28:12 +02:00
Sirio Balmelli
669de6d21d python3Packages.pyspinel: fix build
Adopt upstream patch accepted here:
https://github.com/openthread/pyspinel/pull/98

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
Co-Authored-By: Jon <jonringer@users.noreply.github.com>
2020-07-09 10:58:12 -07:00
Daiderd Jordan
e0604a9333
Merge pull request #92347 from LnL7/darwin-libxml2
libxml2: fix python2 build on darwin
2020-07-09 19:32:05 +02:00
Matt Huszagh
fe381b3cf4 python3Packages.nmigen: from unstable-2020-02-08 to unstable-2020-04-02
Fixes nmigen build due to pyvcd being bumped to v0.2.
2020-07-09 10:22:39 -07:00
Jonathan Ringer
3e42013517 python3Packages.xmlschema: 1.1.0 -> 1.2.2 2020-07-09 09:23:02 -07:00
David Guibert
a2eb391e8f fix pkgsCross.*.texinfoInteractive
This fixes #86166 to build cross compilied texinfoInteractive.
BUILD_CC has been renamed to CC_FOR_BUILD so the patch needs to applied
this renaming.

tested on: pkgsCross.armv7l-hf-multiplatform.texinfoInteractive
2020-07-09 17:19:09 +02:00
Austin Seipp
9058630c2e
nextpnr: 2020.06.12 -> 2020.07.08
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-09 09:12:42 -05:00
Austin Seipp
e494368606
trellis: 2020.06.12 -> 2020.06.29
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-09 09:12:42 -05:00
Austin Seipp
f22c718e17
icestorm: 2020.04.22 -> 2020.07.08
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-09 09:12:42 -05:00
Austin Seipp
63e55fae00
yosys: 2020.06.19 -> 2020.07.07
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-07-09 09:12:41 -05:00
mupdt
f70a54893e python3Packages.pytimeparse: use checkInputs 2020-07-09 15:50:51 +02:00
Josh Holland
a96c2a3c3a python3Packages.xarray: add setuptools to propagatedBuildInputs
This package has been required since 0.15.1.
2020-07-09 14:21:36 +02:00
Félix Baylac-Jacqué
074d131979
Merge pull request #92696 from flokli/certbot-1.6.0
certbot: 1.3.0 -> 1.6.0
2020-07-09 11:55:41 +02:00
markuskowa
6ce044250b
Merge pull request #92048 from markuskowa/add-pmix
pmix: init at 3.1.5, add support to slurm, openmpi
2020-07-09 11:41:00 +02:00
Florian Klink
ee9123ddb9 python3.pkgs.certbot-dns-rfc2136: init at 1.6.0 2020-07-09 11:21:50 +02:00
Florian Klink
b9d97f313b python3.pkgs.certbot-dns-route53: init at 1.6.0 2020-07-09 11:21:50 +02:00
Florian Klink
9b4364d703 python3.pkgs.certbot-dns-cloudflare: init at 1.6.0 2020-07-09 11:21:50 +02:00
ash lea
888d7bb4db python3Packages.pyside2: 5.12.3 -> 5.12.6
fixes #91726
2020-07-09 01:28:29 -07:00
Vincent Laporte
f6db90a389 coqPackages.coq-bits: enable for Coq 8.11 and 8.12 2020-07-09 08:17:49 +02:00
Graham Christensen
cb330dafd5
Merge pull request #91908 from purcell/libpromhttp
libpromhttp: init at 0.1.1, build in combination with libprom
2020-07-08 21:24:23 -04:00