Unverified Commit 71cb937c authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

multipass: remove unmaintained package and module

parent 2a6c2618

nixos/modules/module-list.nix

+0 −1
Original line number Diff line number Diff line
@@ -1945,7 +1945,6 @@ 
  ./virtualisation/libvirtd.nix

  ./virtualisation/lxc.nix

  ./virtualisation/lxcfs.nix

  ./virtualisation/multipass.nix

  ./virtualisation/nixos-containers.nix

  ./virtualisation/oci-containers.nix

  ./virtualisation/oci-options.nix

nixos/modules/rename.nix

+3 −0
Original line number Diff line number Diff line
@@ -441,6 +441,9 @@ in 
      to periodically collect random data from the device and mix it

      into the kernel's RNG.

    '')

    (mkRemovedOptionModule [ "virtualisation" "multipass" ] ''

      virtualisation.multipass has been removed since it was unmaintained in nixpkgs

    '')

    # Do NOT add any option renames here, see top of the file

  ];

}

nixos/modules/virtualisation/multipass.nix

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
{

  config,

  lib,

  pkgs,

  ...

}:



let

  cfg = config.virtualisation.multipass;

in

{

  options = {

    virtualisation.multipass = {

      enable = lib.mkEnableOption "Multipass, a simple manager for virtualised Ubuntu instances";



      logLevel = lib.mkOption {

        type = lib.types.enum [

          "error"

          "warning"

          "info"

          "debug"

          "trace"

        ];

        default = "debug";

        description = ''

          The logging verbosity of the multipassd binary.

        '';

      };



      package = lib.mkPackageOption pkgs "multipass" { };

    };

  };



  config = lib.mkIf cfg.enable {

    environment.systemPackages = [ cfg.package ];



    systemd.services.multipass = {

      description = "Multipass orchestrates virtual Ubuntu instances.";



      wantedBy = [ "multi-user.target" ];

      wants = [ "network-online.target" ];

      after = [ "network-online.target" ];



      environment = {

        "XDG_DATA_HOME" = "/var/lib/multipass/data";

        "XDG_CACHE_HOME" = "/var/lib/multipass/cache";

        "XDG_CONFIG_HOME" = "/var/lib/multipass/config";

      };



      serviceConfig = {

        ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}";

        SyslogIdentifier = "multipassd";

        Restart = "on-failure";

        TimeoutStopSec = 300;

        Type = "simple";



        WorkingDirectory = "/var/lib/multipass";



        StateDirectory = "multipass";

        StateDirectoryMode = "0750";

        CacheDirectory = "multipass";

        CacheDirectoryMode = "0750";

      };

    };

  };

}

nixos/tests/all-tests.nix

+0 −1
Original line number Diff line number Diff line
@@ -983,7 +983,6 @@ in 
  mpd = runTest ./mpd.nix;

  mpv = runTest ./mpv.nix;

  mtp = runTest ./mtp.nix;

  multipass = runTest ./multipass.nix;

  mumble = runTest ./mumble.nix;

  munge = runTest ./munge.nix;

  munin = runTest ./munin.nix;

nixos/tests/multipass.nix

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
{ pkgs, lib, ... }:



let

  multipass-image = import ../release.nix {

    configuration = {

      # Building documentation makes the test unnecessarily take a longer time:

      documentation.enable = lib.mkForce false;

    };

  };



in

{

  name = "multipass";



  meta.maintainers = [ ];



  nodes.machine =

    { lib, ... }:

    {

      virtualisation = {

        cores = 1;

        memorySize = 1024;

        diskSize = 4096;



        multipass.enable = true;

      };

    };



  testScript = ''

    machine.wait_for_unit("sockets.target")

    machine.wait_for_unit("multipass.service")

    machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet")



    # Wait for Multipass to settle

    machine.sleep(1)



    machine.succeed("multipass list")

  '';

}