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: f349aca12afd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 60100a7c922d
Choose a head ref
  • 10 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 18, 2020

  1. nixos/dokuwiki: add <name?> option 

    Enables multi-site configurations.

This break compatibility with prior configurations that expect options
for a single dokuwiki instance in `services.dokuwiki`.
    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    dc7ed06 View commit details
    Browse the repository at this point in the history

  2. nixos/dokuwiki: refactor

    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    71baf48 View commit details
    Browse the repository at this point in the history

  3. nixos/dokuwiki: add plugins and templates options 

    Adds support for additional plugins and templates similarly to how
wordpress.nix does it.

Plugins and templates need to be packaged as in the example.
    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    af6a7a0 View commit details
    Browse the repository at this point in the history

  4. nixos/dokuwiki: add assertion for usersFile

    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    0228046 View commit details
    Browse the repository at this point in the history

  5. nixos/dokuwiki: set default value for usersFile 

    If usersFile is not set, a file is created along the stateDir that can
hold the users and supports dynamically adding users using the web GUI.
    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    a58dc30 View commit details
    Browse the repository at this point in the history

  6. nixos/dokuwiki: add option disableActions

    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    2e699f1 View commit details
    Browse the repository at this point in the history

  7. nixos/dokuwiki: dokuwiki user

    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    2b67a89 View commit details
    Browse the repository at this point in the history

  8. nixos/dokuwiki: modify usersFile and aclFile 

    Use types.str instead of types.path to exclude private information from
the derivation.
Add a warinig about the contents of acl beeing included in the nix
store.
    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    9460fb5 View commit details
    Browse the repository at this point in the history

  9. nixos/dokuwiki: change default of aclFile and usersFile 

    `aclFile` and `usersFile` will be set to a default value if `aclUse` is
specified and aclFile is not overriden by `acl`.
    @dadada
    dadada committed Apr 18, 2020
    Copy the full SHA
    2d86cca View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2020

  1. Merge pull request #83769 from dadada/nixos/dokuwiki-multi-server 

    nixos/dokuwiki: add support for multi-site, additional plugins and templates
    @mmahut
    mmahut committed Apr 20, 2020
    Copy the full SHA
    60100a7 View commit details
    Browse the repository at this point in the history