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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 17f75f9cc4dd
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
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 committed Jul 17, 2020
    Copy the full SHA
    c123fee View commit details
  2. Merge pull request #3827 from obsidiansystems/add-back-compat-shell.nix

    Add back flake-compat shell.nix
    edolstra authored Jul 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    3f01fa1 View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 shell.nix
3 changes: 3 additions & 0 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
(import (fetchTarball https://github.com/edolstra/flake-compat/archive/master.tar.gz) {
src = ./.;
}).shellNix