From 52c427b8be770ec47cee081173def88c194d922f Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 May 2021 19:15:46 +0200 Subject: [PATCH 1/3] dysnomia: make function header more readable --- pkgs/tools/package-management/disnix/dysnomia/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 0475e04cb698..d75683a87445 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,11 @@ { lib, stdenv, fetchurl, netcat -, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null, nginx ? null, s6-rc ? null, xinetd ? null + +# Optional packages +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null +, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null +, nginx ? null, s6-rc ? null, xinetd ? null + +# Configuration flags , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false From a4c768fccd8275e7f6f6f22d9f66290a8c9613ae Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 May 2021 19:28:50 +0200 Subject: [PATCH 2/3] dydisnix: tidy up expression --- .../package-management/disnix/dydisnix/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index 653def890278..924ed8252811 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, glib +, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix +}: stdenv.mkDerivation rec { - version="2020-11-02"; + version = "unstable-2020-11-02"; name = "dydisnix-${version}"; src = fetchFromGitHub { @@ -13,13 +15,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ]; + preConfigure = '' ./bootstrap ''; meta = { description = "A toolset enabling self-adaptive redeployment on top of Disnix"; - longDescription = "Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems."; + longDescription = '' + Dynamic Disnix is a (very experimental!) prototype extension framework for Disnix supporting dynamic (re)deployment of service-oriented systems. + ''; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.tomberek ]; platforms = lib.platforms.unix; From 77295e7e6b366d593dc25cdbf3b1b44ccd6e2007 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 6 May 2021 19:28:57 +0200 Subject: [PATCH 3/3] nixos/disnix: configure the remote client by default, if multi-user mode has been enabled --- nixos/modules/services/misc/disnix.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index aea49511327d..24a259bb4d2b 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -53,6 +53,7 @@ in environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles); + environment.variables.DISNIX_REMOTE_CLIENT = lib.optionalString (cfg.enableMultiUser) "disnix-client"; services.dbus.enable = true; services.dbus.packages = [ pkgs.disnix ];