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: de36cf3db95a
Choose a base ref
...
head repository: NixOS/nix
compare: 479757dc15c2
Choose a head ref
  • 11 commits
  • 4 files changed
  • 1 contributor

Commits on May 28, 2019

  1. Store SourceInfo in Flake and NonFlake 

    This deduplicates some shared fields. Factoring out the commonality is
useful in places like makeFlakeValue().
    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    6d7efcf View commit details
    Browse the repository at this point in the history

  2. Move hash into SourceInfo and rename to narHash to avoid ambiguity

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    894e007 View commit details
    Browse the repository at this point in the history

  3. Rename contentHash -> narHash for consistency

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    4846304 View commit details
    Browse the repository at this point in the history

  4. Remove redundant resolvedRef fields since they're already in SourceInfo

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    dda4f71 View commit details
    Browse the repository at this point in the history

  5. nix flake info/deps: Stop progress bar before printing output

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    25e497b View commit details
    Browse the repository at this point in the history

  6. printFlakeInfo/printNonFlakeInfo: Factor out commonality

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    fdf06ce View commit details
    Browse the repository at this point in the history

  7. nix flake deps: Remove --json flag for now 

    It doesn't produce valid JSON at the moment (but a concatenation of
JSON objects). Anyway we probably should merge this command info 'nix
flake info'.
    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    e7e7a03 View commit details
    Browse the repository at this point in the history

  8. callFlake(): Emit source info attributes for non-flake dependencies

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    ecee759 View commit details
    Browse the repository at this point in the history

  9. printFlakeInfo: Separate JSON output

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    46294d6 View commit details
    Browse the repository at this point in the history

  10. nix flake info: Add missing newline

    @edolstra
    edolstra committed May 28, 2019
    Copy the full SHA
    444786e View commit details
    Browse the repository at this point in the history

Commits on May 29, 2019

  1. Merge pull request #2897 from NixOS/source-info 

    Store SourceInfo in Flake/NonFlake
    @edolstra
    edolstra committed May 29, 2019
    Copy the full SHA
    479757d View commit details
    Browse the repository at this point in the history