mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
lxd-ui: move to standalone by-name and format
This commit is contained in:
parent
080a4a27f2
commit
91a3a6a29b
|
@ -139,7 +139,7 @@ in {
|
||||||
ui = {
|
ui = {
|
||||||
enable = lib.mkEnableOption (lib.mdDoc "(experimental) LXD UI");
|
enable = lib.mkEnableOption (lib.mdDoc "(experimental) LXD UI");
|
||||||
|
|
||||||
package = lib.mkPackageOption pkgs [ "lxd-unwrapped" "ui" ] { };
|
package = lib.mkPackageOption pkgs [ "lxd-ui" ] { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
{ lib
|
{
|
||||||
, stdenv
|
lib,
|
||||||
, fetchFromGitHub
|
stdenv,
|
||||||
, fetchYarnDeps
|
fetchFromGitHub,
|
||||||
, nodejs
|
fetchYarnDeps,
|
||||||
, prefetch-yarn-deps
|
nodejs,
|
||||||
, yarn
|
prefetch-yarn-deps,
|
||||||
, nixosTests
|
yarn,
|
||||||
|
nixosTests,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
|
@ -77,7 +77,6 @@ buildGoModule rec {
|
||||||
|
|
||||||
passthru.tests.lxd = nixosTests.lxd;
|
passthru.tests.lxd = nixosTests.lxd;
|
||||||
passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
|
passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus;
|
||||||
passthru.ui = callPackage ./ui.nix { };
|
|
||||||
passthru.updateScript = gitUpdater {
|
passthru.updateScript = gitUpdater {
|
||||||
url = "https://github.com/canonical/lxd.git";
|
url = "https://github.com/canonical/lxd.git";
|
||||||
rev-prefix = "lxd-";
|
rev-prefix = "lxd-";
|
||||||
|
|
Loading…
Reference in a new issue