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
base: 01ea8a548603
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 747871e9fb05
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 10, 2017

  1. make-disk-image: use faketime to get a consistent timestamp 

    This fixes #28768 because during an image build, Nix sees bad store
timestamps and attempts to fix them, but can't fix them on a running
system (due to being inside a builder). Since timestamps on the store
are supposed to be 1 anyway, if we fix this, that fixes image building
inside booted images made this way.

Note that this adds quite a bit of noise to the output, because running
`cptofs` under `faketime` causes a bunch of seemingly spurious error
messages and my attempts to suppress them all failed. We'll fix it when
`cptofs` gets a native timestamp preservation feature.
    @copumpkin
    copumpkin committed Nov 10, 2017
    Copy the full SHA
    16cf436 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #31469 from copumpkin/faketime-make-disk-image 

    make-disk-image: use faketime to get a consistent timestamp
    @edolstra
    edolstra committed Nov 10, 2017
    Copy the full SHA
    747871e View commit details
    Browse the repository at this point in the history