Commit Graph

234593 Commits

Author SHA1 Message Date
Maximilian Bosch
d2694d936e
rustPlatform: don't install artifacts modified by checkPhase
While the artifacts from `buildPhase` should be used for testing as
well, it should be avoided that those are modified during `checkPhase`.

This can happen if a package is built e.g. with special
`cargoBuildFlags` that don't apply to the `checkPhase`. In that case, a
binary would be installed into `$out` without those flags since
`checkPhase` overrides the binary in the `target`-directory.

This patch copies the state of `target/release` into a temporary
location at the end of the `buildPhase` and installs the results from
that temporary directory into `$out` while `checkPhase` can continue
using the configured build-dir.

cc #91689
Closes #93119
Closes #91191
2020-07-15 20:08:30 +02:00
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
Florian Klink
a224b6e18f
Merge pull request #93024 from flokli/lvm-fixes
lvm: cleanups
2020-07-14 13:53:15 +02:00
Florian Klink
9583669422 lvm2: passthru tests 2020-07-14 12:56:35 +02:00
Florian Klink
12d32eefed lvm2: rename enable_{cmdlib,dmeventd} to enable{Cmdlib,Dmeventd}
Make this more consistent with how these flags look like in the rest of
nixpkgs.
2020-07-14 12:00:33 +02:00
ajs124
53a34361af nixos/tests/installer: lvm: test lvm2-pvscan@ units
Also, add some sleep statements in between, which seems to at least feel
like it causes

> WARNING: Device /dev/vda* not initialized in udev database even after waiting 10000000 microseconds.

To occur less frequently.

This eventually still succeeds after some amount of waiting, I suspect
some racyness in the way lvm's udev-triggered scripts trigger other
units.
2020-07-14 12:00:33 +02:00
ajs124
d056f6e86d nixos/test/installer: add postBootCommands 2020-07-14 12:00:33 +02:00
Florian Klink
e55ef86ebd systemd_with_lvm2: remove
This is already handled by the lvm module, which now properly adds the
lvm systemd generators.

Initially introduced in c0fd88748a.
2020-07-14 12:00:33 +02:00
ajs124
1a1e7237de nixos/tasks/lvm: add dmeventd and lvmthin support
Introduce a pkgs.lvm2_dmeventd that contains dmeventd support, and
enable if services.lvm.dmeventd.enable is true.
2020-07-14 12:00:32 +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
Florian Klink
9f83907013 lvm2: only split bin and lib out from out if cmdlib isn't enabled 2020-07-12 23:04:33 +02:00
Florian Klink
b8129312bd lvm2: fix location to systemd-run invocation 2020-07-12 23:04:33 +02:00
ajs124
e6a6846d4f lvm2: fix paths to use /run instead of /var/run.
This shuts up some warnings.
2020-07-12 23:04:33 +02:00
Florian Klink
d3a991d410 lvm2: add multiple output support 2020-07-12 23:04:33 +02:00
Florian Klink
df67459b89 lvm2: don't embed ./configure line in lvm2 binary 2020-07-12 23:04:33 +02:00
Florian Klink
198d1e6f5c lvm2: make --enable-cmdlib optional
This seems to be mostly used to simplify LV management tasks from a web
interface
(https://www.redhat.com/archives/linux-lvm/2008-September/msg00029.html),
and is as fat as the `lvm` binary itself
2020-07-12 23:04:33 +02:00
ajs124
3ca74a976a lvm2: 2.03.01 -> 2.03.09 2020-07-12 23:04:33 +02:00
Florian Klink
fbe7027251 lvm2: fetch sources from http instead of git
Otherwise, we end up in a dependency cycle:

systemd -> cryptsetup -> lvm -> fetchgit -> git -> openssh -> libfido2 -> hidapi -> libusb -> udev=systemd
2020-07-12 23:04:33 +02:00
ajs124
33030f1bd2 lvm2: add myself as maintainer 2020-07-12 23:04:33 +02:00
Florian Klink
5e1eb7bd59 lvm2: cleanups, make udev optional
- use installTargets again ("install", and
   "install_systemd_{generators,units,configuration}" when udev is not
   null)
 - The call to the blkid binary in lvm2's 13-dm-disk.rules file
   disappeared (so we don't need to patch in blkid anymore).
   lvm seems to rely on udev's internal blkid functionality.
 - Call /run/current-system/systemd/bin/udevadm instead
   of ${systemd}/bin/udevadm in the lvm activation generator.
   This is not necessary to break the dependency cycle (as we don't use
   that file when building without udev), but a good idea anyways -
   We want to trigger the udevadm of the current system, not the one
   that lvm was built with.
2020-07-12 23:04:33 +02:00
Florian Klink
2d2b7513d9 lvm2: remove unused default.upstream file 2020-07-12 23:04:32 +02:00
Florian Klink
12834b3e87
Merge pull request #91232 from primeos/systemd-allow-transient-hostname
systemd: Allow setting the transient hostname via DHCP
2020-07-11 22:28:52 +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
Michael Weiss
483dbe9237 systemd: Allow setting the transient hostname via DHCP
This permits using method_set_hostname but still denies
method_set_static_hostname. As a result DHCP clients can now always set
the transient hostname via the SetHostname method of the D-Bus interface
of systemd-hostnamed (org.freedesktop.hostname1.set-hostname).
If the NixOS option networking.hostName is set to an empty string (or
"localhost") the static hostname (kernel.hostname but NOT /etc/hostname)
will additionally be updated (this is intended).

From "man hostnamectl": The transient hostname is a fallback value
received from network configuration. If a static hostname is set, and is
valid (something other than localhost), then the transient hostname is
not used.

Fix #74847.

Note: It's possible to restrict access to the org.freedesktop.hostname1
interface using Polkit rules.
2020-07-11 00:05:41 +02: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
Ryan Mulligan
fb3fd9762f
Merge pull request #92826 from r-ryantm/auto-update/pgrouting
postgresql11Packages.pgrouting: 3.0.0 -> 3.0.1
2020-07-10 11:48:36 -07: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
Jan Tojnar
a23cb68ccf
Merge pull request #92886 from jtojnar/fix/gse-sysmon 2020-07-10 20:35:40 +02:00
Jan Tojnar
e96bf89d1e
gnomeExtensions.system-monitor: unbreak with newer GNOME Shell
Had to switch to master and include Clutter typelib to path since recent versions of GNOME Shell open preferences out of Shell context.
2020-07-10 20:12:34 +02:00
Emery Hemingway
c960abf50f trojita: 0.7.20190618 -> 0.7.20200706
Fix #92869
2020-07-10 23:38:56 +05:30
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
Jan Tojnar
a100503b08
gnome3.mutter: export libdir
It is needed for finding clutter & co. typelibs by extenstions.
2020-07-10 19:42:13 +02: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
Tim Steinbach
0416089dc6
linux: 5.8-rc2 -> 5.8-rc4 2020-07-10 10:23:46 -04:00
Tim Steinbach
af5accfa96
linux/hardened/patches/5.7: 5.7.7.a -> 5.7.8.a 2020-07-10 09:37:28 -04:00
Tim Steinbach
cda9153727
linux/hardened/patches/5.4: 5.4.48.a -> 5.4.49.a 2020-07-10 09:37:28 -04:00
Tim Steinbach
4be3ad84d2
linux/hardened/patches/4.19: 4.19.131.a -> 4.19.132.a 2020-07-10 09:37:27 -04:00