Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ad825384232d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 35b974a8e9a3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 27, 2017

  1. dockerTools.buildImage: configurable timestamp 

    This way not all images have to be from 47 years ago, making it much easier to find the one you're looking for.
    @manveru
    manveru authored Jun 27, 2017
    Copy the full SHA
    704e04b View commit details

  2. using inherited instead

    @manveru
    manveru authored Jun 27, 2017
    Copy the full SHA
    54419f3 View commit details

Commits on Jun 28, 2017

  1. Merge pull request #26911 from manveru/patch-2 

    dockerTools.buildImage: configurable timestamp
    @LnL7
    LnL7 authored Jun 28, 2017
    Copy the full SHA
    35b974a View commit details
Showing with 3 additions and 2 deletions.
  1. +3 −2 pkgs/build-support/docker/default.nix
5 changes: 3 additions & 2 deletions pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -380,17 +380,18 @@ 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
baseName = baseNameOf name;

# 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 =