diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-29 08:12:56 +0100 |
| commit | 9db2421d1f65beb38911e8133349193db0042a1d (patch) | |
| tree | 90a2f4a56cf871c74aad86138d85e9631c2c2f86 /nixos/maintainers | |
| parent | 9caab8ff4a1ad36fbc0ab866f1b0f7c15d35ba90 (diff) | |
| parent | 8d88e4f6c7b09fe811d92b346e5eafefe07a47c9 (diff) | |
| download | nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.gz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.bz2 nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.lz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.xz nixlib-9db2421d1f65beb38911e8133349193db0042a1d.tar.zst nixlib-9db2421d1f65beb38911e8133349193db0042a1d.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/maintainers')
| -rwxr-xr-x | nixos/maintainers/scripts/gce/create-gce.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index 0fd26d34d07f..48748a59d298 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -7,9 +7,9 @@ BUCKET_NAME="${BUCKET_NAME:-nixos-cloud-images}" TIMESTAMP="$(date +%Y%m%d%H%M)" export TIMESTAMP -nix-build '<nixpkgs/nixos>' \ +nix-build '<nixpkgs/nixos/lib/eval-config.nix>' \ -A config.system.build.googleComputeImage \ - --arg configuration "{ imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ]; }" \ + --arg modules "[ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ]" \ --argstr system x86_64-linux \ -o gce \ -j 10 |