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: 5add38051f59
Choose a base ref
...
head repository: NixOS/nix
compare: b6bf153b8ba5
Choose a head ref
  • 11 commits
  • 6 files changed
  • 2 contributors

Commits on May 16, 2019

  1. Fixed issue 65

    lockfile updating
    PACTUser committed May 16, 2019
    Copy the full SHA
    d9ad372 View commit details
    Browse the repository at this point in the history
  2. Give errors in resolveFlake

    If DontUpdate but the lockfile isn't correct
    PACTUser committed May 16, 2019
    Copy the full SHA
    98f20de View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. Copy the full SHA
    ef6ae61 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2019

  1. Copy the full SHA
    818c8da View commit details
    Browse the repository at this point in the history
  2. Only rewrite the lockfile if it changed

    This removes spurious warnings about failure to write the lockfile.
    edolstra committed May 21, 2019
    Copy the full SHA
    20a1a65 View commit details
    Browse the repository at this point in the history
  3. Use warn(), tweak messages

    edolstra committed May 21, 2019
    Copy the full SHA
    5990b86 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #2881 from NixOS/misc-fixes

    Improve lockfile warnings
    edolstra committed May 21, 2019
    Copy the full SHA
    8e5c86b View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. Improve FlakeCommand

    It now handles commonality like calling getFlake() and resolving
    relative local flake refs.
    
    Fixes #2822.
    edolstra committed May 22, 2019
    Copy the full SHA
    80b50f4 View commit details
    Browse the repository at this point in the history
  2. Add some tests

    edolstra committed May 22, 2019
    Copy the full SHA
    1b870bc View commit details
    Browse the repository at this point in the history
  3. Move flake-related flags into a separate class

    Also, rename --dont-save-lock-file to --no-save-lock-file and change
    noRegistries to useRegistries.
    edolstra committed May 22, 2019
    Copy the full SHA
    669eb59 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    b6bf153 View commit details
    Browse the repository at this point in the history