From 1d235be2086dde14050fc811dc37528dec301783 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 26 Jun 2018 01:11:00 +0200 Subject: [PATCH] virtlyst: init at 1.1.0 Co-authored-by: elseym --- .../virtlyst/add-admin-password-env.patch | 14 ++++++++ pkgs/servers/web-apps/virtlyst/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch create mode 100644 pkgs/servers/web-apps/virtlyst/default.nix diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch new file mode 100644 index 000000000000..e20acdb04a9e --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch @@ -0,0 +1,14 @@ +diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp +index acd195d..8809e4f 100644 +--- a/src/virtlyst.cpp ++++ b/src/virtlyst.cpp +@@ -340,7 +340,8 @@ bool Virtlyst::createDB() + qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); + return false; + } +- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); ++ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", ++ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); + query.bindValue(QStringLiteral(":password"), QString::fromLatin1( + CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); + if (!query.exec()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix new file mode 100644 index 000000000000..c6245f9b40d2 --- /dev/null +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook +, qtbase, libvirt, cutelyst, grantlee }: + +stdenv.mkDerivation rec { + name = "virtlyst-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "cutelyst"; + repo = "Virtlyst"; + rev = "v${version}"; + sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw"; + }; + + nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ]; + buildInputs = [ qtbase libvirt cutelyst grantlee ]; + + installPhase = '' + mkdir -p $out/lib + cp src/libVirtlyst.so $out/lib + cp -r ../root $out + ''; + + patches = [ ./add-admin-password-env.patch ]; + + meta = with lib; { + description = "Web interface to manage virtual machines with libvirt"; + homepage = https://github.com/cutelyst/Virtlyst; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31ad7bed63f0..9cae3fa291da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13171,6 +13171,8 @@ with pkgs; unifiTesting; unifi = unifiStable; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { }; virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { };