diff options
Diffstat (limited to 'nixos/maintainers')
5 files changed, 7 insertions, 7 deletions
diff --git a/nixos/maintainers/scripts/azure-new/.gitignore b/nixos/maintainers/scripts/azure-new/.gitignore index 26905a86234..9271abf14a0 100644 --- a/nixos/maintainers/scripts/azure-new/.gitignore +++ b/nixos/maintainers/scripts/azure-new/.gitignore @@ -1 +1 @@ -azure \ No newline at end of file +azure diff --git a/nixos/maintainers/scripts/azure-new/README.md b/nixos/maintainers/scripts/azure-new/README.md index 20e81c44ce5..e5b69dacec0 100644 --- a/nixos/maintainers/scripts/azure-new/README.md +++ b/nixos/maintainers/scripts/azure-new/README.md @@ -20,7 +20,7 @@ $ ./upload-image.sh ./examples/basic/image.nix + nix-build ./examples/basic/image.nix --out-link azure /nix/store/qdpzknpskzw30vba92mb24xzll1dqsmd-azure-image ... -95.5 %, 0 Done, 0 Failed, 1 Pending, 0 Skipped, 1 Total, 2-sec Throughput (Mb/s): 932.9565 +95.5 %, 0 Done, 0 Failed, 1 Pending, 0 Skipped, 1 Total, 2-sec Throughput (Mb/s): 932.9565 ... /subscriptions/aff271ee-e9be-4441-b9bb-42f5af4cbaeb/resourceGroups/nixos-images/providers/Microsoft.Compute/images/azure-image-todo-makethisbetter ``` diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix index 74b12815158..ad62dcd14a0 100644 --- a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix +++ b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix @@ -1,5 +1,5 @@ let - pkgs = (import <nixpkgs> {}); + pkgs = (import ../../../../../../default.nix {}); machine = import "${pkgs.path}/nixos/lib/eval-config.nix" { system = "x86_64-linux"; modules = [ diff --git a/nixos/maintainers/scripts/azure-new/upload-image.sh b/nixos/maintainers/scripts/azure-new/upload-image.sh index 1466dcd1f0a..143afbd7f96 100755 --- a/nixos/maintainers/scripts/azure-new/upload-image.sh +++ b/nixos/maintainers/scripts/azure-new/upload-image.sh @@ -37,8 +37,8 @@ if ! az disk show -g "${group}" -n "${img_name}" &>/dev/null; then )" azcopy copy "${img_file}" "${sasurl}" \ - --blob-type PageBlob - + --blob-type PageBlob + az disk revoke-access \ --resource-group "${group}" \ --name "${img_name}" diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 36f3e7af873..b09f4ca47a3 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -63,8 +63,8 @@ in { fsType = "ext4"; configFile = pkgs.writeText "configuration.nix" '' - { - imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ]; + { modulesPath, ... }: { + imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ]; ${optionalString config.ec2.hvm '' ec2.hvm = true; ''} |