public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo

Browse Source
This commit is contained in:
Ding Xiang Fei
2018-11-26 12:04:07 +08:00
parent 50daffc4b8 ab88ed6df6
commit b011049cf6
1356 changed files with 96697 additions and 86247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/virtualisation/gce-images.nix
+2 -2
View File
@@ -4,6 +4,6 @@ let self = {
"16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz";
"17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
"18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";
latest = self."18.03";
"18.09" = "gs://nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz";
latest = self."18.09";
}; in self
nixos/modules/virtualisation/google-compute-image.nix
+1 -1
View File
@@ -165,7 +165,7 @@ in
ExecStop = "${gce}/bin/google_metadata_script_runner --debug --script-type shutdown";
Type = "oneshot";
RemainAfterExit = true;
TimeoutStopSec = 0;
TimeoutStopSec = "infinity";
};
};