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: 69dc7e64ad9f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 274a62a2bece
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 6, 2020

  1. nixos/systemd: use global proxy config in systemd-importd

    @michaeladler
    michaeladler committed May 6, 2020

    Unverified

    The email in this signature doesn’t match the committer email.
    GPG key ID: B2D065AD4D6E0C81
    Expired
    Learn about vigilant mode
    Copy the full SHA
    7915dc7 View commit details

  2. Merge pull request #75487 from michaeladler/nixos-unstable 

    nixos/systemd: use global proxy config in systemd-importd
    @flokli
    flokli authored May 6, 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
    274a62a View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 nixos/modules/system/boot/systemd.nix
3 changes: 3 additions & 0 deletions nixos/modules/system/boot/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -405,6 +405,8 @@ let
"hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock"
];

proxy_env = config.networking.proxy.envVars;

in

{
@@ -1056,6 +1058,7 @@ in
systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ];
systemd.services.systemd-importd.environment = proxy_env;

# Don't bother with certain units in containers.
systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";