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/nix
base: 6dbd5c26e6c8^
Choose a base ref
...
head repository: NixOS/nix
compare: ce225615c3ee
Choose a head ref
  • 11 commits
  • 9 files changed
  • 1 contributor

Commits on Jun 4, 2019

  1. Make flake input fetching lazy

    As long as the flake input is locked, it is now only fetched when it
    is evaluated (e.g. "nixpkgs" is fetched when
    "inputs.nixpkgs.<something>" is evaluated).
    
    This required adding an "id" attribute to the members of "inputs" in
    lockfiles, e.g.
    
      "inputs": {
        "nixpkgs/release-19.03": {
          "id": "nixpkgs",
          "inputs": {},
          "narHash": "sha256-eYtxncIMFVmOHaHBtTdPGcs/AnJqKqA6tHCm0UmPYQU=",
          "nonFlakeInputs": {},
          "uri": "github:edolstra/nixpkgs/e9d5882bb861dc48f8d46960e7c820efdbe8f9c1"
        }
      }
    
    because the flake ID needs to be known beforehand to construct the
    "inputs" attrset.
    
    Fixes #2913.
    edolstra committed Jun 4, 2019
    Copy the full SHA
    6dbd5c2 View commit details
    Browse the repository at this point in the history
  2. Fix GC closure generation

    edolstra committed Jun 4, 2019
    Copy the full SHA
    278114d View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    9e99b52 View commit details
    Browse the repository at this point in the history
  4. Rename dep -> input

    Also use nlohmann::json range-based for.
    edolstra committed Jun 4, 2019
    Copy the full SHA
    5fe7be2 View commit details
    Browse the repository at this point in the history
  5. Fix test

    edolstra committed Jun 4, 2019
    Copy the full SHA
    4ec1a9a View commit details
    Browse the repository at this point in the history
  6. Don't register invalid paths as GC roots

    Unfortunately this doesn't work. Maybe we should keep separate roots
    for each path.
    edolstra committed Jun 4, 2019
    Copy the full SHA
    45b5c60 View commit details
    Browse the repository at this point in the history
  7. Check hash

    edolstra committed Jun 4, 2019
    Copy the full SHA
    1c5067b View commit details
    Browse the repository at this point in the history
  8. Make non-flake inputs lazy

    Also add a proper test for non-flake inputs.
    edolstra committed Jun 4, 2019
    Copy the full SHA
    1e53a07 View commit details
    Browse the repository at this point in the history
  9. Update flake.lock

    edolstra committed Jun 4, 2019
    Copy the full SHA
    4d31cf8 View commit details
    Browse the repository at this point in the history
  10. Add comments

    edolstra committed Jun 4, 2019
    Copy the full SHA
    087530d View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    ce22561 View commit details
    Browse the repository at this point in the history