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

Commits on Aug 3, 2018

  1. nixos/disnix: fix broken service because of rename

    @svanderburg
    svanderburg committed Aug 3, 2018
    9

    Partially verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    5c897b4 View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 nixos/modules/services/misc/disnix.nix
  2. +5 −5 nixos/modules/services/misc/dysnomia.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/disnix.nix
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ in
###### implementation

config = mkIf cfg.enable {
services.dysnomia.enable = true;
dysnomia.enable = true;

environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService;

10 changes: 5 additions & 5 deletions nixos/modules/services/misc/dysnomia.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
with lib;

let
cfg = config.services.dysnomia;
cfg = config.dysnomia;

printProperties = properties:
concatMapStrings (propertyName:
@@ -69,7 +69,7 @@ let
in
{
options = {
services.dysnomia = {
dysnomia = {

enable = mkOption {
type = types.bool;
@@ -142,7 +142,7 @@ in

environment.systemPackages = [ cfg.package ];

services.dysnomia.package = pkgs.dysnomia.override (origArgs: {
dysnomia.package = pkgs.dysnomia.override (origArgs: {
enableApacheWebApplication = config.services.httpd.enable;
enableAxis2WebService = config.services.tomcat.axis2.enable;
enableEjabberdDump = config.services.ejabberd.enable;
@@ -153,7 +153,7 @@ in
enableMongoDatabase = config.services.mongodb.enable;
});

services.dysnomia.properties = {
dysnomia.properties = {
hostname = config.networking.hostName;
inherit (config.nixpkgs.localSystem) system;

@@ -171,7 +171,7 @@ in
}}");
};

services.dysnomia.containers = lib.recursiveUpdate ({
dysnomia.containers = lib.recursiveUpdate ({
process = {};
wrapper = {};
}