Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 0167b61ef45c3cf8223d67893956144c65d811bf
      
https://github.com/NixOS/nixpkgs/commit/0167b61ef45c3cf8223d67893956144c65d811bf
  Author: Brian McKenna <[email protected]>
  Date:   2016-04-16 (Sat, 16 Apr 2016)

  Changed paths:
    M pkgs/build-support/docker/default.nix

  Log Message:
  -----------
  dockerTools: only add "/nix" if it exists

The /nix path in 4d200538 of the layer tar didn't exist for some
packages, such as cacert. This is because cacert just creates an /etc
directory and doesn't depend on any other /nix paths. If we tried
putting this directory in the tar and using overlayfs with it, we'd get
"Invalid argument" when trying to remove the directory.

We now check whether the closure is non-empty before telling tar to
store the /nix directory.

Fixes #14710.


  Commit: 4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f
      
https://github.com/NixOS/nixpkgs/commit/4ba7767d91ffc4bd18c6d3793e90f3d59ee09a3f
  Author: zimbatm <[email protected]>
  Date:   2016-05-06 (Fri, 06 May 2016)

  Changed paths:
    M pkgs/build-support/docker/default.nix

  Log Message:
  -----------
  Merge pull request #14722 from puffnfresh/bug/dockertools-postmount

dockerTools: only add "/nix" if it exists


Compare: https://github.com/NixOS/nixpkgs/compare/53a458255235...4ba7767d91ff
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to