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: 17631db07cae
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 95e1ba302d09
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 15, 2021

  1. docker: fix systemd socket activation

    @mikroskeem
    mikroskeem committed Jan 15, 2021
    Copy the full SHA
    a81c27c View commit details
    Browse the repository at this point in the history

  2. Revert "nixos/tests/docker: wait for docker service" 

    This reverts commit c14bafd.
    @mikroskeem
    mikroskeem committed Jan 15, 2021
    Copy the full SHA
    f53cf9a View commit details
    Browse the repository at this point in the history

  3. nixos/docker: change misleading error message 

    The socketActivation option was removed, but later on socket activation
was added back without the option to disable it. The description now reflects
that socket activation is used unconditionally in the current setup.
    Milan Pässler committed Jan 15, 2021
    Copy the full SHA
    4000091 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #109447 from mikroskeem/docker-20.10-fixes 

    Docker 20.10 fixes
    @roberth
    roberth committed Jan 15, 2021
    Copy the full SHA
    95e1ba3 View commit details
    Browse the repository at this point in the history