From ac0ac4fe51080f0815a0bc4928dc2b23c802fdb2 Mon Sep 17 00:00:00 2001 From: tomberek Date: Wed, 25 Nov 2020 10:27:28 -0500 Subject: [PATCH] dydisnix: init at unstable (#49366) * dydisnix: init at unstable-2018-04-26 updated with suggestions from @xeji * Update pkgs/tools/package-management/disnix/dydisnix/default.nix Co-Authored-By: Ryan Mulligan * Add dydisxnix and libnixxml Co-authored-by: Ryan Mulligan Co-authored-by: Tom Bereknyei --- .../libraries/libnixxml/default.nix | 27 +++++++++++++++++++ .../package-management/disnix/default.nix | 4 +-- .../disnix/dydisnix/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 4 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libnixxml/default.nix create mode 100644 pkgs/tools/package-management/disnix/dydisnix/default.nix diff --git a/pkgs/development/libraries/libnixxml/default.nix b/pkgs/development/libraries/libnixxml/default.nix new file mode 100644 index 000000000000..5741d4cb5b8a --- /dev/null +++ b/pkgs/development/libraries/libnixxml/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub, stdenv, autoreconfHook, pkgconfig, libxml2, gd, glib, getopt, libxslt, nix }: + +stdenv.mkDerivation { + name = "libnixxml"; + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "libnixxml"; + rev = "54c04a5fdbc8661b2445a7527f499e0a77753a1a"; + sha256 = "sha256-HKQnCkO1TDs1e0MDil0Roq4YRembqRHQvb7lK3GAftQ="; + }; + configureFlags = [ "--with-gd" "--with-glib" ]; + CFLAGS = "-Wall"; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ pkgconfig libxml2 gd.dev glib getopt libxslt nix ]; + doCheck = false; + postPatch = '' + ./bootstrap + ''; + + meta = with stdenv.lib; { + description = "XML-based Nix-friendly data integration library"; + homepage = https://github.com/svanderburg/libnixxml; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index cc6072eb6dc8..310ddc9b84e0 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ 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"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { 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/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix new file mode 100644 index 000000000000..552d2a106fba --- /dev/null +++ b/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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6984ee0a757b..40c7e40adfed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5423,6 +5423,8 @@ in libngspice = callPackage ../development/libraries/libngspice { }; + libnixxml = callPackage ../development/libraries/libnixxml { }; + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; libportal = callPackage ../development/libraries/libportal { }; @@ -27773,6 +27775,8 @@ in dysnomia = callPackage ../tools/package-management/disnix/dysnomia (config.disnix or {}); + dydisnix = callPackage ../tools/package-management/disnix/dydisnix { }; + disnixos = callPackage ../tools/package-management/disnix/disnixos { }; DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };