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/nixpkgs
base: 24d309bedf22
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: fcdfa881c829
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 29, 2020

  1. nixos-rebuild: make 'edit' work with directories 

    $NIXOS_CONFIG can be set to a directory, in which case the file used
is $NIXOS_CONFIG/default.nix. This updates 'nixos-rebuild edit' to
handle that case correctly.
    @deviant
    deviant committed Aug 29, 2020
    Copy the full SHA
    be193a2 View commit details
    Browse the repository at this point in the history

  2. nixos-rebuild: don't quote $EDITOR 

    $EDITOR is allowed to contain flags, so it is important to allow the
shell to split this normally. For example, Sublime Text needs to be
passed --wait, since otherwise it will daemonise.
    @deviant
    deviant committed Aug 29, 2020
    Copy the full SHA
    e08bcdb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #96589 from deviant/nre-improvements 

    `nixos-rebuild edit` improvements
    @edef1c
    edef1c committed Aug 29, 2020
    Copy the full SHA
    fcdfa88 View commit details
    Browse the repository at this point in the history