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

Commits on Apr 1, 2020

  1. nixos/nextcloud: avoid loading imagick extension more than once 

    This avoids the following error message:
  Module 'imagick' already loaded at Unknown#0

(cherry picked from commit db32158)
    @BBBSnowball @Ekleog
    BBBSnowball authored and Ekleog committed Apr 1, 2020
    Copy the full SHA
    2bdd1f3 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/web-apps/nextcloud.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -471,7 +471,7 @@ in {
pools.nextcloud = {
user = "nextcloud";
group = "nginx";
phpOptions = phpOptionsExtensions + phpOptionsStr;
phpOptions = phpOptionsStr;
phpPackage = phpPackage;
phpEnv = {
NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config";