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

Commits on Apr 14, 2020

  1. dysnomia: 0.9 -> 0.9.1 

    (cherry picked from commit dc13460)
    @svanderburg
    svanderburg committed Apr 14, 2020
    Copy the full SHA
    8b40e89 View commit details

  2. nixos/dysnomia: fix documentRoot property 

    (cherry picked from commit 0ffb720)
    @svanderburg
    svanderburg committed Apr 14, 2020
    Copy the full SHA
    6fd93c3 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 nixos/modules/services/misc/dysnomia.nix
  2. +3 −3 pkgs/tools/package-management/disnix/dysnomia/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/dysnomia.nix
View file
Original file line number Diff line number Diff line change
@@ -177,7 +177,7 @@ in
wrapper = {};
}
// lib.optionalAttrs (config.services.httpd.enable) { apache-webapplication = {
documentRoot = config.services.httpd.documentRoot;
documentRoot = config.services.httpd.virtualHosts.localhost.documentRoot;
}; }
// lib.optionalAttrs (config.services.tomcat.axis2.enable) { axis2-webservice = {}; }
// lib.optionalAttrs (config.services.ejabberd.enable) { ejabberd-dump = {
6 changes: 3 additions & 3 deletions pkgs/tools/package-management/disnix/dysnomia/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,10 +22,10 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
assert enableInfluxDatabase -> influxdb != null;

stdenv.mkDerivation {
name = "dysnomia-0.9";
name = "dysnomia-0.9.1";
src = fetchurl {
url = https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz;
sha256 = "09pk2l3pss48kvm5wvskh842vakbzmjzxzfzyw1nkqnvni130ikl";
url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz";
sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks";
};

preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";