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

Commits on Jan 8, 2020

  1. nixos/systemd-lib: don't fail on systemd.packages duplicates 

    In some cases like we've noticed in #76169,
having duplicate packages in systemd.packages like
```
systemd.packages = [ gnome-shell gnome-shell gnome-session ];
```
breaks.

Here we use an associative array to ensure no
duplicate paths when we symlink all the units listed
in systemd.packages.
    @worldofpeace
    worldofpeace committed Jan 8, 2020
    Copy the full SHA
    1c2e27e View commit details

Commits on Jan 17, 2020

  1. Merge pull request #77294 from worldofpeace/systemd-packages-duplicates 

    nixos/systemd-lib: don't fail on systemd.packages duplicates
    @worldofpeace
    worldofpeace authored Jan 17, 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
    b3c8534 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 nixos/modules/system/boot/systemd-lib.nix
8 changes: 7 additions & 1 deletion nixos/modules/system/boot/systemd-lib.nix
View file
Original file line number Diff line number Diff line change
@@ -147,7 +147,13 @@ in rec {
done
# Symlink all units provided listed in systemd.packages.
for i in ${toString cfg.packages}; do
packages="${toString cfg.packages}"
# Filter duplicate directories
declare -A unique_packages
for k in $packages ; do unique_packages[$k]=1 ; done
for i in ''${!unique_packages[@]}; do
for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
if ! [[ "$fn" =~ .wants$ ]]; then
if [[ -d "$fn" ]]; then