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: 134942f56a7a
Choose a base ref
...
head repository: NixOS/nix
compare: 95bdfaa8bdac
Choose a head ref
  • 9 commits
  • 6 files changed
  • 1 contributor

Commits on May 31, 2019

  1. Show hash mismatch warnings in SRI format

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

  2. Support 'dir' and other parameters in path flakerefs

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

  3. Add operator << for LockFile 

    Useful for debugging.
    @edolstra
    edolstra committed May 31, 2019
    Copy the full SHA
    9169046 View commit details
    Browse the repository at this point in the history

  4. Fix reading the lockfile of a flake in a subdirectory

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

  5. Allow bare flakerefs as installables 

    So now

  $ nix build blender-bin

works and builds the default package from that flake. You don't need
to add a colon at the end anymore.
    @edolstra
    edolstra committed May 31, 2019
    Copy the full SHA
    ccb1bad View commit details
    Browse the repository at this point in the history

  6. Automatically determine subdir for path flakes 

    This means that in a flake in a subdirectory of a Git repo, you can
now do

  $ nix build

rather than the inconvenient

  $ nix build ../..?dir=foo/bar
    @edolstra
    edolstra committed May 31, 2019
    Copy the full SHA
    8abb864 View commit details
    Browse the repository at this point in the history

  7. Fix handling of bare flakerefs containing a colon

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

  8. Doh

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

Commits on Jun 3, 2019

  1. Merge pull request #2907 from NixOS/subdir 

    Subdirectory improvements
    @edolstra
    edolstra committed Jun 3, 2019
    Copy the full SHA
    95bdfaa View commit details
    Browse the repository at this point in the history