Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7c53ac01845a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2812b5ce3923
Choose a head ref
  • 16 commits
  • 17 files changed
  • 4 contributors

Commits on Jun 3, 2019

  1. systemd: 239.20190219 -> 241.20190221

    @Mic92 @andir
    Mic92 authored and andir committed Jun 3, 2019
    Copy the full SHA
    5b0db07 View commit details

  2. nixos/os-release: add documentation url

    @Mic92 @andir
    Mic92 authored and andir committed Jun 3, 2019
    Copy the full SHA
    2a0f85d View commit details

  3. systemd: 241.20190221 -> 242

    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    8c7e588 View commit details

  4. nixos/udev: switch networking.usePredicatableInterfaceNames to a ke… 

    …rnel param

The udev rules we are shipping no longer work with systemd v242 and were
remove upstream some time ago. It seems like the entire renaming is now
done in C and not in the udev rules.
    @andir
    andir committed Jun 3, 2019
    1

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1f03f6f View commit details

  5. nixos/tests/radicale: be a bit more permissive when matching logs 

    With the systemd update to v242 five lines are not longer sufficient to
verify that the storage was verified. In order to reduce future test
failures increasing it to 10 lines sounds like a sane amount.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    4743ad7 View commit details

  6. nixos/networkd: use no instead of none for DHCP= option 

    systemd has deprecated the use of `none` and recommends using `no`
instead.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    a32cd7d View commit details

  7. nixos/networkd: use the route section for default routes 

    With systemd v242 using the `Gateway` attribute of the `[Network]`
section will lead to "onlink" routes on all the device that are matched
by the default configuration (typically all devices) causing multiple
default routes (even on localhost).

We can only avoid that - while keeping our default route option - when
we mark the route as explicitly not on link. Only gateways that are
within a subnet of one of the assigned interface addresses will be
installed into the routing table.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    d600da7 View commit details

  8. nixos/networkd: rename GatewayOnlink to GatewayOnLink 

    This follows upstreams renaming of the option [1].

[1] systemd/systemd@9cb8c55
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    1b7b1db View commit details

  9. nixosTests.containers-imperative: add tmpfiles test 

    (cherry picked from commit 92600a9)
    @flokli @andir
    flokli authored and andir committed Jun 3, 2019
    Copy the full SHA
    bc71b6e View commit details

  10. nixos/systemd: migrate systemd-timesync state when required 

    Somewhen between systemd v239 and v242 upstream decided to no longer run
a few system services with `DyanmicUser=1` but failed to provide a
migration path for all the state those services left behind.

For the case of systemd-timesync the state has to be moved from
/var/lib/private/systemd/timesync to /var/lib/systemd/timesync if
/var/lib/systemd/timesync is currently a symlink.

We only do this if the stateVersion is still below 19.09 to avoid
starting to have an ever growing activation script for (then) ancient
systemd migrations that are no longer required.

See systemd/systemd#12131 for details about
the missing migration path and related discussion.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    024a383 View commit details

  11. multipath-tools: 0.6.2 -> 0.8.1

    @fpletz @andir
    fpletz authored and andir committed Jun 3, 2019
    Copy the full SHA
    d436ab0 View commit details

  12. systemd: disable building tests 

    We are currently not running any tests but building them takes
signitifcant amounts of time since they account to about 40% of all the
compilation targets.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    81f390d View commit details

  13. systemd: remove references to $out/lib/systemd/catalog 

    On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib
output. The result of that is a dependency cycle between $out and $lib.
Thus nix (rightfully) marks the build as failed. That reference
originates from an array of strings (catalog_file_dirs) in systemd
(src/src/journal/catalog.{c,h}).  The only consumer (as of v242) of the
symbol is the main function of journalctl.  Still libsystemd.so contains
the VALUE but not the symbol.  Systemd seems to be properly using
function & data sections together with the linker flags to garbage
collect unused sections (-Wl,--gc-sections).  For unknown reasons those
flags do not eliminate the unused string constants, in this case on
aarch64-linux. The hacky way is to just remove the reference after we
finished compiling.  Since it can not be used (there is no symbol to
actually refer to it) there should not be any harm.  It is a bit odd and
I really do not like starting these kind of hacks but there doesn't seem
to be a straight forward way at this point in time.

The reference will be replaced by the same reference the usual nukeRefs
tooling uses.  The standard tooling can not / should not be uesd since
it is a bit too excessive and could potentially do us some (more) harm.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    0f93834 View commit details

  14. nixos/misc: warn when someone is using the nixops autoLuks module 

    The autoLuks module is not really compatible with the updated systemd
version anymore. We started dropping NixOS specific patches that caused
unwanted side effects that we had to work around otherwise.

This change points users towards the relevant PR and spits out a bit of
information on how to deal with the situation.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    9077623 View commit details

  15. nixos/test: remove the stateVersion statement from the test-instrumen… 

    …tation

We set stateVersion to `mkDefault 18.03` in
`nixos/modules/testing/test-instrumentation.nix` and in
`modules/installer/cd-dvd/installation-cd-base.nix`.

Accessing the stateVersion in the module system from within the tests
results in the following error:
> The unique option `system.stateVersion' is defined multiple times, in
> `nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-base.nix' and
> `nixpkgs/nixos/modules/testing/test-instrumentation.nix'.

There are other tests that use it as well. Namely the radicale test also
verifies behaviour between state versions is as expected. It switches a
package default value. Others switched on the state directory default.
It seems like having the timesyncd switch as part of every rendered
activationScript might cause this weird error.

Removing this line seems like a reasonable thing to do since we actually
set the default to the very same value in the module system. This line
should have been no-op besides the issue that we've two statements
setting it in this very specific case.
    @andir
    andir committed Jun 3, 2019
    Copy the full SHA
    7508490 View commit details

  16. systemd: 239 -> 242 (#61321) 

    systemd: 239 -> 242
    @flokli
    flokli authored Jun 3, 2019
    Copy the full SHA
    2812b5c View commit details
Loading