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: a2444a2831a4
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 38f65be5c324
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 20, 2017

  1. dockerTools.buildImageWithNixDb: populate the Nix Db of the image Nix…

    … store
    
    Currently, the contents closure is copied to the layer but there is no
    nix database initialization. If pkgs.nix is added in the contents,
    nix-store doesn't work because there is no nix database.
    
    From the contents of the layer, this commit generates and loads the
    database in the nix store of the container. This only works if there
    is no parent layer that already have a nix store (to support several
    nix layers, we would have to merge nix databases of parent layers).
    
    We also add an example to play with the nix store inside the
    container. Note it seems `more` is a missing dependency of the nix
    package!
    nlewo committed Sep 20, 2017
    1 Configuration menu
    Copy the full SHA
    df589a4 View commit details
    Browse the repository at this point in the history
  2. dockerTools.buildImageWithNixDb: Make output paths valid and add gcroots

    The database dump doesn't contain sha and size. This leads to invalid
    path in the container. We have to fix the database by using
    nix-store.
    Note a better way to do this is available in Nix 1.12 (since the
    database dump contains all required information).
    
    We also add content output paths in the gcroots since they ca be used
    by the container.
    nlewo committed Sep 20, 2017
    Configuration menu
    Copy the full SHA
    cb6fc52 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2017

  1. Merge pull request #28561 from nlewo/dockerTools-load-nix-db

    dockerTools: populate the nix database of the container nix store
    NeQuissimus committed Sep 22, 2017
    Configuration menu
    Copy the full SHA
    38f65be View commit details
    Browse the repository at this point in the history