Merge pull request #185001 from fpletz/pkgs/lyst-removal
cutelyst,virtlyst: remove
This commit is contained in:
Franz Pletz
@@ -279,6 +279,12 @@
|
||||
available via the <literal>hardware.xone</literal> module.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
virtlyst package and <literal>services.virtlyst</literal>
|
||||
module removed, due to lack of maintainers.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.graphite.api</literal> and
|
||||
|
||||
@@ -107,6 +107,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module.
|
||||
|
||||
- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.
|
||||
|
||||
- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and
|
||||
the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and
|
||||
`python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
|
||||
|
||||
@@ -1107,7 +1107,6 @@
|
||||
./services/web-apps/shiori.nix
|
||||
./services/web-apps/snipe-it.nix
|
||||
./services/web-apps/vikunja.nix
|
||||
./services/web-apps/virtlyst.nix
|
||||
./services/web-apps/wiki-js.nix
|
||||
./services/web-apps/whitebophir.nix
|
||||
./services/web-apps/wordpress.nix
|
||||
|
||||
@@ -1,73 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.services.virtlyst;
|
||||
stateDir = "/var/lib/virtlyst";
|
||||
|
||||
ini = pkgs.writeText "virtlyst-config.ini" ''
|
||||
[wsgi]
|
||||
master = true
|
||||
threads = auto
|
||||
http-socket = ${cfg.httpSocket}
|
||||
application = ${pkgs.virtlyst}/lib/libVirtlyst.so
|
||||
chdir2 = ${stateDir}
|
||||
static-map = /static=${pkgs.virtlyst}/root/static
|
||||
|
||||
[Cutelyst]
|
||||
production = true
|
||||
DatabasePath = virtlyst.sqlite
|
||||
TemplatePath = ${pkgs.virtlyst}/root/src
|
||||
|
||||
[Rules]
|
||||
cutelyst.* = true
|
||||
virtlyst.* = true
|
||||
'';
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
options.services.virtlyst = {
|
||||
enable = mkEnableOption "Virtlyst libvirt web interface";
|
||||
|
||||
adminPassword = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
Initial admin password with which the database will be seeded.
|
||||
'';
|
||||
};
|
||||
|
||||
httpSocket = mkOption {
|
||||
type = types.str;
|
||||
default = "localhost:3000";
|
||||
description = lib.mdDoc ''
|
||||
IP and/or port to which to bind the http socket.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.users.virtlyst = {
|
||||
home = stateDir;
|
||||
createHome = true;
|
||||
group = mkIf config.virtualisation.libvirtd.enable "libvirtd";
|
||||
isSystemUser = true;
|
||||
};
|
||||
|
||||
systemd.services.virtlyst = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = {
|
||||
VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword;
|
||||
};
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}";
|
||||
User = "virtlyst";
|
||||
WorkingDirectory = stateDir;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook
|
||||
, qtbase, libuuid, libcap, uwsgi, grantlee, pcre
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cutelyst";
|
||||
version = "2.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cutelyst";
|
||||
repo = "cutelyst";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
|
||||
buildInputs = [
|
||||
qtbase
|
||||
grantlee
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
libuuid
|
||||
libcap
|
||||
uwsgi
|
||||
pcre
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin
|
||||
"-DPLUGIN_STATICCOMPRESSED=ON"
|
||||
"-DPLUGIN_CSRFPROTECTION=ON"
|
||||
"-DPLUGIN_VIEW_GRANTLEE=ON"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "C++ Web Framework built on top of Qt";
|
||||
homepage = "https://cutelyst.org/";
|
||||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
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()) {
|
||||
@@ -1,39 +0,0 @@
|
||||
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook
|
||||
, qtbase, libvirt, cutelyst, grantlee }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "virtlyst";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cutelyst";
|
||||
repo = "Virtlyst";
|
||||
rev = "v${version}";
|
||||
sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ];
|
||||
buildInputs = [ qtbase libvirt cutelyst grantlee ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp src/libVirtlyst${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib
|
||||
cp -r ../root $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
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;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ fpletz ];
|
||||
};
|
||||
}
|
||||
@@ -17425,8 +17425,6 @@ with pkgs;
|
||||
|
||||
cutee = callPackage ../development/libraries/cutee { };
|
||||
|
||||
cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { };
|
||||
|
||||
cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; };
|
||||
|
||||
cwiid = callPackage ../development/libraries/cwiid { };
|
||||
@@ -23295,8 +23293,6 @@ with pkgs;
|
||||
|
||||
virtiofsd = callPackage ../servers/misc/virtiofsd { };
|
||||
|
||||
virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
|
||||
|
||||
virtualenv = with python3Packages; toPythonApplication virtualenv;
|
||||
|
||||
virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone;
|
||||
|
||||
Reference in New Issue
Block a user