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: 17f75f9cc4dd
Choose a base ref
...
head repository: NixOS/nix
compare: 3f01fa1c9c1b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 17, 2020

  1. Add back flake-compat shell.nix 

    This was removed in the merge commit
adf2fbb. I think this was a mistake
that occurred when resolving a conflict.
    @Ericson2314
    Ericson2314 committed Jul 17, 2020
    Copy the full SHA
    c123fee View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3827 from obsidiansystems/add-back-compat-shell.nix 

    Add back flake-compat shell.nix
    @edolstra
    edolstra committed Jul 17, 2020
    Copy the full SHA
    3f01fa1 View commit details
    Browse the repository at this point in the history