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
base: 70ecf83c3379
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2d55f9c01a20
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 4, 2020

  1. nixos/systemd-nspawn: disallow multiple packages with .nspawn-units 

    In contrast to `.service`-units, it's not possible to declare an
`overrides.conf`, however this is done by `generateUnits` for `.nspawn`
units as well. This change breaks the build if you have two derivations
configuring one nspawn unit.

This will happen in a case like this:

``` nix
{ pkgs, ... }: {
  systemd.packages = [
    (pkgs.writeTextDir "etc/systemd/nspawn/container0.nspawn" ''
      [Files]
      Bind=/tmp
    '')
  ];
  systemd.nspawn.container0 = {
    /* ... */
  };
}
```
    @Ma27
    Ma27 committed Apr 4, 2020
    Copy the full SHA
    a9e3ec1 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. Merge pull request #84266 from Ma27/nspawn-overrides 

    nixos/systemd-nspawn: disallow multiple packages with `.nspawn`-units
    @Ma27
    Ma27 committed Apr 15, 2020
    Copy the full SHA
    2d55f9c View commit details
    Browse the repository at this point in the history