diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2020-11-28 20:10:48 +0100 |
---|---|---|
committer | Sander van der Burg <sander.van.der.burg@mendix.com> | 2020-11-28 20:15:21 +0100 |
commit | 5d1125ede5885dbfc0707aa95dd8dd76d2d976a8 (patch) | |
tree | 794893e1f2ecc4018d6c2ab85a6850c1bbdc1168 | |
parent | d5d9e311e45a1920c9d0f2aeb1d083f47129506d (diff) | |
download | nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.tar nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.tar.gz nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.tar.bz2 nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.tar.lz nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.tar.xz nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.tar.zst nixpkgs-5d1125ede5885dbfc0707aa95dd8dd76d2d976a8.zip |
dysnomia: 0.9.1 -> 0.10
-rw-r--r-- | pkgs/tools/package-management/disnix/dysnomia/default.nix | 26 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 21 insertions, 9 deletions
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 2485becc9e5..031e926e78a 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl -, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null +{ stdenv, fetchurl, netcat +, systemd ? null, ejabberd ? null, mysql ? null, postgresql ? null, subversion ? null, mongodb ? null, mongodb-tools ? null, influxdb ? null, supervisor ? null, docker ? null , enableApacheWebApplication ? false , enableAxis2WebService ? false , enableEjabberdDump ? false @@ -9,6 +9,9 @@ , enableTomcatWebApplication ? false , enableMongoDatabase ? false , enableInfluxDatabase ? false +, enableSupervisordProgram ? false +, enableDockerContainer ? true +, enableLegacy ? false , catalinaBaseDir ? "/var/tomcat" , jobTemplate ? "systemd" , getopt @@ -20,12 +23,14 @@ assert enableSubversionRepository -> subversion != null; assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); assert enableInfluxDatabase -> influxdb != null; +assert enableSupervisordProgram -> supervisor != null; +assert enableDockerContainer -> docker != null; stdenv.mkDerivation { - name = "dysnomia-0.9.1"; + name = "dysnomia-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9.1/dysnomia-0.9.1.tar.gz"; - sha256 = "1rrq9jnmpsjg1rrjbnq7znm4gma2ga5j4nlykvxwkylp72dq12ks"; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.10/dysnomia-0.10.tar.gz"; + sha256 = "19zg4nhn0f9v4i7c9hhan1i4xv3ljfpl2d0s84ph8byiscvhyrna"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; @@ -40,17 +45,22 @@ stdenv.mkDerivation { (if enableTomcatWebApplication then "--with-tomcat=${catalinaBaseDir}" else "--without-tomcat") (if enableMongoDatabase then "--with-mongodb" else "--without-mongodb") (if enableInfluxDatabase then "--with-influxdb" else "--without-influxdb") + (if enableSupervisordProgram then "--with-supervisord" else "--without-supervisord") + (if enableDockerContainer then "--with-docker" else "--without-docker") "--with-job-template=${jobTemplate}" - ]; + ] ++ stdenv.lib.optional enableLegacy "--enable-legacy"; - buildInputs = [ getopt ] + buildInputs = [ getopt netcat ] + ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional enableEjabberdDump ejabberd ++ stdenv.lib.optional enableMySQLDatabase mysql.out ++ stdenv.lib.optional enablePostgreSQLDatabase postgresql ++ stdenv.lib.optional enableSubversionRepository subversion ++ stdenv.lib.optional enableMongoDatabase mongodb ++ stdenv.lib.optional enableMongoDatabase mongodb-tools - ++ stdenv.lib.optional enableInfluxDatabase influxdb; + ++ stdenv.lib.optional enableInfluxDatabase influxdb + ++ stdenv.lib.optional enableSupervisordProgram supervisor + ++ stdenv.lib.optional enableDockerContainer docker; meta = { description = "Automated deployment of mutable components and services for Disnix"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94e18adbc2a..18a92786a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27815,7 +27815,9 @@ in disnix = callPackage ../tools/package-management/disnix { }; - dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); + dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or { + inherit (pythonPackages) supervisor; + }); dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; |