public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121936 from svanderburg/disnix_style_fixes 

Disnix style fixes
This commit is contained in:
Sander van der Burg 2021-05-06 21:30:59 +02:00 committed by GitHub
parent ac36e938f2 77295e7e6b
commit 5af7d3ebbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/misc/disnix.nix
View File

@ -53,6 +53,7 @@ in
environment.systemPackages = [ pkgs.disnix ] ++ optional cfg.useWebServiceInterface pkgs.DisnixWebService; 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.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.enable = true;
services.dbus.packages = [ pkgs.disnix ]; services.dbus.packages = [ pkgs.disnix ];

11
pkgs/tools/package-management/disnix/dydisnix/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
version="2020-11-02"; version = "unstable-2020-11-02";
name = "dydisnix-${version}"; name = "dydisnix-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -13,13 +15,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoconf automake libtool ]; nativeBuildInputs = [ pkg-config autoconf automake libtool ];
buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ]; buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext ];
preConfigure = '' preConfigure = ''
./bootstrap ./bootstrap
''; '';
meta = { meta = {
description = "A toolset enabling self-adaptive redeployment on top of Disnix"; 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; license = lib.licenses.lgpl21Plus;
maintainers = [ lib.maintainers.tomberek ]; maintainers = [ lib.maintainers.tomberek ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;

8
pkgs/tools/package-management/disnix/dysnomia/default.nix
View File

@ -1,5 +1,11 @@
{ lib, stdenv, fetchurl, netcat { 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 , enableApacheWebApplication ? false
, enableAxis2WebService ? false , enableAxis2WebService ? false
, enableEjabberdDump ? false , enableEjabberdDump ? false