diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-06-30 18:15:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-06-30 18:16:58 +0200 |
| commit | ddf864f8aa8b1c41e658a115823d7eaf744f4190 (patch) | |
| tree | 1c21b84a3724120de509f794af47d043a733eb52 /pkgs/build-support | |
| parent | c53449ce57f26de17532f0dea727b58db68b337e (diff) | |
| parent | f0c3e5f519f82ee379182e94dc886b627930015d (diff) | |
| download | nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.gz nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.bz2 nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.lz nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.xz nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.tar.zst nixlib-ddf864f8aa8b1c41e658a115823d7eaf744f4190.zip | |
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6bc9b7475e1a..4ebe3c0615d3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -380,6 +380,8 @@ rec { runAsRoot ? null, # Size of the virtual machine disk to provision when building the image. diskSize ? 1024, + # Time of creation of the image. + created ? "1970-01-01T00:00:01Z", }: let @@ -387,10 +389,9 @@ rec { # Create a JSON blob of the configuration. Set the date to unix zero. baseJson = writeText "${baseName}-config.json" (builtins.toJSON { - created = "1970-01-01T00:00:01Z"; + inherit created config; architecture = "amd64"; os = "linux"; - config = config; }); layer = |