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

Commits on Jan 6, 2020

  1. nixos/systemd: Explicitly put default path packages after others 

    This fixes the dhcpcd issue in #76969,
which was exposed by #75031
introducing changes in the module ordering and therefore option ordering
too.

The dhcpcd issue would also be fixable by explicitly putting
dhcpcd's paths before others, however it makes more sense for systemd's
default paths to be after all others by default, since they should only
be a fallback, which is how binary finding will work if they come after.
    @infinisil
    infinisil committed Jan 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
    9327e1c View commit details

  2. nixos/systemd: Explicitly put default path packages after othe… (#77088) 

    nixos/systemd: Explicitly put default path packages after others
    @infinisil
    infinisil authored Jan 6, 2020
    Copy the full SHA
    ff16d17 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/system/boot/systemd.nix
2 changes: 1 addition & 1 deletion nixos/modules/system/boot/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -240,7 +240,7 @@ let
serviceConfig = { name, config, ... }: {
config = mkMerge
[ { # Default path for systemd services. Should be quite minimal.
path =
path = mkAfter
[ pkgs.coreutils
pkgs.findutils
pkgs.gnugrep