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: a41fb93355d3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d0c12dc612be
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jul 20, 2020

  1. nixos/resilio: fix directoryRoot configuration 

    The resilio module places the directoryRoot configuration in the webui
section. However, the generated configuration fails on the current
version of Resilio Sync with:

Invalid key context: 'directory_root' must be in global config section

This change places this key in the global configuration section to
solve this error.
    @danieldk
    danieldk committed Jul 20, 2020
    Copy the full SHA
    b9e0992 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #85689 from danieldk/resilio-module-fix 

    nixos/resilio: fix directoryRoot configuration
    @danieldk
    danieldk committed Jul 20, 2020
    Copy the full SHA
    d0c12dc View commit details
    Browse the repository at this point in the history