diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-08-05 13:47:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-05 13:47:25 +0200 |
commit | eac2af98eba3d63f54a169391eeddb625119aa62 (patch) | |
tree | 80dd237091dd8af6b2c6da93cb3941af704d5c7c | |
parent | 91e24c2470e5a3bdc606000a7a54614edc0bfc2b (diff) | |
parent | 72d98311e9217deb47824439aac69d83604f1119 (diff) |
Merge pull request #185001 from fpletz/pkgs/lyst-removal
cutelyst,virtlyst: remove
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 6 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/virtlyst.nix | 73 | ||||
-rw-r--r-- | pkgs/development/libraries/cutelyst/default.nix | 41 | ||||
-rw-r--r-- | pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch | 14 | ||||
-rw-r--r-- | pkgs/servers/web-apps/virtlyst/default.nix | 39 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
8 files changed, 8 insertions, 172 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 882eea3c4a4a..2e3dfea8cb6e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -281,6 +281,12 @@ </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 <literal>services.graphite.beacon</literal> NixOS options, and the <literal>python3.pkgs.graphite_api</literal>, diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a2757d67e89c..6bc7d1917cae 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -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 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 616f357663ca..2ae463190fb5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -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 diff --git a/nixos/modules/services/web-apps/virtlyst.nix b/nixos/modules/services/web-apps/virtlyst.nix deleted file mode 100644 index 5094367a4937..000000000000 --- a/nixos/modules/services/web-apps/virtlyst.nix +++ /dev/null @@ -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; - }; - }; - }; - -} diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix deleted file mode 100644 index 51336a9e1a55..000000000000 --- a/pkgs/development/libraries/cutelyst/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch deleted file mode 100644 index e20acdb04a9e..000000000000 --- a/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch +++ /dev/null @@ -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()) { diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix deleted file mode 100644 index d6a72916fae3..000000000000 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb73e403c7ac..db68aa110b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |