diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix')
5 files changed, 57 insertions, 24 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index 5ede7af10bf0..b4cb6d030411 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }: stdenv.mkDerivation { - name = "DisnixWebService-0.9"; + name = "DisnixWebService-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; - sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.10/DisnixWebService-0.10.tar.gz"; + sha256 = "0m451msd127ay09yb8rbflg68szm8s4hh65j99f7s3mz375vc114"; }; buildInputs = [ apacheAnt jdk ]; PREFIX = ''''${env.out}''; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix index cc6072eb6dc8..f63c7dd737cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/default.nix @@ -1,24 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintl, libiconv }: +{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: stdenv.mkDerivation { - name = "disnix-0.9.1"; + name = "disnix-0.10"; src = fetchurl { - url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; - sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.10/disnix-0.10.tar.gz"; + sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; }; - configureFlags = [ - " --with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d" - ]; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; meta = { description = "A Nix-based distributed service deployment tool"; license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.sander ]; + maintainers = with stdenv.lib.maintainers; [ sander tomberek ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix index 709c5454e104..2fa7d3ed9d76 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: stdenv.mkDerivation { - name = "disnixos-0.8"; - + name = "disnixos-0.9"; + src = fetchurl { - url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; - sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.9/disnixos-0.9.tar.gz"; + sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix new file mode 100644 index 000000000000..552d2a106fba --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: + +stdenv.mkDerivation rec { + version="2020-07-04"; + name = "dydisnix-${version}"; + + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "dydisnix"; + rev = "e99091f1c2329d562097e35faedee80622d387f0"; + sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; + }; + + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; + 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."; + license = stdenv.lib.licenses.lgpl21Plus; + maintainers = [ stdenv.lib.maintainers.tomberek ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix index 2485becc9e57..031e926e78a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/infra/libkookie/nixpkgs/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"; |