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
base: 33d26f2abb59
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 941aec472e16
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 31, 2020

  1. systemd: disable remote support 

    This disabled systemd-journal-upload and systemd-journal-remote.

We didn't install the unit files anyways, so this was probably not used
at all, and currently fails to build due to libmicrohttpd and systemd
code being incompatible:

```
../src/journal-remote/journal-remote-main.c: In function ‘setup_microhttpd_server’:
../src/journal-remote/journal-remote-main.c:431:38: error: passing argument 5 of ‘MHD_start_daemon’ from incompatible pointer type [-Werror=incompatible-pointer-types]
```
    @flokli
    flokli committed Jul 31, 2020
    5
    Copy the full SHA
    ae896e0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #94356 from flokli/systemd-disable-remote 

    systemd: disable remote support
    @edolstra
    edolstra committed Jul 31, 2020
    Copy the full SHA
    941aec4 View commit details
    Browse the repository at this point in the history