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: 0951330680af
Choose a base ref
...
head repository: NixOS/nix
compare: ff314f186e3f
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on Jun 23, 2020

  1. Enable the --store option to take relative paths 

    In nix commands which accept --store options, we can now specify a
relative path, which will be canonicalized.
    @meditans
    meditans committed Jun 23, 2020
    Configuration menu
    Copy the full SHA
    e197bc6 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into allow-relative-pat… 

    …hs-in-store-option
    @meditans
    meditans committed Jun 26, 2020
    Configuration menu
    Copy the full SHA
    278a679 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Merge branch 'master' of github.com:NixOS/nix into allow-relative-pat… 

    …hs-in-store-option
    @meditans
    meditans committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    fefd6c9 View commit details
    Browse the repository at this point in the history

  2. Test relative store paths

    @meditans
    meditans committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    4178f36 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2020

  1. Change logic for deciding what is a relative path for the local store 

    The was Eelco's prefered logic, and it looks good to me!
    @Ericson2314
    Ericson2314 committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    6cce32c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3736 from obsidiansystems/allow-relative-paths-in… 

    …-store-option

Allow relative paths in --store option
    @edolstra
    edolstra committed Jul 21, 2020
    Configuration menu
    Copy the full SHA
    ff314f1 View commit details
    Browse the repository at this point in the history