diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2021-05-05 20:04:48 +0200 |
---|---|---|
committer | Sander van der Burg <sander.van.der.burg@mendix.com> | 2021-05-05 20:04:48 +0200 |
commit | 1021cd5d6c41551d9211d01ebfa5372690515703 (patch) | |
tree | 7c444d70ad7c77489c6fec1387e5f1312e77a819 | |
parent | 8e72457f860f2544ad3c494f8b9178f17e42d42e (diff) | |
download | nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.tar nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.tar.gz nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.tar.bz2 nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.tar.lz nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.tar.xz nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.tar.zst nixpkgs-1021cd5d6c41551d9211d01ebfa5372690515703.zip |
dysnomia: 0.10 -> 0.10.1 and add support for new plugins
-rw-r--r-- | pkgs/tools/package-management/disnix/dysnomia/default.nix | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 56ba16afb47..0475e04cb69 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ { 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 +, 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 , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -10,7 +10,10 @@ , enableMongoDatabase ? false , enableInfluxDatabase ? false , enableSupervisordProgram ? false -, enableDockerContainer ? true +, enableDockerContainer ? false +, enableNginxWebApplication ? false +, enableXinetdService ? false +, enableS6RCService ? false , enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" @@ -25,16 +28,17 @@ assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; assert enableSupervisordProgram -> supervisor != null; assert enableDockerContainer -> docker != null; +assert enableNginxWebApplication -> nginx != null; +assert enableS6RCService -> s6-rc != null; +assert enableXinetdService -> xinetd != null; stdenv.mkDerivation { - name = "dysnomia-0.10"; + name = "dysnomia-0.10.1"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; - sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10.1/dysnomia-0.10.1.tar.gz"; + sha256 = "0w9601g8zpaxrmynx6mh8zz85ldpb8psp7cc6ls8v3srjpj1l5n3"; }; - preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; - configureFlags = [ (if enableApacheWebApplication then "--with-apache" else "--without-apache") (if enableAxis2WebService then "--with-axis2" else "--without-axis2") @@ -47,6 +51,10 @@ stdenv.mkDerivation { (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") (if enableDockerContainer then "--with-docker" else "--without-docker") + (if enableNginxWebApplication then "--with-nginx" else "--without-nginx") + (if enableXinetdService then "--with-xinetd" else "--without-xinetd") + (if enableS6RCService then "--with-s6-rc" else "--without-s6-rc") + (if stdenv.isDarwin then "--with-launchd" else "--without-launchd") "--with-job-template=${jobTemplate}" ] ++ lib.optional enableLegacy "--enable-legacy"; @@ -56,11 +64,13 @@ stdenv.mkDerivation { ++ lib.optional enableMySQLDatabase mysql.out ++ lib.optional enablePostgreSQLDatabase postgresql ++ lib.optional enableSubversionRepository subversion - ++ lib.optional enableMongoDatabase mongodb - ++ lib.optional enableMongoDatabase mongodb-tools + ++ lib.optionals enableMongoDatabase [ mongodb mongodb-tools ] ++ lib.optional enableInfluxDatabase influxdb ++ lib.optional enableSupervisordProgram supervisor - ++ lib.optional enableDockerContainer docker; + ++ lib.optional enableDockerContainer docker + ++ lib.optional enableNginxWebApplication nginx + ++ lib.optional enableS6RCService s6-rc + ++ lib.optional enableXinetdService xinetd; meta = { description = "Automated deployment of mutable components and services for Disnix"; |