Merge pull request #185001 from fpletz/pkgs/lyst-removal

cutelyst,virtlyst: remove

authored by Franz Pletz and committed by GitHub eac2af98 91e24c24

+8 -172
+6
nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
··· 281 281 </listitem> 282 282 <listitem> 283 283 <para> 284 + virtlyst package and <literal>services.virtlyst</literal> 285 + module removed, due to lack of maintainers. 286 + </para> 287 + </listitem> 288 + <listitem> 289 + <para> 284 290 The <literal>services.graphite.api</literal> and 285 291 <literal>services.graphite.beacon</literal> NixOS options, and 286 292 the <literal>python3.pkgs.graphite_api</literal>,
+2
nixos/doc/manual/release-notes/rl-2211.section.md
··· 107 107 108 108 - 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. 109 109 110 + - virtlyst package and `services.virtlyst` module removed, due to lack of maintainers. 111 + 110 112 - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and 111 113 the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and 112 114 `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream
-1
nixos/modules/module-list.nix
··· 1107 1107 ./services/web-apps/shiori.nix 1108 1108 ./services/web-apps/snipe-it.nix 1109 1109 ./services/web-apps/vikunja.nix 1110 - ./services/web-apps/virtlyst.nix 1111 1110 ./services/web-apps/wiki-js.nix 1112 1111 ./services/web-apps/whitebophir.nix 1113 1112 ./services/web-apps/wordpress.nix
-73
nixos/modules/services/web-apps/virtlyst.nix
··· 1 - { config, lib, pkgs, ... }: 2 - 3 - with lib; 4 - 5 - let 6 - 7 - cfg = config.services.virtlyst; 8 - stateDir = "/var/lib/virtlyst"; 9 - 10 - ini = pkgs.writeText "virtlyst-config.ini" '' 11 - [wsgi] 12 - master = true 13 - threads = auto 14 - http-socket = ${cfg.httpSocket} 15 - application = ${pkgs.virtlyst}/lib/libVirtlyst.so 16 - chdir2 = ${stateDir} 17 - static-map = /static=${pkgs.virtlyst}/root/static 18 - 19 - [Cutelyst] 20 - production = true 21 - DatabasePath = virtlyst.sqlite 22 - TemplatePath = ${pkgs.virtlyst}/root/src 23 - 24 - [Rules] 25 - cutelyst.* = true 26 - virtlyst.* = true 27 - ''; 28 - 29 - in 30 - 31 - { 32 - 33 - options.services.virtlyst = { 34 - enable = mkEnableOption "Virtlyst libvirt web interface"; 35 - 36 - adminPassword = mkOption { 37 - type = types.str; 38 - description = lib.mdDoc '' 39 - Initial admin password with which the database will be seeded. 40 - ''; 41 - }; 42 - 43 - httpSocket = mkOption { 44 - type = types.str; 45 - default = "localhost:3000"; 46 - description = lib.mdDoc '' 47 - IP and/or port to which to bind the http socket. 48 - ''; 49 - }; 50 - }; 51 - 52 - config = mkIf cfg.enable { 53 - users.users.virtlyst = { 54 - home = stateDir; 55 - createHome = true; 56 - group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; 57 - isSystemUser = true; 58 - }; 59 - 60 - systemd.services.virtlyst = { 61 - wantedBy = [ "multi-user.target" ]; 62 - environment = { 63 - VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; 64 - }; 65 - serviceConfig = { 66 - ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; 67 - User = "virtlyst"; 68 - WorkingDirectory = stateDir; 69 - }; 70 - }; 71 - }; 72 - 73 - }
-41
pkgs/development/libraries/cutelyst/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook 2 - , qtbase, libuuid, libcap, uwsgi, grantlee, pcre 3 - }: 4 - 5 - stdenv.mkDerivation rec { 6 - pname = "cutelyst"; 7 - version = "2.14.2"; 8 - 9 - src = fetchFromGitHub { 10 - owner = "cutelyst"; 11 - repo = "cutelyst"; 12 - rev = "v${version}"; 13 - sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o="; 14 - }; 15 - 16 - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; 17 - buildInputs = [ 18 - qtbase 19 - grantlee 20 - ] ++ lib.optionals stdenv.isLinux [ 21 - libuuid 22 - libcap 23 - uwsgi 24 - pcre 25 - ]; 26 - 27 - cmakeFlags = [ 28 - "-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin 29 - "-DPLUGIN_STATICCOMPRESSED=ON" 30 - "-DPLUGIN_CSRFPROTECTION=ON" 31 - "-DPLUGIN_VIEW_GRANTLEE=ON" 32 - ]; 33 - 34 - meta = with lib; { 35 - description = "C++ Web Framework built on top of Qt"; 36 - homepage = "https://cutelyst.org/"; 37 - license = licenses.lgpl21Plus; 38 - platforms = platforms.unix; 39 - maintainers = with maintainers; [ fpletz ]; 40 - }; 41 - }
-14
pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch
··· 1 - diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp 2 - index acd195d..8809e4f 100644 3 - --- a/src/virtlyst.cpp 4 - +++ b/src/virtlyst.cpp 5 - @@ -340,7 +340,8 @@ bool Virtlyst::createDB() 6 - qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); 7 - return false; 8 - } 9 - - const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); 10 - + const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", 11 - + QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); 12 - query.bindValue(QStringLiteral(":password"), QString::fromLatin1( 13 - CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); 14 - if (!query.exec()) {
-39
pkgs/servers/web-apps/virtlyst/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook 2 - , qtbase, libvirt, cutelyst, grantlee }: 3 - 4 - stdenv.mkDerivation rec { 5 - pname = "virtlyst"; 6 - version = "1.2.0"; 7 - 8 - src = fetchFromGitHub { 9 - owner = "cutelyst"; 10 - repo = "Virtlyst"; 11 - rev = "v${version}"; 12 - sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; 13 - }; 14 - 15 - nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; 16 - buildInputs = [ qtbase libvirt cutelyst grantlee ]; 17 - 18 - dontWrapQtApps = true; 19 - 20 - installPhase = '' 21 - runHook preInstall 22 - 23 - mkdir -p $out/lib 24 - cp src/libVirtlyst${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib 25 - cp -r ../root $out 26 - 27 - runHook postInstall 28 - ''; 29 - 30 - patches = [ ./add-admin-password-env.patch ]; 31 - 32 - meta = with lib; { 33 - description = "Web interface to manage virtual machines with libvirt"; 34 - homepage = "https://github.com/cutelyst/Virtlyst"; 35 - license = licenses.agpl3Plus; 36 - platforms = platforms.unix; 37 - maintainers = with maintainers; [ fpletz ]; 38 - }; 39 - }
-4
pkgs/top-level/all-packages.nix
··· 17425 17425 17426 17426 cutee = callPackage ../development/libraries/cutee { }; 17427 17427 17428 - cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; 17429 - 17430 17428 cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; 17431 17429 17432 17430 cwiid = callPackage ../development/libraries/cwiid { }; ··· 23294 23292 victoriametrics = callPackage ../servers/nosql/victoriametrics { }; 23295 23293 23296 23294 virtiofsd = callPackage ../servers/misc/virtiofsd { }; 23297 - 23298 - virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; 23299 23295 23300 23296 virtualenv = with python3Packages; toPythonApplication virtualenv; 23301 23297