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: 75c5e594a4fd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2308df888104
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Nov 2, 2020

  1. systemd: set withRemote true by default 

    This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
    @nlewo
    nlewo committed Nov 2, 2020
    Copy the full SHA
    859a44e View commit details

  2. nixos.tests.systemd-journal: add basic systemd-journal-gatewayd test 

    This test allows to ensure the systemd-journal-gatewayd service is
responding correcly when the NixOS option `enableHttpGateway` is set.

The test has not been added into the main systemd test because a
graphical stack is not required (and rebuilding the graphical stack on
systemd change is huge).
    @nlewo
    nlewo committed Nov 2, 2020
    Copy the full SHA
    81063ee View commit details

  3. Merge pull request #102448 from nlewo/systemd-withRemote-by-default 

    Systemd with the `remote` feature enabled by default
    @flokli
    flokli authored Nov 2, 2020

    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
    2308df8 View commit details
Showing with 25 additions and 1 deletion.
  1. +1 −0 nixos/tests/all-tests.nix
  2. +20 −0 nixos/tests/systemd-journal.nix
  3. +3 −1 pkgs/os-specific/linux/systemd/default.nix
  4. +1 −0 pkgs/top-level/all-packages.nix
1 change: 1 addition & 0 deletions nixos/tests/all-tests.nix
View file
Original file line number Diff line number Diff line change
@@ -340,6 +340,7 @@ in
systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {};
systemd-boot = handleTest ./systemd-boot.nix {};
systemd-confinement = handleTest ./systemd-confinement.nix {};
systemd-journal = handleTest ./systemd-journal.nix {};
systemd-timesyncd = handleTest ./systemd-timesyncd.nix {};
systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {};
systemd-networkd = handleTest ./systemd-networkd.nix {};
20 changes: 20 additions & 0 deletions nixos/tests/systemd-journal.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import ./make-test-python.nix ({ pkgs, ... }:

{
name = "systemd-journal";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ lewo ];
};

machine = { pkgs, lib, ... }: {
services.journald.enableHttpGateway = true;
};

testScript = ''
machine.wait_for_unit("multi-user.target")
machine.succeed(
"${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'"
)
'';
})
4 changes: 3 additions & 1 deletion pkgs/os-specific/linux/systemd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@
, withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms
, kexectools
, bashInteractive
, libmicrohttpd

, withAnalyze ? true
, withApparmor ? true
@@ -71,7 +72,7 @@
, withNss ? true
, withPCRE2 ? true
, withPolkit ? true
, withRemote ? false # has always been disabled on NixOS, upstream version appears broken anyway
, withRemote ? true
, withResolved ? true
, withShellCompletions ? true
, withTimedated ? true
@@ -201,6 +202,7 @@ stdenv.mkDerivation {
++ lib.optional withPCRE2 pcre2
++ lib.optional withResolved libgpgerror
++ lib.optional withSelinux libselinux
++ lib.optional withRemote libmicrohttpd
;

#dontAddPrefix = true;
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -18812,6 +18812,7 @@ in
withNss = false;
withPCRE2 = false;
withPolkit = false;
withRemote = false;
withResolved = false;
withShellCompletions = false;
withTimedated = false;