Unverified Commit 31e9f046 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c53345e3 ddeba83a

lib/systems/default.nix

+1 −3
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ let 
              "uclibc"

            else if final.isAndroid then

              "bionic"

            else if final.isLLVMLibc then

              "llvm"

            else if

              final.isLinux # default

            then
@@ -248,7 +246,7 @@ let 
          # don't support dynamic linking, but don't get the `staticMarker`.

          # `pkgsStatic` sets `isStatic=true`, so `pkgsStatic.hostPlatform` always

          # has the `staticMarker`.

          isStatic = final.isWasi || final.isRedox || final.isLLVMLibc;

          isStatic = final.isWasi || final.isRedox;



          # Just a guess, based on `system`

          inherit

lib/systems/inspect.nix

+0 −1
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ rec { 
        uclibceabi

        uclibceabihf

      ];

    isLLVMLibc = [ { abi = abis.llvm; } ];



    isEfi = [

      {

lib/systems/parse.nix

+0 −3
Original line number Diff line number Diff line
@@ -740,9 +740,6 @@ rec { 
    };

    uclibc = { };



    # LLVM libc

    llvm = { };



    unknown = { };

  };

nixos/maintainers/scripts/cloudstack/cloudstack-image.nix

+10 −1
Original line number Diff line number Diff line
@@ -8,10 +8,19 @@ 
}:



{

  imports = [ ../../../modules/virtualisation/cloudstack-config.nix ];

  imports = [



    ../../../modules/virtualisation/cloudstack-config.nix

    ../../../modules/image/file-options.nix

  ];



  system.nixos.tags = [ "cloudstack" ];

  image.extension = "qcow2";

  system.build.image = config.system.build.cloudstackImage;

  system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {

    inherit lib config pkgs;

    inherit (config.virtualisation) diskSize;

    baseName = config.image.baseName;

    format = "qcow2";

    configFile = pkgs.writeText "configuration.nix" ''

      {

nixos/modules/image/images.nix

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ let 
  imageModules = {

    amazon = ../../maintainers/scripts/ec2/amazon-image.nix;

    azure = ../virtualisation/azure-image.nix;

    cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix;

    digital-ocean = ../virtualisation/digital-ocean-image.nix;

    google-compute = ../virtualisation/google-compute-image.nix;

    hyperv = ../virtualisation/hyperv-image.nix;