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

Systemd with the `remote` feature enabled by default

authored by Florian Klink and committed by GitHub 2308df88 75c5e594

+25 -1
+1
nixos/tests/all-tests.nix
··· 340 340 systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; 341 341 systemd-boot = handleTest ./systemd-boot.nix {}; 342 342 systemd-confinement = handleTest ./systemd-confinement.nix {}; 343 + systemd-journal = handleTest ./systemd-journal.nix {}; 343 344 systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; 344 345 systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; 345 346 systemd-networkd = handleTest ./systemd-networkd.nix {};
+20
nixos/tests/systemd-journal.nix
··· 1 + import ./make-test-python.nix ({ pkgs, ... }: 2 + 3 + { 4 + name = "systemd-journal"; 5 + meta = with pkgs.stdenv.lib.maintainers; { 6 + maintainers = [ lewo ]; 7 + }; 8 + 9 + machine = { pkgs, lib, ... }: { 10 + services.journald.enableHttpGateway = true; 11 + }; 12 + 13 + testScript = '' 14 + machine.wait_for_unit("multi-user.target") 15 + 16 + machine.succeed( 17 + "${pkgs.curl}/bin/curl -s localhost:19531/machine | ${pkgs.jq}/bin/jq -e '.hostname == \"machine\"'" 18 + ) 19 + ''; 20 + })
+3 -1
pkgs/os-specific/linux/systemd/default.nix
··· 53 53 , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms 54 54 , kexectools 55 55 , bashInteractive 56 + , libmicrohttpd 56 57 57 58 , withAnalyze ? true 58 59 , withApparmor ? true ··· 71 72 , withNss ? true 72 73 , withPCRE2 ? true 73 74 , withPolkit ? true 74 - , withRemote ? false # has always been disabled on NixOS, upstream version appears broken anyway 75 + , withRemote ? true 75 76 , withResolved ? true 76 77 , withShellCompletions ? true 77 78 , withTimedated ? true ··· 201 202 ++ lib.optional withPCRE2 pcre2 202 203 ++ lib.optional withResolved libgpgerror 203 204 ++ lib.optional withSelinux libselinux 205 + ++ lib.optional withRemote libmicrohttpd 204 206 ; 205 207 206 208 #dontAddPrefix = true;
+1
pkgs/top-level/all-packages.nix
··· 18812 18812 withNss = false; 18813 18813 withPCRE2 = false; 18814 18814 withPolkit = false; 18815 + withRemote = false; 18815 18816 withResolved = false; 18816 18817 withShellCompletions = false; 18817 18818 withTimedated = false;